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

11 files changed, 1298 insertions, 1211 deletions

diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 95088535ce..836ccfa504 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.material;
 
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
 
@@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
@@ -381,7 +381,7 @@ public class Material {
         try {
             this.unlocalizedName = Utils.sanitizeString(materialName);
             this.localizedName = materialName;
-            this.translatedName = GT_LanguageManager
+            this.translatedName = GTLanguageManager
                 .addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
             mMaterialCache.put(getLocalizedName().toLowerCase(), this);
             Logger.INFO("Stored " + getLocalizedName() + " to cache with key: " + getLocalizedName().toLowerCase());
@@ -759,37 +759,37 @@ public class Material {
         for (MaterialStack m : this.getComposites()) {
 
             // Gems
-            if (m.getStackMaterial() == ELEMENT.getInstance().AER) {
+            if (m.getStackMaterial() == MaterialsElements.getInstance().AER) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().AQUA) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().AQUA) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().IGNIS) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().IGNIS) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TERRA) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TERRA) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) {
                 aGem++;
             }
             // Shiny Materials
-            if (m.getStackMaterial() == ELEMENT.getInstance().GOLD) {
+            if (m.getStackMaterial() == MaterialsElements.getInstance().GOLD) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().SILVER) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().SILVER) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().PLATINUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().PLATINUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TITANIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TITANIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().GERMANIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().GERMANIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().GALLIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().GALLIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MERCURY) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MERCURY) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().SAMARIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().SAMARIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TANTALUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TANTALUM) {
                 aShiny++;
             }
         }
