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

40 files changed, 783 insertions, 769 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 2253b024a7..cdb61a5e46 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 
 import net.minecraft.item.EnumRarity;
@@ -17,14 +17,14 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.common.compat.COMPAT_Baubles;
+import gtPlusPlus.core.common.compat.CompatBaubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
 import gtPlusPlus.core.item.base.BaseItemDamageable;
@@ -34,7 +34,7 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDust;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
-import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
@@ -48,10 +48,10 @@ import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.food.BaseItemMetaFood;
-import gtPlusPlus.core.item.general.BufferCore;
 import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine;
 import gtPlusPlus.core.item.general.ItemBlueprint;
+import gtPlusPlus.core.item.general.ItemBufferCore;
 import gtPlusPlus.core.item.general.ItemEmpty;
 import gtPlusPlus.core.item.general.ItemGenericToken;
 import gtPlusPlus.core.item.general.ItemHalfCompleteCasings;
@@ -64,17 +64,17 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
 import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.materials.DustDecayable;
-import gtPlusPlus.core.item.tool.misc.GregtechPump;
+import gtPlusPlus.core.item.tool.misc.ItemGregtechPump;
 import gtPlusPlus.core.item.wearable.WearableLoader;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.NONMATERIAL;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOther;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
+import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -82,7 +82,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.everglades.GTplusplus_Everglades;
+import gtPlusPlus.everglades.GTPPEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
@@ -181,7 +181,7 @@ public final class ModItems {
     public static Item dustRadium226;
     public static Item dustProtactinium233;
 
-    public static GregtechPump toolGregtechPump;
+    public static ItemGregtechPump toolGregtechPump;
 
     public static ItemGenericToken itemGenericToken;
 
@@ -219,11 +219,7 @@ public final class ModItems {
         Logger.INFO("Items!");
         // Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is
         // called upon.
-        AAA_Broken = new BaseItemIngot_OLD(
-            "AAA_Broken",
-            "Errors - Tell Alkalus",
-            Utils.rgbtoHexValue(128, 128, 128),
-            0);
+        AAA_Broken = new BaseItemIngotOld("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
         ZZZ_Empty = new ItemEmpty();
     }
 
@@ -277,33 +273,33 @@ public final class ModItems {
 
             // Elements generate first so they can be used in compounds.
             // Missing Elements
-            MaterialGenerator.generate(ELEMENT.getInstance().SELENIUM); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().BROMINE);
-            MaterialGenerator.generate(ELEMENT.getInstance().KRYPTON); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().STRONTIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().RUTHENIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().IODINE); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE);
+            MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM);
 
             // RADIOACTIVE ELEMENTS
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false);
             // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false);
 
             // Nuclear Isotopes
 
@@ -314,168 +310,168 @@ public final class ModItems {
             // neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural
             // lithium a
             // strong requirement for the possible use in lithium fluoride reactors.
-            MaterialGenerator.generate(ELEMENT.getInstance().LITHIUM7, false);
+            MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false);
             // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case.
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().THORIUM232);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232);
             // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U
             // as an impurity
             // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232:
-            MaterialGenerator.generate(ELEMENT.getInstance().URANIUM232);
+            MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM232);
             // Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel
             // cycle.
-            MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233);
+            MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM233);
             // Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage
             // in radioisotope thermoelectric generators (RTGs)
             // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power.
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PLUTONIUM238, false);
 
             // Custom Materials that will have standalone refinery processes
-            MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.ADVANCED_NITINOL, false);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.ASTRAL_TITANIUM);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.HYPOGEN);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
             // Custom Materials that are from Runescape
-            MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL);
-            MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE);
-            MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.BLACK_METAL);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.WHITE_METAL);
+            MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.GRANITE);
+            MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.RUNITE);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.DRAGON_METAL);
 
-            MISC_MATERIALS.run();
+            MaterialMisc.run();
 
