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

5 files changed, 153 insertions, 153 deletions

diff --git a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java
index e3ce830f27..0b2062ca88 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.everglades.gen;
 
-import static gtPlusPlus.core.lib.CORE.PI;
+import static gtPlusPlus.core.lib.GTPPCore.PI;
 
 import java.util.Random;
 
@@ -12,7 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable;
 
 import gtPlusPlus.api.objects.Logger;
 
-public class WorldGenMinable_Custom extends WorldGenMinable {
+public class WorldGenMinableCustom extends WorldGenMinable {
 
     /** The block to generate. */
     private Block oreToGenerate;
@@ -23,18 +23,18 @@ public class WorldGenMinable_Custom extends WorldGenMinable {
     /** The meta of the block. */
     private int mineableBlockMeta;
 
-    public WorldGenMinable_Custom(final Block block, final int count) {
+    public WorldGenMinableCustom(final Block block, final int count) {
         super(block, count, Blocks.stone);
     }
 
-    public WorldGenMinable_Custom(final Block block, final int count, final Block target) {
+    public WorldGenMinableCustom(final Block block, final int count, final Block target) {
         super(block, count, target);
         this.oreToGenerate = block;
         this.numberOfBlocks = count;
         this.blockToReplace = target;
     }
 
-    public WorldGenMinable_Custom(final Block block, final int meta, final int number, final Block target) {
+    public WorldGenMinableCustom(final Block block, final int meta, final int number, final Block target) {
         this(block, number, target);
         this.mineableBlockMeta = meta;
     }
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
index a35b528726..9ce91e3e4d 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
@@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.xmod.gregtech.HandlerGT;
 
 public abstract class WorldGen_GT {
 
@@ -18,7 +18,7 @@ public abstract class WorldGen_GT {
 
     public WorldGen_GT(String aName, List aList, boolean aDefault) {
         this.mWorldGenName = aName;
-        this.mEnabled = HANDLER_GT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault);
+        this.mEnabled = HandlerGT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault);
         if (this.mEnabled) {
             aList.add(this);
         }
@@ -38,7 +38,7 @@ public abstract class WorldGen_GT {
         String aDimName = aWorld.provider.getDimensionName();
         Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName);
         if (tAllowed == null) {
-            boolean tValue = HANDLER_GT.sCustomWorldgenFile
+            boolean tValue = HandlerGT.sCustomWorldgenFile
                 .get("worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
             this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue));
             return tValue;
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
index ac93a847fa..d7f0815368 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
@@ -14,12 +14,12 @@ import net.minecraft.world.gen.feature.WorldGenMinable;
 
 import cpw.mods.fml.common.IWorldGenerator;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.common.GT_Worldgenerator;
+import gregtech.api.util.GTLog;
+import gregtech.common.GTWorldgenerator;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
+import gtPlusPlus.xmod.gregtech.HandlerGT;
 
 public class WorldGen_GT_Base implements IWorldGenerator {
 
@@ -60,10 +60,10 @@ public class WorldGen_GT_Base implements IWorldGenerator {
         0,
         0,
         0,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON);
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON);
 
     public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024);
 
@@ -73,21 +73,21 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 
     public WorldGen_GT_Base() {
         if (debugWorldGen) {
-            GT_Log.out.println("GTPP_Worldgenerator created");
+            GTLog.out.println("GTPP_Worldgenerator created");
         }
     }
 
     @Override
     public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator,
         IChunkProvider chunkProvider) {
-        if (world.provider.dimensionId == Dimension_Everglades.DIMID) {
+        if (world.provider.dimensionId == DimensionEverglades.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_Everglades.DIMID;
+        int xDim = DimensionEverglades.DIMID;
         switch (world.provider.dimensionId) {
             case -1: // Nether
                 // generateNether(world, random, chunkX * 16, chunkZ * 16);
@@ -118,7 +118,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                     new XSTR(Math.abs(aRandom.nextInt()) + 1),
                     aX,
                     aZ,
-                    Dimension_Everglades.DIMID,
+                    DimensionEverglades.DIMID,
                     aWorld,
                     aChunkGenerator,
                     aChunkProvider,
@@ -127,7 +127,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             } else {
                 Logger.WORLD("Locked List addition. Fail.");
             }
-            if (debugWorldGen) GT_Log.out.println(
+            if (debugWorldGen) GTLog.out.println(
                 "ADD WorldSeed:" + aWorld.getSeed()
                     + " DimId"
                     + aWorld.provider.dimensionId
@@ -149,7 +149,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             // chunks get done later.
             for (int i = 0; i < mList_sS; i++) {
                 WorldGenContainer toRun = (WorldGenContainer) WorldGen_GT_Base.mList.get(0);
-                if (debugWorldGen) GT_Log.out.println(
+                if (debugWorldGen) GTLog.out.println(
                     "RUN WorldSeed:" + aWorld.getSeed()
                         + " DimId"
                         + aWorld.provider.dimensionId
@@ -269,7 +269,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             }
 
             if (debugWorldGen) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     " Finding oreveins for oreveinSeed=" + oreveinSeed
                         + " mX="
                         + this.mX
@@ -341,7 +341,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                                         this.mChunkProvider);
                                     switch (placementResult) {
                                         case WorldGen_GT_Ore_Layer.ORE_PLACED -> {
-                                            if (debugWorldGen) GT_Log.out.println(
+                                            if (debugWorldGen) GTLog.out.println(
                                                 " Added oreveinSeed=" + oreveinSeed
                                                     + " tries at oremix="
                                                     + i
@@ -365,7 +365,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                                             // Orevein didn't reach this chunk,
                                             // can't add it yet to the hash
                                             Logger.INFO("[World Generation Debug] NO_OVERLAP");
-                                            if (debugWorldGen) GT_Log.out.println(
+                                            if (debugWorldGen) GTLog.out.println(
                                                 " Added far oreveinSeed=" + oreveinSeed
                                                     + " "
                                                     + (tWorldGen).mWorldGenName
@@ -379,7 +379,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                                             oreveinFound = true;
                                         }
                                         case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> {
-                                            if (debugWorldGen) GT_Log.out.println(
+                                            if (debugWorldGen) GTLog.out.println(
                                                 " No overlap and air block in test spot=" + oreveinSeed
                                                     + " "
                                                     + (tWorldGen).mWorldGenName
@@ -396,7 +396,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                                     }
                                     break; // Try the next orevein
                                 } catch (Throwable e) {
-                                    if (debugWorldGen) GT_Log.out.println(
+                                    if (debugWorldGen) GTLog.out.println(
                                         "Exception occurred on oreVein" + tWorldGen
                                             + " oreveinSeed="
                                             + oreveinSeed
@@ -408,7 +408,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                                             + oreseedX
                                             + " oreseedZ="
                                             + oreseedZ);
-                                    e.printStackTrace(GT_Log.err);
+                                    e.printStackTrace(GTLog.err);
                                 }
                             }
                         }
@@ -416,7 +416,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                     // Only add an empty orevein if are unable to place a vein
                     // at the oreseed chunk.
                     if ((!oreveinFound) && (this.mX == oreseedX) && (this.mZ == oreseedZ)) {
-                        if (debugWorldGen) GT_Log.out.println(
+                        if (debugWorldGen) GTLog.out.println(
                             " Empty oreveinSeed=" + oreveinSeed
                                 + " mX="
                                 + this.mX
@@ -435,7 +435,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                         validOreveins.put(oreveinSeed, noOresInVein);
                     }
                 } else if (oreveinPercentageRoll >= oreveinPercentage) {
-                    if (debugWorldGen) GT_Log.out.println(
+                    if (debugWorldGen) GTLog.out.println(
                         " Skipped oreveinSeed=" + oreveinSeed
                             + " mX="
                             + this.mX
@@ -455,7 +455,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                 }
             } else {
                 // oreseed is located in the previously processed table
-                if (debugWorldGen) GT_Log.out
+                if (debugWorldGen) GTLog.out
                     .print(" Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()=" + validOreveins.size() + " ");
                 WorldGen_GT_Ore_Layer tWorldGen = validOreveins.get(oreveinSeed);
                 oreveinRNG.setSeed(oreveinSeed ^ (Block.getIdFromBlock(tWorldGen.mPrimaryMeta))); // Reset
@@ -484,10 +484,10 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                     this.mChunkProvider);
                 switch (placementResult) {
                     case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> {
-                        if (debugWorldGen) GT_Log.out.println(" No ore in bottom layer");
+                        if (debugWorldGen) GTLog.out.println(" No ore in bottom layer");
                     }
                     case WorldGen_GT_Ore_Layer.NO_OVERLAP -> {
-                        if (debugWorldGen) GT_Log.out.println(" No overlap");
+                        if (debugWorldGen) GTLog.out.println(" No overlap");
                     }
                 }
             }
@@ -522,8 +522,8 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             for (int x = wXbox; x < eXbox; x++) {
                 for (int z = nZbox; z < sZbox; z++) {
                     // Determine if this X/Z is an orevein seed
-                    if (GT_Worldgenerator.isOreChunk(x, z)) {
-                        if (debugWorldGen) GT_Log.out.println("Adding seed x=" + x + " z=" + z);
+                    if (GTWorldgenerator.isOreChunk(x, z)) {
+                        if (debugWorldGen) GTLog.out.println("Adding seed x=" + x + " z=" + z);
                         seedList.add(new NearbySeeds(x, z));
                     }
                 }
@@ -532,7 +532,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             // Now process each oreseed vs this requested chunk
             for (; seedList.size() != 0; seedList.remove(0)) {
                 if (debugWorldGen)
-                    GT_Log.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
+                    GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
                 worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ);
             }
 
@@ -540,9 +540,9 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 
             // Do leftover worldgen for this chunk (GT_Stones and GT_small_ores)
             try {
-                for (WorldGen_GT tWorldGen : HANDLER_GT.sWorldgenListEverglades) {
+                for (WorldGen_GT tWorldGen : HandlerGT.sWorldgenListEverglades) {
                     /*
-                     * if (debugWorldGen) GT_Log.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
+                     * if (debugWorldGen) GTLog.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
                      */
                     tWorldGen.executeWorldgen(
                         this.mWorld,
@@ -555,7 +555,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                         this.mChunkProvider);
                 }
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
 
             long leftOverTime = System.nanoTime();
@@ -567,7 +567,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             long endTime = System.nanoTime();
             long duration = (endTime - startTime);
             if (debugWorldGen) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     " Oregen took " + (oregenTime - startTime)
                         + " Leftover gen took "
                         + (leftOverTime - oregenTime)
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index 90aea7b71a..bfeeff8910 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -15,16 +15,16 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 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 gregtech.api.util.GTLog;
+import gregtech.common.blocks.BlockOres;
+import gregtech.common.blocks.TileEntityOres;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
+import gtPlusPlus.xmod.gregtech.HandlerGT;
 
 public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
 
@@ -85,23 +85,23 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
         super(aName, sList, aDefault);
         Logger.WORLD("Creating Ore Layer Object");
-        this.mOverworld = HANDLER_GT.sCustomWorldgenFile
+        this.mOverworld = HandlerGT.sCustomWorldgenFile
             .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
-        this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);
-        this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd);
+        this.mNether = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);
+        this.mEnd = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd);
         this.mMinY = 5;
         short mMaxY = 14;
         if (mMaxY < (this.mMinY + 7)) {
-            GT_Log.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!");
+            GTLog.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!");
             mMaxY = (short) (this.mMinY + 7);
         }
         this.mMaxY = mMaxY;
-        this.mWeight = ((short) HANDLER_GT.sCustomWorldgenFile
+        this.mWeight = ((short) HandlerGT.sCustomWorldgenFile
             .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
-        this.mDensity = ((short) HANDLER_GT.sCustomWorldgenFile
+        this.mDensity = ((short) HandlerGT.sCustomWorldgenFile
             .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
         this.mSize = ((short) Math
-            .max(1, HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
+            .max(1, HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
         this.mPrimary = aPrimary;
         this.mSecondary = aSecondary;
         this.mBetween = aBetween;
@@ -136,14 +136,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         }
 
         if (mWorldGenName.equals("vein0")) {
-            if (debugWorldGen) GT_Log.out.println(" NoOresInVein-vein0");
+            if (debugWorldGen) GTLog.out.println(" NoOresInVein-vein0");
             // This is a special empty orevein
             Logger.WORLD("[World Generation Debug] Special Empty Vein placed.");
             return ORE_PLACED;
         }
-        if (aDimensionType != Dimension_Everglades.DIMID) {
+        if (aDimensionType != DimensionEverglades.DIMID) {
             /*
-             * // Debug code, but spams log if (debugWorldGen) { GT_Log.out.println( "Wrong dimension" ); }
+             * // Debug code, but spams log if (debugWorldGen) { GTLog.out.println( "Wrong dimension" ); }
              */
             Logger.WORLD("[World Generation Debug] Wrong dimension.");
             return WRONG_DIMENSION;
@@ -164,19 +164,19 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
             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_Everglades.blockSecondLayer)
+                    .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockSecondLayer)
                 || tBlock
-                    .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller)
+                    .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockMainFiller)
                 || tBlock.isReplaceableOreGen(
                     aWorld,
                     aChunkX + 8,
                     tMinY,
                     aChunkZ + 8,
-                    Dimension_Everglades.blockSecondaryFiller)
+                    DimensionEverglades.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)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) {
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites)
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) {
                 // Didn't reach, but could have placed. Save orevein for future use.
                 return NO_OVERLAP;
             } else {
@@ -195,8 +195,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
             if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone)
                 || 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)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) {
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites)
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) {
                 // Didn't reach, but could have placed. Save orevein for future use.
                 return NO_OVERLAP;
             } else {
@@ -207,7 +207,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
 
         if (debugWorldGen) {
             String tDimensionName = aWorld.provider.getDimensionName();
-            GT_Log.out.print(
+            GTLog.out.print(
                 "Trying Orevein:" + this.mWorldGenName
                     + " Dimension="
                     + tDimensionName
@@ -254,7 +254,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
             }
         }
         /*
-         * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GT_Log.out.println( " No ore in bottom layer" );
+         * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GTLog.out.println( " No ore in bottom layer" );
          * return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer }
          */
         Logger.WORLD("[World Generation Debug] Trying to set Ores?");
@@ -359,7 +359,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         }
         if (debugWorldGen) {
             String tDimensionName = aWorld.provider.getDimensionName();
-            GT_Log.out.println(
+            GTLog.out.println(
                 "Generated Orevein:" + this.mWorldGenName
                     + " Dimension="
                     + tDimensionName
@@ -408,7 +408,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         }
 
         // Set GT ORE
-        if (aMetaData instanceof GT_Block_Ores) {
+        if (aMetaData instanceof BlockOres) {
             if (ore1String.equals("unset")) {
                 ore1String = Utils.sanitizeString(
                     this.mPrimary.getLocalizedName()
@@ -527,11 +527,11 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)
             || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sand)
             || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt)
-            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)
-            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones)
-            || 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, GregTechAPI.sBlockGranites)
+            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones)
+            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondLayer)
+            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockMainFiller)
+            || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondaryFiller)
             || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) {
 
             if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)) {
@@ -550,7 +550,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         Method setOres = null;
 
         try {
-            setOres = GT_TileEntity_Ores.class.getDeclaredMethod(
+            setOres = TileEntityOres.class.getDeclaredMethod(
                 "setOreBlock",
                 World.class,
                 int.class,
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
index e45b4bcd20..6ccdcaf115 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
@@ -2,9 +2,9 @@ package gtPlusPlus.everglades.gen.gt;
 
 import java.util.Hashtable;
 
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.ORES;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOres;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 
 public class WorldGen_Ores {
 
@@ -15,10 +15,10 @@ public class WorldGen_Ores {
         1,
         1,
         128,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON,
-        ELEMENT.getInstance().IRON);
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON,
+        MaterialsElements.getInstance().IRON);
 
     /**
      * Custom ore Veins
@@ -30,10 +30,10 @@ public class WorldGen_Ores {
         30,
         2,
         16,
-        ORES.AGARDITE_CD,
-        ORES.AGARDITE_LA,
-        ORES.DEMICHELEITE_BR,
-        ORES.IRARSITE);
+        MaterialsOres.AGARDITE_CD,
+        MaterialsOres.AGARDITE_LA,
+        MaterialsOres.DEMICHELEITE_BR,
+        MaterialsOres.IRARSITE);
 
     public static WorldGen_GT_Ore_Layer Vein2 = new WorldGen_GT_Ore_Layer(
         "vein2",
@@ -42,10 +42,10 @@ public class WorldGen_Ores {
         30,
         2,
         16,
-        ORES.AGARDITE_ND,
-        ORES.AGARDITE_Y,
-        ORES.KASHINITE,
-        ORES.CERITE);
+        MaterialsOres.AGARDITE_ND,
+        MaterialsOres.AGARDITE_Y,
+        MaterialsOres.KASHINITE,
+        MaterialsOres.CERITE);
 
     public static WorldGen_GT_Ore_Layer Vein3 = new WorldGen_GT_Ore_Layer(
         "vein3",
@@ -54,10 +54,10 @@ public class WorldGen_Ores {
         30,
         3,
         32,
-        ORES.CERITE,
-        ORES.NICHROMITE,
-        ORES.XENOTIME,
-        ORES.HIBONITE);
+        MaterialsOres.CERITE,
+        MaterialsOres.NICHROMITE,
+        MaterialsOres.XENOTIME,
+        MaterialsOres.HIBONITE);
 
     public static WorldGen_GT_Ore_Layer Vein4 = new WorldGen_GT_Ore_Layer(
         "vein4",
@@ -66,10 +66,10 @@ public class WorldGen_Ores {
         40,
         3,
         32,
-        ORES.GEIKIELITE,
-        ORES.CRYOLITE,
-        ORES.GADOLINITE_CE,
-        ORES.AGARDITE_ND);
+        MaterialsOres.GEIKIELITE,
+        MaterialsOres.CRYOLITE,
+        MaterialsOres.GADOLINITE_CE,
+        MaterialsOres.AGARDITE_ND);
 
     public static WorldGen_GT_Ore_Layer Vein5 = new WorldGen_GT_Ore_Layer(
         "vein5",
@@ -78,10 +78,10 @@ public class WorldGen_Ores {
         20,
         2,
         48,
-        ORES.HIBONITE,
-        ORES.YTTRIALITE,
-        ORES.ZIRCONILITE,
-        ORES.CERITE);
+        MaterialsOres.HIBONITE,
+        MaterialsOres.YTTRIALITE,
+        MaterialsOres.ZIRCONILITE,
+        MaterialsOres.CERITE);
     public static WorldGen_GT_Ore_Layer Vein6 = new WorldGen_GT_Ore_Layer(
         "vein6",
         0,
@@ -89,10 +89,10 @@ public class WorldGen_Ores {
         20,
         2,
         48,
-        ORES.XENOTIME,
-        ORES.ZIRKELITE,
-        ORES.CROCROITE,
-        ORES.IRARSITE);
+        MaterialsOres.XENOTIME,
+        MaterialsOres.ZIRKELITE,
+        MaterialsOres.CROCROITE,
+        MaterialsOres.IRARSITE);
     public static WorldGen_GT_Ore_Layer Vein7 = new WorldGen_GT_Ore_Layer(
         "vein7",
         40,
@@ -100,10 +100,10 @@ public class WorldGen_Ores {
         20,
         2,
         48,
-        ORES.HONEAITE,
-        ORES.MIESSIITE,
-        ORES.SAMARSKITE_Y,
-        ORES.SAMARSKITE_YB);
+        MaterialsOres.HONEAITE,
+        MaterialsOres.MIESSIITE,
+        MaterialsOres.SAMARSKITE_Y,
+        MaterialsOres.SAMARSKITE_YB);
     public static WorldGen_GT_Ore_Layer Vein8 = new WorldGen_GT_Ore_Layer(
         "vein8",
         0,
@@ -111,10 +111,10 @@ public class WorldGen_Ores {
         20,
         2,
         48,
-        ORES.TITANITE,
-        ORES.ZIMBABWEITE,
-        ORES.ZIRCON,
-        ORES.FLORENCITE);
+        MaterialsOres.TITANITE,
+        MaterialsOres.ZIMBABWEITE,
+        MaterialsOres.ZIRCON,
+        MaterialsOres.FLORENCITE);
 
     public static WorldGen_GT_Ore_Layer Vein9 = new WorldGen_GT_Ore_Layer(
         "vein9",
@@ -123,10 +123,10 @@ public class WorldGen_Ores {
         20,
         1,
         48,
-        ORES.LANTHANITE_CE,
-        FLUORIDES.FLUORITE,
-        ORES.LAFOSSAITE,
-        ORES.FLORENCITE);
+        MaterialsOres.LANTHANITE_CE,
+        MaterialsFluorides.FLUORITE,
+        MaterialsOres.LAFOSSAITE,
+        MaterialsOres.FLORENCITE);
     public static WorldGen_GT_Ore_Layer Vein10 = new WorldGen_GT_Ore_Layer(
         "vein10",
         20,
@@ -134,10 +134,10 @@ public class WorldGen_Ores {
         20,
         2,
         32,
-        ORES.GEIKIELITE,
-        ORES.YTTROCERITE,
-        ORES.LANTHANITE_LA,
-        ORES.RADIOBARITE);
+        MaterialsOres.GEIKIELITE,
+        MaterialsOres.YTTROCERITE,
+        MaterialsOres.LANTHANITE_LA,
+        MaterialsOres.RADIOBARITE);
     public static WorldGen_GT_Ore_Layer Vein11 = new WorldGen_GT_Ore_Layer(
         "vein11",
         30,
@@ -145,10 +145,10 @@ public class WorldGen_Ores {
         20,
         1,
         48,
-        FLUORIDES.FLUORITE,
-        ORES.KASHINITE,
-        ORES.ZIRCON,
-        ORES.CRYOLITE);
+        MaterialsFluorides.FLUORITE,
+        MaterialsOres.KASHINITE,
+        MaterialsOres.ZIRCON,
+        MaterialsOres.CRYOLITE);
     public static WorldGen_GT_Ore_Layer Vein12 = new WorldGen_GT_Ore_Layer(
         "vein12",
         40,
@@ -156,10 +156,10 @@ public class WorldGen_Ores {
         20,
         3,
         32,
-        ORES.CERITE,
-        ORES.ALBURNITE,
-        ORES.MIESSIITE,
-        ORES.HIBONITE);
+        MaterialsOres.CERITE,
+        MaterialsOres.ALBURNITE,
+        MaterialsOres.MIESSIITE,
+        MaterialsOres.HIBONITE);
 
     /**
      * Best Rarest Veins 2017
@@ -171,10 +171,10 @@ public class WorldGen_Ores {
         5,
         1,
         16,
-        ORES.CRYOLITE,
-        ORES.RADIOBARITE,
-        ORES.HONEAITE,
-        ORES.FLORENCITE);
+        MaterialsOres.CRYOLITE,
+        MaterialsOres.RADIOBARITE,
+        MaterialsOres.HONEAITE,
+        MaterialsOres.FLORENCITE);
 
     public static WorldGen_GT_Ore_Layer Vein14 = new WorldGen_GT_Ore_Layer(
         "vein14",
@@ -183,10 +183,10 @@ public class WorldGen_Ores {
         8,
         2,
         16,
-        ORES.DEMICHELEITE_BR,
-        ORES.PERROUDITE,
-        ORES.IRARSITE,
-        ORES.RADIOBARITE);
+        MaterialsOres.DEMICHELEITE_BR,
+        MaterialsOres.PERROUDITE,
+        MaterialsOres.IRARSITE,
+        MaterialsOres.RADIOBARITE);
 
     public static WorldGen_GT_Ore_Layer Vein15 = new WorldGen_GT_Ore_Layer(
         "vein15",
@@ -195,10 +195,10 @@ public class WorldGen_Ores {
         5,
         3,
         24,
-        ORES.FLUORCAPHITE,
-        ORES.LAFOSSAITE,
-        ORES.GADOLINITE_CE,
-        ORES.GADOLINITE_Y);
+        MaterialsOres.FLUORCAPHITE,
+        MaterialsOres.LAFOSSAITE,
+        MaterialsOres.GADOLINITE_CE,
+        MaterialsOres.GADOLINITE_Y);
 
     public static WorldGen_GT_Ore_Layer Vein16 = new WorldGen_GT_Ore_Layer(
         "vein16",
@@ -207,10 +207,10 @@ public class WorldGen_Ores {
         4,
         2,
         32,
-        ORES.YTTROCERITE,
-        ORES.LEPERSONNITE,
-        ORES.LAUTARITE,
-        FLUORIDES.FLUORITE);
+        MaterialsOres.YTTROCERITE,
+        MaterialsOres.LEPERSONNITE,
+        MaterialsOres.LAUTARITE,
+        MaterialsFluorides.FLUORITE);
 
     public static WorldGen_GT_Ore_Layer Vein17 = new WorldGen_GT_Ore_Layer(
         "vein17",
@@ -219,10 +219,10 @@ public class WorldGen_Ores {
         4,
         1,
         32,
-        ORES.FLORENCITE,
-        ORES.LAUTARITE,
-        ORES.SAMARSKITE_YB,
-        ORES.POLYCRASE);
+        MaterialsOres.FLORENCITE,
+        MaterialsOres.LAUTARITE,
+        MaterialsOres.SAMARSKITE_YB,
+        MaterialsOres.POLYCRASE);
     public static WorldGen_GT_Ore_Layer Vein18 = new WorldGen_GT_Ore_Layer(
         "vein18",
         15,
@@ -230,10 +230,10 @@ public class WorldGen_Ores {
         4,
         1,
         48,
-        ORES.GADOLINITE_CE,
-        ORES.GADOLINITE_Y,
-        ORES.AGARDITE_LA,
-        ORES.AGARDITE_CD);
+        MaterialsOres.GADOLINITE_CE,
+        MaterialsOres.GADOLINITE_Y,
+        MaterialsOres.AGARDITE_LA,
+        MaterialsOres.AGARDITE_CD);
 
     public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024);