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

12 files changed, 1074 insertions, 1065 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java
index a10d2cd05b..b66c508359 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class LOADER_Machine_Components {
+public class LoaderMachineComponents {
 
     public static void initialise() {
         registerDefaultComponents();
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
deleted file mode 100644
index 454e24f0d1..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
-import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-
-public class RECIPES_SeleniumProcessing {
-
-    public static void init() {
-
-        // We need this
-        MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false);
-
-        // Makes Selenium Dioxide
-        processCopperRecipes();
-
-        // Liquify the Dried Dioxide
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(13), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1))
-            .fluidInputs(FluidUtils.getSteam(500))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(1000))
-            .duration(24 * SECONDS)
-            .eut(1024)
-            .addTo(pyrolyseRecipes);
-
-        // Produce Selenious Acid
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(14), MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1))
-            .itemOutputs(CI.emptyCells(1))
-            .fluidInputs(FluidUtils.getHotWater(4000))
-            .fluidOutputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000))
-            .duration(24 * SECONDS)
-            .eut(TierEU.RECIPE_EV)
-            .addTo(pyrolyseRecipes);
-
-        // Make Selenium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(14), ELEMENT.getInstance().CARBON.getDust(16))
-            .itemOutputs(ELEMENT.getInstance().SELENIUM.getIngot(1), ELEMENT.getInstance().SELENIUM.getIngot(1))
-            .outputChances(100_00, 20_00)
-            .fluidInputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000))
-            .fluidOutputs(ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1))
-            .eut(TierEU.RECIPE_IV)
-            .duration(5 * MINUTES)
-            .addTo(alloyBlastSmelterRecipes);
-    }
-
-    public static void processCopperRecipes() {
-
-        // Copper
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 5_00, 5_00, 5_00, 10_00, 10_00, 10_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Tetra
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Chalco
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Malachite
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java
index 4369fdbfa3..2d8e417f1b 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class RECIPE_Batteries {
+public class RecipesBatteries {
 
     static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1);
     static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1);
@@ -27,35 +27,35 @@ public class RECIPE_Batteries {
 
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Sodium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Sodium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Sodium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Sodium,
             RECIPE_Battery_Sodium);
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Cadmium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Cadmium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Cadmium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Cadmium,
             RECIPE_Battery_Cadmium);
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Lithium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Lithium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Lithium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Lithium,
             RECIPE_Battery_Lithium);
     }
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
index 454810ae47..5ada7c5a03 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
@@ -3,8 +3,8 @@ package gtPlusPlus.core.recipe;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gtPlusPlus.core.recipe.common.CI.bitsd;
 import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
 import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
@@ -14,30 +14,30 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 
-public class RECIPES_General {
+public class RecipesGeneral {
 
     static final ItemStack NULL = null;
     static ItemStack RECIPE_Paper;
@@ -87,7 +87,7 @@ public class RECIPES_General {
             "stickWood",
             "dustBone",
             "stickWood",
-            ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))) {
+            ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))) {
             Logger.INFO("Added a recipe for Rainforest oak Saplings.");
         }
 
@@ -112,7 +112,7 @@ public class RECIPES_General {
         // Potin
         if (RecipeUtils.addShapelessGregtechRecipe(
             new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" },
-            ALLOY.POTIN.getDust(5))) {
+            MaterialsAlloy.POTIN.getDust(5))) {
             Logger.INFO("Added shapeless recipe for Potin Dust.");
         }
 
@@ -126,11 +126,11 @@ public class RECIPES_General {
             new Object[] { ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
                 ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
                 "dustGold" },
-            ALLOY.TUMBAGA.getDust(10))) {
+            MaterialsAlloy.TUMBAGA.getDust(10))) {
             Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
         }
 
-        if (CORE.ConfigSwitches.enableMachine_Pollution) {
+        if (GTPPCore.ConfigSwitches.enableMachine_Pollution) {
             RecipeUtils.addShapedRecipe(
                 CI.craftingToolFile,
                 "plateIron",
@@ -166,7 +166,7 @@ public class RECIPES_General {
                 ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1));
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Blocks.glass, 16),
                 ItemUtils.getSimpleStack(Blocks.glowstone, 16),
@@ -178,7 +178,7 @@ public class RECIPES_General {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Blocks.glass, 64),
                 ItemUtils.getSimpleStack(Blocks.glowstone, 64),
@@ -247,7 +247,7 @@ public class RECIPES_General {
         }
 
         // Magic Feather
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Items.feather, 64),
                 ItemUtils.getSimpleStack(Blocks.emerald_block, 32),