-            MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
-            MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.SILICON_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.ZIRCONIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.NIOBIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE);
 
             // LFTR Fuel components
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.AMMONIUM_BIFLUORIDE); // LFTR fuel component
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_HYDROXIDE); // LFTR fuel component
             // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component
 
             // Generate Fluorides
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_FLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.LITHIUM_FLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_TETRAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_TETRAFLUORIDE, false);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_HEXAFLUORIDE, false);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_FLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.LITHIUM_FLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_TETRAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_TETRAFLUORIDE, false);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_HEXAFLUORIDE, false);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE);
             // LFTR Fluoride outputs
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.TECHNETIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.SELENIUM_HEXAFLUORIDE);
 
             // Generate Reactor Fuel Salts
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235);
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4);
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4U235);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4UF4);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ThF4UF4);
             // MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false);
 
             // Generate some Alloys
 
             // Misc Alloys
-            MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL);
-            MaterialGenerator.generate(ALLOY.BLOODSTEEL);
+            MaterialGenerator.generate(MaterialsAlloy.ENERGYCRYSTAL);
+            MaterialGenerator.generate(MaterialsAlloy.BLOODSTEEL);
 
-            MaterialGenerator.generate(ALLOY.ZERON_100);
+            MaterialGenerator.generate(MaterialsAlloy.ZERON_100);
             // Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper
-            MaterialGenerator.generate(ALLOY.TUMBAGA);
+            MaterialGenerator.generate(MaterialsAlloy.TUMBAGA);
             // Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
-            MaterialGenerator.generate(ALLOY.POTIN);
+            MaterialGenerator.generate(MaterialsAlloy.POTIN);
 
             // Staballoy & Tantalloy
-            MaterialGenerator.generate(ALLOY.STABALLOY);
-            MaterialGenerator.generate(ALLOY.TANTALLOY_60);
-            MaterialGenerator.generate(ALLOY.TANTALLOY_61);
+            MaterialGenerator.generate(MaterialsAlloy.STABALLOY);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_60);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_61);
 
             // Inconel
-            MaterialGenerator.generate(ALLOY.INCONEL_625);
-            MaterialGenerator.generate(ALLOY.INCONEL_690);
-            MaterialGenerator.generate(ALLOY.INCONEL_792);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_625);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_690);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_792);
 
             // Steels
-            MaterialGenerator.generateDusts(ALLOY.EGLIN_STEEL_BASE);
-            MaterialGenerator.generate(ALLOY.EGLIN_STEEL);
-            MaterialGenerator.generate(ALLOY.MARAGING250);
-            MaterialGenerator.generate(ALLOY.MARAGING300);
-            MaterialGenerator.generate(ALLOY.MARAGING350);
-            MaterialGenerator.generate(ALLOY.AQUATIC_STEEL);
+            MaterialGenerator.generateDusts(MaterialsAlloy.EGLIN_STEEL_BASE);
+            MaterialGenerator.generate(MaterialsAlloy.EGLIN_STEEL);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING250);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING300);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING350);
+            MaterialGenerator.generate(MaterialsAlloy.AQUATIC_STEEL);
 
-            MaterialGenerator.generate(ALLOY.NITINOL_60, true);
+            MaterialGenerator.generate(MaterialsAlloy.NITINOL_60, true);
 
             // Composite Alloys
-            MaterialGenerator.generate(ALLOY.STELLITE);
-            MaterialGenerator.generate(ALLOY.TALONITE);
+            MaterialGenerator.generate(MaterialsAlloy.STELLITE);
+            MaterialGenerator.generate(MaterialsAlloy.TALONITE);
 
             // Hastelloy
-            MaterialGenerator.generate(ALLOY.HASTELLOY_W);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_X);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_C276);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_N);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_W);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_X);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_C276);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_N);
 
             // Incoloy
-            MaterialGenerator.generate(ALLOY.INCOLOY_020);
-            MaterialGenerator.generate(ALLOY.INCOLOY_DS);
-            MaterialGenerator.generate(ALLOY.INCOLOY_MA956);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_020);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_DS);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_MA956);
 
             // Leagrisium
-            MaterialGenerator.generate(ALLOY.LEAGRISIUM);
+            MaterialGenerator.generate(MaterialsAlloy.LEAGRISIUM);
 
             // Super Conductor
-            MaterialGenerator.generate(ALLOY.HG1223, false, false);
+            MaterialGenerator.generate(MaterialsAlloy.HG1223, false, false);
 
             // Generate Fictional Materials
