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

33 files changed, 1785 insertions, 1786 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GTPPBlocks.java
index 1a3d07f510..e68ca95cce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GTPPBlocks.java
@@ -13,7 +13,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings2;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaTieredCasingBlocks1;
 
-public class Gregtech_Blocks {
+public class GTPPBlocks {
 
     public static void run() {
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
index e2723e5248..23dd55b22b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
@@ -2,24 +2,24 @@ package gtPlusPlus.xmod.gregtech.loaders;
 
 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.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_ModHandler.RecipeBits;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTModHandler.RecipeBits;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 
-public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable {
+public class ProcessingAngleGrinder implements IOreRecipeRegistrator, Runnable {
 
     public ProcessingAngleGrinder() {
         GregtechOrePrefixes.toolAngleGrinder.add(this);
@@ -63,8 +63,8 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
                     Logger.MATERIALS("Generating Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial));
                     // Input 1
 
-                    final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
-                    final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
+                    final ItemStack plate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
+                    final ItemStack longrod = GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
 
                     if ((null != plate && longrod != null)) {
                         addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1));
@@ -80,9 +80,9 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
                                 + (longrod == null)
                                 + " |");
                     }
-                    // GT_ModHandler.addCraftingRecipe(,
-                    // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
-                    // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
+                    // GTModHandler.addCraftingRecipe(,
+                    // GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
+                    // GTModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
                     // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial),
                     // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
                     // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
@@ -111,7 +111,7 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
             1,
             aMaterial,
             Materials.Titanium,
-            new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
+            new long[] { aBatteryStorage, GTValues.V[aVoltageTier], 3L, -1L });
 
         long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
         if (aDura <= 32000) {
@@ -122,12 +122,12 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
             return false;
         }
 
-        return GT_ModHandler.addCraftingRecipe(
+        return GTModHandler.addCraftingRecipe(
             aOutputStack,
             RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED,
             new Object[] { "SXL", "GMG", "PBP", 'X', ItemList.Component_Grinder_Tungsten.get(1), 'M',
                 CI.getElectricMotor(aVoltageTier, 1), 'S', OrePrefixes.screw.get(Materials.Titanium), 'L',
                 OrePrefixes.stickLong.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'G',
-                ELEMENT.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery });
+                MaterialsElements.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery });
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
index a894a7ad62..a6e9d15ca2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
@@ -2,25 +2,25 @@ package gtPlusPlus.xmod.gregtech.loaders;
 
 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.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 
-public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Runnable {
+public class ProcessingElectricSnips implements IOreRecipeRegistrator, Runnable {
 
     public ProcessingElectricSnips() {
         GregtechOrePrefixes.toolElectricSnips.add(this);
@@ -64,7 +64,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
                     Logger.MATERIALS("Generating Electric Snips from " + MaterialUtils.getMaterialName(aMaterial));
                     // Input 1
 
-                    final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
+                    final ItemStack plate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
 
                     if ((null != plate)) {
                         addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1));
@@ -79,9 +79,9 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
                                 + " | Rod? "
                                 + " |");
                     }
-                    // GT_ModHandler.addCraftingRecipe(,
-                    // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
-                    // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
+                    // GTModHandler.addCraftingRecipe(,
+                    // GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
+                    // GTModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
                     // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial),
                     // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
                     // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
@@ -110,10 +110,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
             1,
             aMaterial,
             Materials.Titanium,
-            new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
+            new long[] { aBatteryStorage, GTValues.V[aVoltageTier], 3L, -1L });
 
-        ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
-            .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null);
+        ItemStack aInputCutter = MetaGeneratedTool01.INSTANCE
+            .getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null);
 
         long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
         if (aDura <= 32000) {
@@ -127,9 +127,9 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
             OrePrefixes.wireFine.get(Materials.Electrum),
             aInputCutter,
             OrePrefixes.wireFine.get(Materials.Electrum),
-            ELEMENT.STANDALONE.WHITE_METAL.getGear(1),
+            MaterialsElements.STANDALONE.WHITE_METAL.getGear(1),
             CI.getElectricMotor(aVoltageTier, 1),
-            ELEMENT.STANDALONE.WHITE_METAL.getGear(1),
+            MaterialsElements.STANDALONE.WHITE_METAL.getGear(1),
             OrePrefixes.plate.get(aMaterial),
             aBattery,
             OrePrefixes.plate.get(aMaterial),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java
index b56a480c0c..8ef73917b7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java
@@ -5,14 +5,14 @@ import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import java.util.HashSet;
 import java.util.Set;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class RecipeGen_AlloySmelter extends RecipeGen_Base {
+public class RecipeGenAlloySmelter extends RecipeGenBase {
 
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
@@ -20,7 +20,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
     }
 
-    public RecipeGen_AlloySmelter(final Material M) {
+    public RecipeGenAlloySmelter(final Material M) {
         this.toGenerate = M;
         mRecipeGenMap.add(this);
     }
@@ -36,7 +36,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
         // Nuggets
         if (ItemUtils.checkForInvalidItems(material.getIngot(1))
             && ItemUtils.checkForInvalidItems(material.getNugget(1))) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.getIngot(1), ItemList.Shape_Mold_Nugget.get(0))
                 .itemOutputs(material.getNugget(9))
                 .duration(duration)
@@ -47,7 +47,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
         // Gears
         if (ItemUtils.checkForInvalidItems(material.getIngot(1))
             && ItemUtils.checkForInvalidItems(material.getGear(1))) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.getIngot(8), ItemList.Shape_Mold_Gear.get(0))
                 .itemOutputs(material.getGear(1))
                 .duration(duration)
@@ -58,7 +58,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
         // Ingot
         if (ItemUtils.checkForInvalidItems(material.getIngot(1))
             && ItemUtils.checkForInvalidItems(material.getNugget(1))) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.getNugget(9), ItemList.Shape_Mold_Ingot.get(0))
                 .itemOutputs(material.getIngot(1))
                 .duration(duration)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java