@@ -262,13 +262,13 @@ public class RECIPES_General {
             .addTo(assemblerRecipes);
 
         // Pest Killer
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getTieredMachineCasing(1),
                 CI.getElectricPump(2, 1),
                 CI.getPlate(2, 4),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2),
-                GT_Utility.getIntegratedCircuit(16))
+                GTUtility.getIntegratedCircuit(16))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPestKiller))
             .fluidInputs(FluidUtils.getHotWater(500))
             .duration(1 * MINUTES)
@@ -355,21 +355,22 @@ public class RECIPES_General {
             ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat),
             ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
 
-        generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM);
-        generateWireRecipes(ALLOY.HG1223);
-        generateWireRecipes(ALLOY.LEAGRISIUM);
-        generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
-        generateWireRecipes(ELEMENT.STANDALONE.HYPOGEN);
-        generateWireRecipes(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+        generateWireRecipes(MaterialsElements.getInstance().ZIRCONIUM);
+        generateWireRecipes(MaterialsAlloy.HG1223);
+        generateWireRecipes(MaterialsAlloy.LEAGRISIUM);
+        generateWireRecipes(MaterialsAlloy.TRINIUM_TITANIUM);
+        generateWireRecipes(MaterialsElements.STANDALONE.HYPOGEN);
+        generateWireRecipes(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
         // No Material for void, natch.
         if (Thaumcraft.isModLoaded()) {
             generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15);
         }
 
-        Material[] gtpp = new Material[] { ALLOY.STABALLOY, ALLOY.TANTALLOY_60, ALLOY.TANTALLOY_61, ALLOY.POTIN,
-            ALLOY.MARAGING300, ALLOY.MARAGING350, ALLOY.INCONEL_690, ALLOY.INCONEL_792, ALLOY.HASTELLOY_X,
-            ALLOY.TRINIUM_NAQUADAH_CARBON };
+        Material[] gtpp = new Material[] { MaterialsAlloy.STABALLOY, MaterialsAlloy.TANTALLOY_60,
+            MaterialsAlloy.TANTALLOY_61, MaterialsAlloy.POTIN, MaterialsAlloy.MARAGING300, MaterialsAlloy.MARAGING350,
+            MaterialsAlloy.INCONEL_690, MaterialsAlloy.INCONEL_792, MaterialsAlloy.HASTELLOY_X,
+            MaterialsAlloy.TRINIUM_NAQUADAH_CARBON };
 
         for (Material mat : gtpp) {
             // generatePipeRecipes multiplies the voltage multiplier by 8 because ??! reasons.
@@ -391,7 +392,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[6],
-            ALLOY.MARAGING250.getGear(1),
+            MaterialsAlloy.MARAGING250.getGear(1),
             CI.component_Plate[6],
             CI.getTieredCircuitOreDictName(4),
             GregtechItemList.Casing_AdvancedVacuum.get(1),
@@ -403,7 +404,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[6],
-            ALLOY.MARAGING300.getGear(1),
+            MaterialsAlloy.MARAGING300.getGear(1),
             CI.component_Plate[6],
             CI.getTieredCircuitOreDictName(5),
             GregtechItemList.Casing_Adv_BlastFurnace.get(1),
@@ -415,7 +416,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[8],
-            ALLOY.PIKYONIUM.getGear(1),
+            MaterialsAlloy.PIKYONIUM.getGear(1),
             CI.component_Plate[9],
             CI.getTieredCircuitOreDictName(7),
             GregtechItemList.Casing_Naq_Reactor_A.get(1),
@@ -426,47 +427,47 @@ public class RECIPES_General {
             GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
 
         if (PollutionUtils.isPollutionEnabled()) {
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1),
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
index 5da803b392..22008ac647 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.recipe;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.enums.Mods.Backpack;
 import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
@@ -23,21 +23,21 @@ import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.BUCKETS;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.BUCKETS;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.INGOTS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
@@ -50,20 +50,19 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
+import bartworks.system.material.WerkstoffLoader;
 import cpw.mods.fml.common.Loader;
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.GT_Values;
+import goodgenerator.items.GGMaterial;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
@@ -72,20 +71,20 @@ import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOres;
 import gtPlusPlus.core.material.Particle;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class RECIPES_GREGTECH {
+public class RecipesGregTech {
 
     public static void run() {
         Logger.INFO("Loading Recipes through GregAPI for Industrial Multiblocks.");
@@ -122,8 +121,8 @@ public class RECIPES_GREGTECH {
         /*
          * Special Recipe handlers
          */
-        RECIPES_SeleniumProcessing.init();
-        RECIPES_RareEarthProcessing.init();
+        RecipesSeleniumProcessing.init();
+        RecipesRareEarthProcessing.init();
 
         addFuels();
     }
@@ -132,7 +131,7 @@ public class RECIPES_GREGTECH {
 
         // Wood's Glass Laser Lens
         RA.stdBuilder()
-            .itemInputs(MISC_MATERIALS.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0))
+            .itemInputs(MaterialMisc.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0))
             .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_HV)
@@ -147,7 +146,7 @@ public class RECIPES_GREGTECH {
         // 4 NO2 (g) + O2 (g) + 2 H2O (l) → 4 HNO3 (aq)
 
         // Advanced method for Nitric Acid Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0))
             .fluidInputs(Materials.NitrogenDioxide.getGas(4000L), FluidUtils.getAir(4000), FluidUtils.getWater(2000))
             .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 4000))
@@ -157,34 +156,34 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // Advanced recipe for Fluorine Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getPurpleCatalyst(0),
                 ItemUtils.getSimpleStack(Blocks.sandstone, 64),
                 ItemUtils.getSimpleStack(Blocks.sandstone, 64))
             .itemOutputs(
-                FLUORIDES.FLUORITE.getOre(8),
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(4))
+                MaterialsFluorides.FLUORITE.getOre(8),
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(4))
             .fluidInputs(FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000))
             .duration(10 * SECONDS)
             .eut(1024)
             .metadata(CHEMPLANT_CASING_TIER, 5)
             .addTo(chemicalPlantRecipes);
         // Advanced recipe for Fluorine Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getPurpleCatalyst(0),
                 ItemUtils.getSimpleStack(Blocks.sand, 64),
                 ItemUtils.getSimpleStack(Blocks.sand, 64))
             .itemOutputs(
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(2),
-                FLUORIDES.FLUORITE.getOre(2),
-                FLUORIDES.FLUORITE.getOre(2))
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(2),
+                MaterialsFluorides.FLUORITE.getOre(2),
+                MaterialsFluorides.FLUORITE.getOre(2))
             .fluidInputs(FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000))
             .duration(10 * SECONDS)
             .eut(1024)
