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

5 files changed, 195 insertions, 197 deletions

diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
index dddb7fe69d..489732e068 100644
--- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
@@ -7,27 +7,26 @@ import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.Werkstoff;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.metatileentity.implementations.MTEFluid;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 public class CrackRecipeAdder {
 
@@ -44,24 +43,24 @@ public class CrackRecipeAdder {
             .getName()
             .replaceAll(" ", "");
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(inputFluid, cracker)
             .fluidOutputs(FluidRegistry.getFluidStack("lightlycracked" + name, 1000))
             .duration(Math.max((long) (Duration * 0.8), 1L) * TICKS)
             .eut(EUt)
             .addTo(crackingRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(inputFluid, cracker)
             .fluidOutputs(FluidRegistry.getFluidStack("moderatelycracked" + name, 1000))
             .duration(Math.max((long) (Duration), 1L) * TICKS)
             .eut(EUt)
             .addTo(crackingRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .fluidInputs(inputFluid, cracker)
             .fluidOutputs(FluidRegistry.getFluidStack("heavilycracked" + name, 1000))
             .duration(Math.max((long) (Duration * 1.2), 1L) * TICKS)
@@ -112,8 +111,8 @@ public class CrackRecipeAdder {
         ItemStack input = material.get(OrePrefixes.dust, 1);
         ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1);
         if (gas) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(input, GT_Utility.getIntegratedCircuit(11))
+            GTValues.RA.stdBuilder()
+                .itemInputs(input, GTUtility.getIntegratedCircuit(11))
                 .fluidInputs(Materials.Helium.getGas(1000))
                 .itemOutputs(output)
                 .duration(duration * TICKS)
@@ -121,8 +120,8 @@ public class CrackRecipeAdder {
                 .metadata(COIL_HEAT, level)
                 .addTo(blastFurnaceRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(input, GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(input, GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(output)
                 .duration(duration * TICKS)
                 .eut(EUt)
@@ -134,9 +133,9 @@ public class CrackRecipeAdder {
     public static void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit,
         FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) {
         for (int i = 0; i < Math.min(aOutputs.length, 11); i++) {
-            GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1));
-            if (aOutput2 != GT_Values.NI) {
+            GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1));
+            if (aOutput2 != GTValues.NI) {
                 buildDistillation.itemOutputs(aOutput2);
             }
             buildDistillation.fluidInputs(aInput)
@@ -145,9 +144,9 @@ public class CrackRecipeAdder {
                 .eut(aEUt / 4)
                 .addTo(distilleryRecipes);
         }
-        GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder()
+        GTRecipeBuilder buildDT = GTValues.RA.stdBuilder()
             .itemInputs(aCircuit);
-        if (aOutput2 != GT_Values.NI) {
+        if (aOutput2 != GTValues.NI) {
             buildDT.itemOutputs(aOutput2);
         }
         buildDT.fluidInputs(aInput)
@@ -160,9 +159,9 @@ public class CrackRecipeAdder {
     public static void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2,
         int aDuration, long aEUt) {
         for (int i = 0; i < Math.min(aOutputs.length, 11); i++) {
-            GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1));
-            if (aOutput2 != GT_Values.NI) {
+            GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1));
+            if (aOutput2 != GTValues.NI) {
                 buildDistillation.itemOutputs(aOutput2);
             }
             buildDistillation.fluidInputs(aInput)
@@ -171,8 +170,8 @@ public class CrackRecipeAdder {
                 .eut(aEUt / 4)
                 .addTo(distilleryRecipes);
         }
-        GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder();
-        if (aOutput2 != GT_Values.NI) {
+        GTRecipeBuilder buildDT = GTValues.RA.stdBuilder();
+        if (aOutput2 != GTValues.NI) {
             buildDT.itemOutputs(aOutput2);
         }
         buildDT.fluidInputs(aInput)
@@ -191,9 +190,9 @@ public class CrackRecipeAdder {
         String unName = material.getDefaultName()
             .replace(" ", "_");
         String Name = material.getDefaultName();
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeTiny.get(material.getBridgeMaterial()),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 ID,
                 "GT_Pipe_" + unName + "_Tiny",
                 "Tiny " + Name + " Fluid Pipe",
@@ -202,9 +201,9 @@ public class CrackRecipeAdder {
                 flow / 6,
                 temp,
                 gas).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeSmall.get(material.getBridgeMaterial()),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 ID + 1,
                 "GT_Pipe_" + unName + "_Small",
                 "Small " + Name + " Fluid Pipe",
@@ -213,9 +212,9 @@ public class CrackRecipeAdder {
                 flow / 3,
                 temp,
                 gas).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeMedium.get(material.getBridgeMaterial()),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 ID + 2,
                 "GT_Pipe_" + unName,
                 Name + " Fluid Pipe",
@@ -224,9 +223,9 @@ public class CrackRecipeAdder {
                 flow,
                 temp,
                 gas).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeLarge.get(material.getBridgeMaterial()),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 ID + 3,
                 "GT_Pipe_" + unName + "_Large",
                 "Large " + Name + " Fluid Pipe",
@@ -235,9 +234,9 @@ public class CrackRecipeAdder {
                 flow * 2,
                 temp,
                 gas).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeHuge.get(material.getBridgeMaterial()),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 ID + 4,
                 "GT_Pipe_" + unName + "_Huge",
                 "Huge " + Name + " Fluid Pipe",
@@ -246,7 +245,7 @@ public class CrackRecipeAdder {
                 flow * 4,
                 temp,
                 gas).getStackForm(1L));
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0))
             .itemOutputs(material.get(OrePrefixes.pipeTiny, 2))
             .duration(
@@ -254,7 +253,7 @@ public class CrackRecipeAdder {
                     .getMass() * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(extruderRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0))
             .itemOutputs(material.get(OrePrefixes.pipeSmall, 1))
             .duration(
@@ -263,7 +262,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(extruderRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0))
             .itemOutputs(material.get(OrePrefixes.pipeMedium, 1))
             .duration(
@@ -272,7 +271,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(extruderRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0))
             .itemOutputs(material.get(OrePrefixes.pipeLarge, 1))
             .duration(
@@ -281,7 +280,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(extruderRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0))
             .itemOutputs(material.get(OrePrefixes.pipeHuge, 1))
             .duration(
@@ -290,7 +289,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(extruderRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0))
             .fluidInputs(material.getMolten(72))
             .itemOutputs(material.get(OrePrefixes.pipeTiny, 1))
@@ -299,7 +298,7 @@ public class CrackRecipeAdder {
                     .getMass() * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(fluidSolidifierRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0))
             .fluidInputs(material.getMolten(144))
             .itemOutputs(material.get(OrePrefixes.pipeSmall, 1))
@@ -309,7 +308,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(fluidSolidifierRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0))
             .fluidInputs(material.getMolten(432))
             .itemOutputs(material.get(OrePrefixes.pipeMedium, 1))
@@ -319,7 +318,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(fluidSolidifierRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0))
             .fluidInputs(material.getMolten(864))
             .itemOutputs(material.get(OrePrefixes.pipeLarge, 1))
@@ -329,7 +328,7 @@ public class CrackRecipeAdder {
                     * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(fluidSolidifierRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0))
             .fluidInputs(material.getMolten(1728))
             .itemOutputs(material.get(OrePrefixes.pipeHuge, 1))
@@ -351,10 +350,10 @@ public class CrackRecipeAdder {
         String aTextWire2 = " Wire";
         String aTextCable2 = " Cable";
         int aLossInsulated = aLoss / 4;
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt01,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 0,
                 aTextWire1 + unName + ".01",
                 "1x " + Name + aTextWire2,
@@ -365,10 +364,10 @@ public class CrackRecipeAdder {
                 aVoltage,
                 false,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt02,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 1,
                 aTextWire1 + unName + ".02",
                 "2x " + Name + aTextWire2,
@@ -379,10 +378,10 @@ public class CrackRecipeAdder {
                 aVoltage,
                 false,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt04,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 2,
                 aTextWire1 + unName + ".04",
                 "4x " + Name + aTextWire2,
@@ -393,10 +392,10 @@ public class CrackRecipeAdder {
                 aVoltage,
                 false,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt08,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 3,
                 aTextWire1 + unName + ".08",
                 "8x " + Name + aTextWire2,
@@ -407,10 +406,10 @@ public class CrackRecipeAdder {
                 aVoltage,
                 false,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt12,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 4,
                 aTextWire1 + unName + ".12",
                 "12x " + Name + aTextWire2,
@@ -421,10 +420,10 @@ public class CrackRecipeAdder {
                 aVoltage,
                 false,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt16,
             material.getBridgeMaterial(),
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 ID + 5,
                 aTextWire1 + unName + ".16",
                 "16x " + Name + aTextWire2,
@@ -436,10 +435,10 @@ public class CrackRecipeAdder {
                 false,
                 true).getStackForm(1L));
         if (cover) {
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt01,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 6,
                     aTextCable1 + unName + ".01",
                     "1x " + Name + aTextCable2,
@@ -450,10 +449,10 @@ public class CrackRecipeAdder {
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt02,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 7,
                     aTextCable1 + unName + ".02",
                     "2x " + Name + aTextCable2,
@@ -464,10 +463,10 @@ public class CrackRecipeAdder {
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt04,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 8,
                     aTextCable1 + unName + ".04",
                     "4x " + Name + aTextCable2,
@@ -478,10 +477,10 @@ public class CrackRecipeAdder {
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt08,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 9,
                     aTextCable1 + unName + ".08",
                     "8x " + Name + aTextCable2,
@@ -492,10 +491,10 @@ public class CrackRecipeAdder {
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt12,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 10,
                     aTextCable1 + unName + ".12",
                     "12x " + Name + aTextCable2,
@@ -506,10 +505,10 @@ public class CrackRecipeAdder {
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt16,
                 material.getBridgeMaterial(),
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     ID + 11,
                     aTextCable1 + unName + ".16",
                     "16x " + Name + aTextCable2,
@@ -521,97 +520,97 @@ public class CrackRecipeAdder {
                     true,
                     false).getStackForm(1L));
         }
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(material.get(OrePrefixes.wireGt01, 2))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(material.get(OrePrefixes.wireGt02, 1))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 2), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 2), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(material.get(OrePrefixes.wireGt04, 1))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 4), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 4), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(material.get(OrePrefixes.wireGt08, 1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 6), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 6), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(material.get(OrePrefixes.wireGt12, 1))
             .duration(15 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 8), GT_Utility.getIntegratedCircuit(16))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 8), GTUtility.getIntegratedCircuit(16))
             .itemOutputs(material.get(OrePrefixes.wireGt16, 1))
             .duration(17 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(material.get(OrePrefixes.wireGt01, 1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(material.get(OrePrefixes.wireGt02, 1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 4), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 4), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(material.get(OrePrefixes.wireGt04, 1))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 8), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 8), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(material.get(OrePrefixes.wireGt08, 1))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 12), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 12), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(material.get(OrePrefixes.wireGt12, 1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 16), GT_Utility.getIntegratedCircuit(16))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 16), GTUtility.getIntegratedCircuit(16))
             .itemOutputs(material.get(OrePrefixes.wireGt16, 1))
             .duration(15 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(material.get(OrePrefixes.wireFine, 8))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(material.get(OrePrefixes.wireFine, 4))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(material.get(OrePrefixes.wireGt01, 1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(material.get(OrePrefixes.wireGt01, 1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(material.get(OrePrefixes.wireFine, 4))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(wiremillRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0))
             .itemOutputs(material.get(OrePrefixes.wireGt01, 2))
             .duration(
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 3662bb5bd1..f9af30e7df 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -7,7 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.core.Ic2Items;
 
 public final class ItemRefer {
@@ -217,7 +217,7 @@ public final class ItemRefer {
     public ItemStack get(int amount) {
         if (mItem != null) return new ItemStack(mItem, amount, mMeta);
         if (mBlock != null) return new ItemStack(mBlock, amount, mMeta);
-        if (mItemStack != null) return GT_Utility.copyAmount(amount, mItemStack);
+        if (mItemStack != null) return GTUtility.copyAmount(amount, mItemStack);
         return new ItemStack(_null_, amount, 0);
     }
 }
diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index 32827b18b2..8df7b3f4e6 100644
--- a/src/main/java/goodgenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -4,31 +4,30 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
-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 com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.Werkstoff;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 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_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class MaterialFix {
 
     public static void MaterialFluidExtractionFix(Werkstoff material) {
         if (material.hasItemType(OrePrefixes.ingot)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.ingot))
                 .fluidOutputs(material.getMolten(144))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(8)
                 .addTo(fluidExtractionRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Ingot.get(0))
                 .fluidInputs(material.getMolten(144))
                 .itemOutputs(material.get(OrePrefixes.ingot))
@@ -37,13 +36,13 @@ public class MaterialFix {
                 .addTo(fluidSolidifierRecipes);
         }
         if (material.hasItemType(OrePrefixes.plate)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.plate))
                 .fluidOutputs(material.getMolten(144))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(8)
                 .addTo(fluidExtractionRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Plate.get(0))
                 .fluidInputs(material.getMolten(144))
                 .itemOutputs(material.get(OrePrefixes.plate))
@@ -52,7 +51,7 @@ public class MaterialFix {
                 .addTo(fluidSolidifierRecipes);
         }
         if (material.hasItemType(OrePrefixes.gearGtSmall)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.gearGtSmall))
                 .fluidOutputs(material.getMolten(144))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -60,7 +59,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.stickLong)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.stickLong))
                 .fluidOutputs(material.getMolten(144))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -68,7 +67,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.spring)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.spring))
                 .fluidOutputs(material.getMolten(144))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -76,7 +75,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.stick)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.stick))
                 .fluidOutputs(material.getMolten(72))
                 .duration(16 * TICKS)