index 8256b73a44..64ce9d1c42 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java
@@ -1,22 +1,22 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 
-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.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class RecipeGen_Assembler extends RecipeGen_Base {
+public class RecipeGenAssembler extends RecipeGenBase {
 
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
@@ -24,7 +24,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
     }
 
-    public RecipeGen_Assembler(final Material M) {
+    public RecipeGenAssembler(final Material M) {
         this.toGenerate = M;
         mRecipeGenMap.add(this);
     }
@@ -38,8 +38,8 @@ public class RecipeGen_Assembler extends RecipeGen_Base {
 
         // Frame Box
         if (ItemUtils.checkForInvalidItems(new ItemStack[] { material.getRod(1), material.getFrameBox(1) })) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(material.getRod(4), GT_Utility.getIntegratedCircuit(4))
+            GTValues.RA.stdBuilder()
+                .itemInputs(material.getRod(4), GTUtility.getIntegratedCircuit(4))
                 .itemOutputs(material.getFrameBox(1))
                 .duration(3 * SECONDS)
                 .eut(material.vVoltageMultiplier)
@@ -60,21 +60,21 @@ public class RecipeGen_Assembler extends RecipeGen_Base {
     @Deprecated
     private static void addAssemblerRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1,
         final int seconds, final int euCost) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(input1, input2)
             .itemOutputs(output1)
             .fluidInputs(FluidUtils.getFluidStack("molten.solderingalloy", 16))
             .duration(seconds)
             .eut(euCost)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(input1, input2)
             .itemOutputs(output1)
             .fluidInputs(FluidUtils.getFluidStack("molten.tin", 32))
             .duration(seconds)
             .eut(euCost)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(input1, input2)
             .itemOutputs(output1)
             .fluidInputs(FluidUtils.getFluidStack("molten.lead", 48))
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBase.java
index d000889757..415cdc76aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBase.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.core.material.Material;
 
-public abstract class RecipeGen_Base implements RunnableWithInfo<Material> {
+public abstract class RecipeGenBase implements RunnableWithInfo<Material> {
 
     protected Material toGenerate;
     protected boolean disableOptional;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
index bcf2565b39..d90e842394 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import static gregtech.api.enums.GT_Values.VP;
+import static gregtech.api.enums.GTValues.VP;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
 
@@ -14,24 +14,24 @@ import java.util.Set;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeCategories;
-import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
+import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class RecipeGen_BlastSmelter extends RecipeGen_Base {
+public class RecipeGenBlastSmelter extends RecipeGenBase {
 
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
@@ -39,7 +39,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
     }
 
-    public RecipeGen_BlastSmelter(final Material M) {
+    public RecipeGenBlastSmelter(final Material M) {
         this.toGenerate = M;
         mRecipeGenMap.add(this);
     }
@@ -57,8 +57,9 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
             return;
         }
 
-        final Material[] badMaterials = { FLUORIDES.THORIUM_HEXAFLUORIDE, FLUORIDES.THORIUM_TETRAFLUORIDE,
-            ALLOY.BLOODSTEEL, NUCLIDE.LiFBeF2ThF4UF4, NUCLIDE.LiFBeF2ZrF4UF4, NUCLIDE.LiFBeF2ZrF4U235 };
+        final Material[] badMaterials = { MaterialsFluorides.THORIUM_HEXAFLUORIDE,
+            MaterialsFluorides.THORIUM_TETRAFLUORIDE, MaterialsAlloy.BLOODSTEEL, MaterialsNuclides.LiFBeF2ThF4UF4,
+            MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235 };
         for (final Material R : badMaterials) {
             if (M == R) {
                 return;
@@ -103,7 +104,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
         Logger.WARNING("[BAS] Size: " + mMaterialListSize);
 
         // Make a simple one Material MaterialStack[] and log it for validity.
-        circuitGT = GT_Utility.getIntegratedCircuit(1);
+        circuitGT = GTUtility.getIntegratedCircuit(1);
         final ItemStack[] tItemStackTest = new ItemStack[] { circuitGT, tStack };
         inputStackCount = 1;
         fluidAmount = 144 * inputStackCount;
@@ -130,7 +131,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
         // Generate Recipes for all singular materials that can be made molten.
         if (hasMoreInputThanACircuit) {
             if (M.requiresBlastFurnace()) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(tItemStackTest)
                     .fluidOutputs(M.getFluidStack(fluidAmount))
                     .duration(duration / (mTotalPartsCounter > 0 ? mTotalPartsCounter : 1))
@@ -141,7 +142,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
                 Logger.WARNING("[BAS] Failed.");
             }
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(tItemStackTest)
                 .fluidOutputs(M.getFluidStack(fluidAmount))
                 .eut(aVoltage)
@@ -149,7 +150,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
                 .addTo(alloyBlastSmelterRecipes);
 
             Logger.WARNING("[BAS] Success.");
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Ingot.get(0))
                 .itemOutputs(M.getIngot(1))
                 .fluidInputs(M.getFluidStack(144))
@@ -175,7 +176,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
         // If this Material has some kind of compound list, proceed
 
         final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
-        circuitGT = GT_Utility.getIntegratedCircuit(mMaterialListSize);
+        circuitGT = GTUtility.getIntegratedCircuit(mMaterialListSize);
 
         // Builds me a MaterialStack[] from the MaterialList of M.
         int ooo = 0;
@@ -284,7 +285,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
         }
 
         // Adds Recipe
-        GT_RecipeBuilder builder = GT_Values.RA.stdBuilder();
+        GTRecipeBuilder builder = GTValues.RA.stdBuilder();
         List<ItemStack> inputs = new ArrayList<>(Arrays.asList(components));
         inputs.removeIf(Objects::isNull);
         components = inputs.toArray(new ItemStack[0]);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java
index 0ac39d39bc..84a9290d87 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java
@@ -10,10 +10,10 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.ItemStackData;
 import gtPlusPlus.api.recipe.GTPPRecipeCategorie