@@ -192,7 +191,7 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // 3NO2 + H2O = 2HNO3 + NO
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0))
             .fluidInputs(Materials.NitrogenDioxide.getGas(3000L), FluidUtils.getDistilledWater(1000))
             .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 2000), Materials.NitricOxide.getGas(1000L))
@@ -202,7 +201,7 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
         // Produce Boric Acid
         // Na2B4O7·10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4))
             .fluidInputs(FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000))
@@ -213,13 +212,13 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // Produce Th232
-        GT_Values.RA.stdBuilder()
-            .itemInputs(CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16))
+        GTValues.RA.stdBuilder()
+            .itemInputs(CI.getNumberedAdvancedCircuit(22), MaterialsElements.getInstance().THORIUM.getDust(16))
             .itemOutputs(
-                ELEMENT.getInstance().THORIUM.getSmallDust(32),
-                ELEMENT.getInstance().THORIUM232.getDust(2),
-                ELEMENT.getInstance().THORIUM232.getSmallDust(2),
-                ELEMENT.getInstance().URANIUM232.getDust(1))
+                MaterialsElements.getInstance().THORIUM.getSmallDust(32),
+                MaterialsElements.getInstance().THORIUM232.getDust(2),
+                MaterialsElements.getInstance().THORIUM232.getSmallDust(2),
+                MaterialsEle