@@ -84,7 +83,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.itemCasing)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.itemCasing))
                 .fluidOutputs(material.getMolten(72))
                 .duration(16 * TICKS)
@@ -92,7 +91,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.wireGt01)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.wireGt01))
                 .fluidOutputs(material.getMolten(72))
                 .duration(16 * TICKS)
@@ -100,16 +99,16 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.cableGt01)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.cableGt01))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2))
                 .fluidOutputs(material.getMolten(72))
                 .duration(16 * TICKS)
                 .eut(8)
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.foil)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.foil))
                 .fluidOutputs(material.getMolten(36))
                 .duration(8 * TICKS)
@@ -117,7 +116,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.springSmall)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.springSmall))
                 .fluidOutputs(material.getMolten(36))
                 .duration(8 * TICKS)
@@ -125,7 +124,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.ring)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.ring))
                 .fluidOutputs(material.getMolten(36))
                 .duration(8 * TICKS)
@@ -133,7 +132,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.bolt)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.bolt))
                 .fluidOutputs(material.getMolten(18))
                 .duration(4 * TICKS)
@@ -141,7 +140,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.wireFine)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.wireFine))
                 .fluidOutputs(material.getMolten(18))
                 .duration(4 * TICKS)
@@ -149,7 +148,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.round)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.round))
                 .fluidOutputs(material.getMolten(16))
                 .duration(4 * TICKS)
@@ -157,7 +156,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);
         }
         if (material.hasItemType(OrePrefixes.screw)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(material.get(OrePrefixes.screw))
                 .fluidOutputs(material.getMolten(16))
                 .duration(4 * TICKS)
@@ -165,7 +164,7 @@ public class MaterialFix {
                 .addTo(fluidExtractionRecipes);