-            MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
-            MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
-            MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);
-            MaterialGenerator.generate(ALLOY.TRINIUM_REINFORCED_STEEL);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_TITANIUM);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH, false);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH_CARBON);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_REINFORCED_STEEL);
 
             // Top Tier Alloys
-            MaterialGenerator.generate(ALLOY.HELICOPTER);
-            MaterialGenerator.generate(ALLOY.LAFIUM);
-            MaterialGenerator.generate(ALLOY.CINOBITE);
-            MaterialGenerator.generate(ALLOY.PIKYONIUM);
-            MaterialGenerator.generate(ALLOY.ABYSSAL);
-            MaterialGenerator.generate(ALLOY.LAURENIUM);
+            MaterialGenerator.generate(MaterialsAlloy.HELICOPTER);
+            MaterialGenerator.generate(MaterialsAlloy.LAFIUM);
+            MaterialGenerator.generate(MaterialsAlloy.CINOBITE);
+            MaterialGenerator.generate(MaterialsAlloy.PIKYONIUM);
+            MaterialGenerator.generate(MaterialsAlloy.ABYSSAL);
+            MaterialGenerator.generate(MaterialsAlloy.LAURENIUM);
 
             // abs recipe in RECIPES_GREGTECH.java
-            MaterialGenerator.generate(ALLOY.BOTMIUM, true, false);
+            MaterialGenerator.generate(MaterialsAlloy.BOTMIUM, true, false);
 
-            MaterialGenerator.generate(ALLOY.HS188A);
+            MaterialGenerator.generate(MaterialsAlloy.HS188A);
 
-            MaterialGenerator.generate(ALLOY.TITANSTEEL);
-            MaterialGenerator.generate(ALLOY.ARCANITE);
-            MaterialGenerator.generate(ALLOY.OCTIRON);
+            MaterialGenerator.generate(MaterialsAlloy.TITANSTEEL);
+            MaterialGenerator.generate(MaterialsAlloy.ARCANITE);
+            MaterialGenerator.generate(MaterialsAlloy.OCTIRON);
 
-            MaterialGenerator.generate(ALLOY.BABBIT_ALLOY, false);
-            MaterialGenerator.generate(ALLOY.BLACK_TITANIUM, false);
-            MaterialGenerator.generate(ALLOY.INDALLOY_140, false, false);
+            MaterialGenerator.generate(MaterialsAlloy.BABBIT_ALLOY, false);
+            MaterialGenerator.generate(MaterialsAlloy.BLACK_TITANIUM, false);
+            MaterialGenerator.generate(MaterialsAlloy.INDALLOY_140, false, false);
 
             // High Level Bioplastic
-            MaterialGenerator.generate(ELEMENT.STANDALONE.RHUGNOR, false, false);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.RHUGNOR, false, false);
 
             // Must be the final Alloy to Generate
-            MaterialGenerator.generate(ALLOY.QUANTUM);
+            MaterialGenerator.generate(MaterialsAlloy.QUANTUM);
 
             // Ores
-            MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
-            MaterialGenerator.generateOreMaterial(ALLOY.KOBOLDITE);
-            GTplusplus_Everglades.GenerateOreMaterials();
+            MaterialGenerator.generateOreMaterial(MaterialsFluorides.FLUORITE);
+            MaterialGenerator.generateOreMaterial(MaterialsAlloy.KOBOLDITE);
+            GTPPEverglades.GenerateOreMaterials();
 
             // formula override
-            ALLOY.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3");
-            ALLOY.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???");
+            MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3");
+            MaterialsAlloy.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???");
 
             // Werkstoff bridge
-            ELEMENT.getInstance().ZIRCONIUM.setWerkstoffID((short) 3);
-            ELEMENT.getInstance().THORIUM232.setWerkstoffID((short) 30);
-            ELEMENT.getInstance().RUTHENIUM.setWerkstoffID((short) 64);
-            ELEMENT.getInstance().HAFNIUM.setWerkstoffID((short) 11000);
-            ELEMENT.getInstance().IODINE.setWerkstoffID((short) 11012);
+            MaterialsElements.getInstance().ZIRCONIUM.setWerkstoffID((short) 3);
+            MaterialsElements.getInstance().THORIUM232.setWerkstoff