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

4 files changed, 320 insertions, 332 deletions

diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/BauxiteRefineChain.java
index dfe14762c5..ec108b7cc9 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/BauxiteRefineChain.java
@@ -5,50 +5,50 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraftforge.fluids.FluidStack;
 
-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.MaterialsOreAlum;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_BauxiteRefineChain {
+public class BauxiteRefineChain {
 
     public static void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32),
+                GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32),
                 Materials.SodiumHydroxide.getDust(9),
                 Materials.Quicklime.getDust(4),
-                GT_Utility.getIntegratedCircuit(8))
+                GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Water.getFluid(5000))
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32),
                 Materials.SodiumHydroxide.getDust(9),
                 Materials.Quicklime.getDust(4),
-                GT_Utility.getIntegratedCircuit(8))
+                GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Water.getFluid(5000))
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(MaterialsOreAlum.BauxiteSlurry.getFluid(2000))
             .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(2000))
             .duration(2 * SECONDS)
@@ -56,7 +56,7 @@ public class GT_BauxiteRefineChain {
             .noOptimize()
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Aluminiumhydroxide.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(64),
@@ -70,7 +70,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.BauxiteSlag.getDust(1))
             .itemOutputs(
                 Materials.Rutile.getDust(1),
@@ -83,8 +83,8 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1))
             .itemOutputs(Materials.Rutile.getDust(2), MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .outputChances(10000, 3000)
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -93,8 +93,8 @@ public class GT_BauxiteRefineChain {
             .eut(1000)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1))
             .itemOutputs(Materials.Rutile.getDust(2), MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .outputChances(10000, 6000)
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -103,7 +103,7 @@ public class GT_BauxiteRefineChain {
             .eut(1000)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .itemOutputs(
                 Materials.Iron.getDust(1),
@@ -120,33 +120,33 @@ public class GT_BauxiteRefineChain {
             OrePrefixes.dustImpure, OrePrefixes.dustPure };
 
         for (OrePrefixes ore : washable) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.Sapphire, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.Sapphire, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.SapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.GreenSapphire, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.GreenSapphire, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.Ruby, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.Ruby, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.RubyJuice.getFluid(1000))
                 .duration(2 * SECONDS)
@@ -154,8 +154,8 @@ public class GT_BauxiteRefineChain {
                 .addTo(mixerRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Iron.getDust(1),
@@ -168,8 +168,8 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Iron.getDust(1),
@@ -183,8 +183,8 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Chrome.getDust(1),
@@ -198,7 +198,7 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Pyrope.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -214,7 +214,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Almandine.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -230,7 +230,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Spessartine.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -246,7 +246,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Andradite.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
@@ -262,7 +262,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Uvarovite.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
@@ -278,7 +278,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Grossular.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
index 836756a18a..9be7e1b6b6 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
@@ -3,14 +3,14 @@ package gregtech.loaders.postload.chains;
 import static goodgenerator.loader.Loaders.huiCircuit;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.nanoForgeRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.NANO_FORGE_TIER;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.NANO_FORGE_TIER;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
 import static gtPlusPlus.core.block.ModBlocks.blockCompressedObsidian;
 
 import net.minecraft.item.ItemStack;
@@ -18,18 +18,17 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+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_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class GT_NaniteChain {
+public class NaniteChain {
 
     public static void run() {
 
@@ -37,14 +36,14 @@ public class GT_NaniteChain {
         ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0);
         ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0);
         ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0);
-        ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false);
+        ItemStack aUMVTierLens = GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false);
 
         // Carbon Nanite Recipe Before Nano Forge
         Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, Materials.Carbon.getNanite(1))
             .metadata(RESEARCH_TIME, 1 * HOURS)
             .itemInputs(
@@ -54,7 +53,7 @@ public class GT_NaniteChain {
                 ItemList.Conveyor_Module_UV.get(16),
                 ItemList.Electric_Motor_UV.get(32),
                 new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 },
-                GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32))
+                GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32))
             .fluidInputs(
                 new FluidStack(solderIndalloy, 144 * 32),
                 Materials.HSSS.getMolten(144L * 32),
@@ -64,15 +63,15 @@ public class GT_NaniteChain {
             .duration(5 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Circuit_Crystalmainframe.get(1))
             .metadata(RESEARCH_TIME, 2 * HOURS)
             .itemInputs(
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 },
                 ItemList.Robot_Arm_UV.get(16),
                 ItemList.Circuit_Chip_Stemcell.get(32),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16),
                 Materials.Carbon.getDust(64))
             .fluidInputs(Materials.UUMatter.getFluid(10000), new FluidStack(solderIndalloy, 144 * 32))
             .itemOutputs(Materials.Carbon.getNanite(2))