@@ -831,7 +831,7 @@ public class Material {
                 if (r.getStackMaterial()
                     .getTextureSet().mSetName.toLowerCase()
                         .contains("fluid")) {
-                    sets.put(ELEMENT.getInstance().GOLD);
+                    sets.put(MaterialsElements.getInstance().GOLD);
                 } else {
                     sets.put(r.getStackMaterial());
                 }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index 8b07e29a52..1dce894309 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -9,8 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -40,26 +40,26 @@ import gtPlusPlus.core.item.base.rods.BaseItemRod;
 import gtPlusPlus.core.item.base.rods.BaseItemRodLong;
 import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
 import gtPlusPlus.core.item.base.screws.BaseItemScrew;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_AlloySmelter;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Assembler;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluorite;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MetalRecipe;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAlloySmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAssembler;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenBlastSmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenExtruder;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluidCanning;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluids;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluorite;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMaterialProcessing;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMetalRecipe;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenOre;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlasma;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlates;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenRecycling;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenShapedCrafting;
 
 public class MaterialGenerator {
 
@@ -81,7 +81,7 @@ public class MaterialGenerator {
     public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
         FluidStack rFluidOut, Integer aTime, Integer aEu) {
 
-        RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
+        RecipeGenFluidCanning g = new RecipeGenFluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
         if (g != null && g.valid()) {
             return true;
         }
@@ -178,21 +178,21 @@ public class MaterialGenerator {
             }
 
             // Add A jillion Recipes - old code
-            new RecipeGen_AlloySmelter(matInfo);
-            new RecipeGen_Assembler(matInfo);
+            new RecipeGenAlloySmelter(matInfo);
+            new RecipeGenAssembler(matInfo);
             if (generateBlastSmelterRecipes) {
-                new RecipeGen_BlastSmelter(matInfo);
+                new RecipeGenBlastSmelter(matInfo);
             }
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_Extruder(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_Plates(matInfo);
-            new RecipeGen_ShapedCrafting(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenExtruder(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenPlates(matInfo);
+            new RecipeGenShapedCrafting(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
 
-            new RecipeGen_DustGeneration(matInfo);
-            new RecipeGen_Recycling(matInfo);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenDustGeneration(matInfo);
+            new RecipeGenRecycling(matInfo);
+            new RecipeGenPlasma(matInfo);
 
             return true;
 
@@ -225,9 +225,9 @@ public class MaterialGenerator {
 
         // Add A jillion Recipes - old code
         try {
-            RecipeGen_DustGeneration.addMixerRecipe_Standalone(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
+            RecipeGenDustGeneration.addMixerRecipe_Standalone(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
         } catch (Throwable t) {
             Logger.MATERIALS("Failed to generate some recipes for " + materialName);
             Logger.ERROR("Failed to generate some recipes for " + materialName);
@@ -247,8 +247,8 @@ public class MaterialGenerator {
     public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe) {
         generateNuclearMaterial(matInfo, false, true, false, false, true);
         if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(20))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(20))
                 .itemOutputs(matInfo.getDust(1))
                 .fluidInputs(matInfo.getFluidStack(144))
                 .eut(matInfo.vVoltageMultiplier)
@@ -287,21 +287,21 @@ public class MaterialGenerator {
             if (generatePlates) {
                 temp = new BaseItemPlate(matInfo);
                 temp = new BaseItemPlateDouble(matInfo);
-                new RecipeGen_Plates(matInfo);
-                new RecipeGen_Extruder(matInfo);
-                new RecipeGen_Assembler(matInfo);
+                new RecipeGenPlates(matInfo);
+                new RecipeGenExtruder(matInfo);
+                new RecipeGenAssembler(matInfo);
             }
 
             if (!disableOptionalRecipes) {
-                new RecipeGen_ShapedCrafting(matInfo);
-                new RecipeGen_Fluids(matInfo);
-                new RecipeGen_MaterialProcessing(matInfo);
-                new RecipeGen_Recycling(matInfo);
+                new RecipeGenShapedCrafting(matInfo);
+                new RecipeGenFluids(matInfo);
+                new RecipeGenMaterialProcessing(matInfo);
+                new RecipeGenRecycling(matInfo);
             }
 
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_DustGeneration(matInfo, disableOptionalRecipes);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenDustGeneration(matInfo, disableOptionalRecipes);
+            new RecipeGenPlasma(matInfo);
 
         } catch (final Throwable t) {
             Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
@@ -365,10 +365,10 @@ public class MaterialGenerator {
                 "Generated all ore components for " + matInfo.getLocalizedName()
                     + ", now generating processing recipes.");
 
-            if (matInfo == FLUORIDES.FLUORITE) {
-                new RecipeGen_Fluorite(matInfo);
+            if (matInfo == MaterialsFluorides.FLUORITE) {
+                new RecipeGenFluorite(matInfo);
             } else {
-                new RecipeGen_Ore(matInfo);
+                new RecipeGenOre(matInfo);
             }
 
         } catch (final Throwable t) {
@@ -406,19 +406,19 @@ public class MaterialGenerator {
                 "Generated all ore & base components for " + matInfo.getLocalizedName()
                     + ", now generating processing recipes.");
 
-            new RecipeGen_Ore(matInfo, true);
-            new RecipeGen_AlloySmelter(matInfo);
-            new RecipeGen_Assembler(matInfo);
-            new RecipeGen_BlastSmelter(matInfo);
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_Extruder(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_Plates(matInfo);
-            new RecipeGen_ShapedCrafting(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
-            new RecipeGen_DustGeneration(matInfo);
-            new RecipeGen_Recycling(matInfo);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenOre(matInfo, true);
+            new RecipeGenAlloySmelter(matInfo);
+            new RecipeGenAssembler(matInfo);
+            new RecipeGenBlastSmelter(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenExtruder(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenPlates(matInfo);
+            new RecipeGenShapedCrafting(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
+            new RecipeGenDustGeneration(matInfo);
+            new RecipeGenRecycling(matInfo);
+            new RecipeGenPlasma(matInfo);
             return true;
         } catch (final Throwable t) {
             Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
index c46b05fbb8..d00529d044 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
@@ -7,7 +7,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
-public final class MISC_MATERIALS {
+public final class MaterialMisc {
 
     /*
      * Some of these materials purely exist as data objects, items will most likely be assigned separately. Most are
@@ -40,9 +40,9 @@ public final class MISC_MATERIALS {
         "KNO3",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
     public static final Material SODIUM_NITRATE = new Material(
         "Sodium Nitrate",
         MaterialState.SOLID, // State
@@ -56,9 +56,9 @@ public final class MISC_MATERIALS {
         "NaNO3",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
 
     public static final Material SOLAR_SALT_COLD = new Material(
         "Solar Salt (Cold)",
@@ -99,8 +99,8 @@ public final class MISC_MATERIALS {
         "SrO",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     public static final Material SELENIUM_DIOXIDE = new Material(
         "Selenium Dioxide",
@@ -112,8 +112,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material SELENIOUS_ACID = new Material(
         "Selenious Acid",
@@ -126,8 +126,8 @@ public final class MISC_MATERIALS {
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
         new MaterialStack(SELENIUM_DIOXIDE, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 8),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material HYDROGEN_CYANIDE = new Material(
         "Hydrogen Cyanide",
@@ -139,9 +139,9 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1));
 
     public static final Material CARBON_MONOXIDE = new Material(
         "Carbon Monoxide",
@@ -153,8 +153,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     public static final Material CARBON_DIOXIDE = new Material(
         "Carbon Dioxide",
@@ -166,8 +166,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material WOODS_GLASS = new Material(
         "Wood's Glass", // Material Name
@@ -182,10 +182,10 @@ public final class MISC_MATERIALS {
         "Si4Ba3Na2Ni",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SILICON, 40),
-        new MaterialStack(ELEMENT.getInstance().BARIUM, 30),
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 10));
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 40),
+        new MaterialStack(MaterialsElements.getInstance().BARIUM, 30),
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 10));
 
     /*
      * Rare Earth Materials
@@ -201,12 +201,14 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1),
-            new MaterialStack(ORES.AGARDITE_CD, 1), new MaterialStack(ORES.YTTRIALITE, 1),
+        new MaterialStack[] { new MaterialStack(MaterialsOres.GREENOCKITE, 1),
+            new MaterialStack(MaterialsOres.LANTHANITE_CE, 1), new MaterialStack(MaterialsOres.AGARDITE_CD, 1),
+            new MaterialStack(MaterialsOres.YTTRIALITE, 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
-            new MaterialStack(ORES.CRYOLITE, 1), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) });
+            new MaterialStack(MaterialsOres.CRYOLITE, 1),
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1) });
 
     public static final Material RARE_EARTH_MID = new Material(
         "Rare Earth (II)", // Material Name
@@ -218,11 +220,12 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.LANTHANITE_ND, 1), new MaterialStack(ORES.AGARDITE_ND, 1),
-            new MaterialStack(ORES.YTTRIAITE, 1), new MaterialStack(ORES.CROCROITE, 1),
-            new MaterialStack(ORES.NICHROMITE, 1), new MaterialStack(ORES.ZIRCON, 1),
-            new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1), new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
-            new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsOres.LANTHANITE_ND, 1),
+            new MaterialStack(MaterialsOres.AGARDITE_ND, 1), new MaterialStack(MaterialsOres.YTTRIAITE, 1),
+            new MaterialStack(MaterialsOres.CROCROITE, 1), new MaterialStack(MaterialsOres.NICHROMITE, 1),
+            new MaterialStack(MaterialsOres.ZIRCON, 1), new MaterialStack(MaterialsElements.STANDALONE.GRANITE, 1),
+            new MaterialStack(MaterialsElements.STANDALONE.BLACK_METAL, 1),
+            new MaterialStack(MaterialsElements.STANDALONE.RUNITE, 1) });
 
     public static final Material RARE_EARTH_HIGH = new Material(
         "Rare Earth (III)", // Material Name
@@ -234,17 +237,17 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.GADOLINITE_Y, 1), new MaterialStack(ORES.LEPERSONNITE, 1),
-            new MaterialStack(ORES.FLORENCITE, 1), new MaterialStack(ORES.FLUORCAPHITE, 1),
-            new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1),
-            new MaterialStack(ORES.ALBURNITE, 1), new MaterialStack(ORES.SAMARSKITE_Y, 1),
-            new MaterialStack(ORES.AGARDITE_LA, 1), });
+        new MaterialStack[] { new MaterialStack(MaterialsOres.GADOLINITE_Y, 1),
+            new MaterialStack(MaterialsOres.LEPERSONNITE, 1), new MaterialStack(MaterialsOres.FLORENCITE, 1),
+            new MaterialStack(MaterialsOres.FLUORCAPHITE, 1), new MaterialStack(MaterialsOres.LAUTARITE, 1),
+            new MaterialStack(MaterialsOres.DEMICHELEITE_BR, 1), new MaterialStack(MaterialsOres.ALBURNITE, 1),
+            new MaterialStack(MaterialsOres.SAMARSKITE_Y, 1), new MaterialStack(MaterialsOres.AGARDITE_LA, 1), });
 
     public static final Material WATER = new Material(
         "Water",
         MaterialState.PURE_LIQUID,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     // OH
     public static final Material HYDROXIDE = new Material(
@@ -257,8 +260,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1));
 
     // NH3
     public static final Material AMMONIA = new Material(
@@ -271,8 +274,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3));
 
     // NH4
     public static final Material AMMONIUM = new Material(
@@ -285,14 +288,14 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 4));
 
     public static final Material HYDROGEN_CHLORIDE = new Material(
         "Hydrogen Chloride",
         MaterialState.PURE_GAS,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material HYDROGEN_CHLORIDE_MIX = new Material(
         "Hydrogen Chloride Mix",
@@ -304,14 +307,14 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material SODIUM_CHLORIDE = new Material(
         "Sodium Chloride",
         MaterialState.PURE_GAS,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material SALT_WATER = new Material(
         "Salt Water",
@@ -338,8 +341,8 @@ public final class MISC_MATERIALS {
         "Sr(OH)2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-        new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2));
+        new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1),
+        new MaterialStack(MaterialMisc.HYDROXIDE, 2));
 
     // Glue Chemicals
 
@@ -355,9 +358,9 @@ public final class MISC_MATERIALS {
         "(CH3CO)2O",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 4),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 4),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
 
     public static final Material CHLOROACETIC_ACID = new Material(
         "Chloroacetic Acid",
@@ -371,10 +374,10 @@ public final class MISC_MATERIALS {
         "ClCH2-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material DICHLOROACETIC_ACID = new Material(
         "Dichloroacetic Acid",
@@ -388,10 +391,10 @@ public final class MISC_MATERIALS {
         "Cl2CH-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2));
 
     public static final Material TRICHLOROACETIC_ACID = new Material(
         "Trichloroacetic Acid",
@@ -405,10 +408,10 @@ public final class MISC_MATERIALS {
         "Cl3C-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3));
 
     public static final Material CHLOROACETIC_MIXTURE = new Material(
         "Chloroacetic Mixture",
@@ -423,10 +426,10 @@ public final class MISC_MATERIALS {
         "Cl?H?C-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 6),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 6));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 6),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 6));
 
     public static final Material SODIUM_CYANIDE = new Material(
         "Sodium Cyanide",
@@ -440,9 +443,9 @@ public final class MISC_MATERIALS {
         "NaCN",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1));
 
     public static final Material CALCIUM_CHLORIDE = new Material(
         "Calcium Chloride",
@@ -456,8 +459,8 @@ public final class MISC_MATERIALS {
         "CaCl2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 2));
+        new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2));
 
     public static final Material CYANOACETIC_ACID = new Material(
         "Cyanoacetic Acid",
@@ -471,10 +474,10 @@ public final class MISC_MATERIALS {
         "C3H3NO2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 3),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 3),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material SOLID_ACID_MIXTURE = new Material(
         "Solid Acid Catalyst Mixture",
@@ -488,9 +491,9 @@ public final class MISC_MATERIALS {
         "?H2SO4?",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material COPPER_SULFATE = new Material(
         "Copper(II) Sulfate",
@@ -504,9 +507,9 @@ public final class MISC_MATERIALS {
         "CuSO4",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().COPPER, 1),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 1),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     p