@@ -88,7 +87,7 @@ public class GT_NaniteChain {
          */
 
         // Carbon Nanites - Used to make more Nano Forge Controllers
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUVTierLens,
                 new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 8, 31776),
@@ -101,7 +100,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Silver Nanites - Used in Tier 2 PCB Factory to improve board production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aUEVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16))
             .itemOutputs(Materials.Silver.getNanite(1))
             .fluidInputs(Materials.UUMatter.getFluid(200_000))
@@ -111,7 +110,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUHVTierLens,
                 Materials.Neutronium.getBlocks(8),
@@ -125,7 +124,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Glowstone Nanites - Used in the optical circuit line
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUEVTierLens,
                 new ItemStack(blockCompressedObsidian, 8, 7), // Double compressed glowstone blocks (yes,
@@ -139,7 +138,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Gold Nanites - Used in Tier 3 PCB Factory to improve board production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aUMVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16))
             .itemOutputs(Materials.Gold.getNanite(1))
             .fluidInputs(Materials.UUMatter.getFluid(300_000))
@@ -149,7 +148,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUIVTierLens,
                 MaterialsUEVplus.TranscendentMetal.getBlocks(8),
@@ -164,7 +163,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Six-Phased Copper Nanites - Used in Phononic Crystal production for the godforge
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUIVTierLens,
                 MaterialsUEVplus.SixPhasedCopper.getBlocks(16),
@@ -181,7 +180,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
@@ -202,7 +201,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
@@ -223,7 +222,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Universium nanites.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 // Quantum Anomaly, couldn't find any better naming.
@@ -244,9 +243,9 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Eternity nanites
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
+                GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
                 // Quantum Anomaly
                 GregtechItemList.Laser_Lens_Special.get(0),
                 MaterialsUEVplus.TranscendentMetal.getNanite(1),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java
index 6be4ab534e..f047bdcab2 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java
@@ -2,14 +2,14 @@ package gregtech.loaders.postload.chains;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.HYPOGEN;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,9 +19,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
@@ -30,12 +29,12 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.metadata.PCBFactoryTierKey;
 import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_PCBFactoryManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.PCBFactoryManager;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class GT_PCBFactoryRecipes {
+public class PCBFactoryRecipes {
 
     private static final PCBFactoryTierKey TIER = PCBFactoryTierKey.INSTANCE;
     private static final PCBFactoryUpgradeKey UPGRADE = PCBFactoryUpgradeKey.INSTANCE;
@@ -46,11 +45,11 @@ public class GT_PCBFactoryRecipes {
             : FluidRegistry.getFluid("molten.solderingalloy");
 
         // Load Multi Recipes
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Circuit_Board_Wetware.get(1))
             .metadata(RESEARCH_TIME, 3 * MINUTES)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32),
                 ItemList.Machine_ZPM_CircuitAssembler.get(4),
                 new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 },
                 ItemList.Robot_Arm_ZPM.get(8))
@@ -60,24 +59,24 @@ public class GT_PCBFactoryRecipes {
             .duration(5 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
                 Materials.get("Artherium-Sn")
                     .getPlates(6))
             .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
                 Materials.EnrichedHolmium.getPlates(6))
             .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CELESTIAL_TUNGSTEN.getFrameBox(1),
                 Materials.get("Quantum")
@@ -86,10 +85,10 @@ public class GT_PCBFactoryRecipes {
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UIV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 HYPOGEN.getFrameBox(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
                 Materials.Thulium.getPlates(6))
             .itemOutputs(ItemList.InfinityCooledCasing.get(1))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144))
@@ -100,7 +99,7 @@ public class GT_PCBFactoryRecipes {
         // Load CircuitBoard Recipes
 
         // Plastic Circuit Board
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -108,24 +107,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -133,25 +132,25 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -159,27 +158,27 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Advanced Circuit Board
-        for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -187,23 +186,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
                     Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -211,24 +210,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
                     Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
-