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

17 files changed, 130 insertions, 129 deletions

diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/GTNEIConfig.java
index 198f71fdb0..211f8251dc 100644
--- a/src/main/java/gregtech/nei/NEI_GT_Config.java
+++ b/src/main/java/gregtech/nei/GTNEIConfig.java
@@ -17,18 +17,18 @@ import codechicken.nei.recipe.HandlerInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem02;
+import gregtech.common.items.MetaGeneratedItem03;
 import gregtech.nei.dumper.BatchModeSupportDumper;
 import gregtech.nei.dumper.InputSeparationSupportDumper;
 import gregtech.nei.dumper.MaterialDumper;
@@ -37,7 +37,7 @@ import gregtech.nei.dumper.MetaTileEntityDumper;
 import gregtech.nei.dumper.RecipeLockingSupportDumper;
 import gregtech.nei.dumper.VoidProtectionSupportDumper;
 
-public class NEI_GT_Config implements IConfigureNEI {
+public class GTNEIConfig implements IConfigureNEI {
 
     /**
      * This map determines the order in which NEI handlers will be registered and displayed in tabs.
@@ -52,7 +52,7 @@ public class NEI_GT_Config implements IConfigureNEI {
         .put(RecipeMaps.scannerFakeRecipes, 2)
         .build();
 
-    private static final Comparator<GT_NEI_DefaultHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator
+    private static final Comparator<GTNEIDefaultHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator
         .comparingInt(handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0));
 
     private static ListMultimap<RecipeCategory, RecipeMapWorkable> RECIPE_CATALYST_INDEX;
@@ -61,7 +61,7 @@ public class NEI_GT_Config implements IConfigureNEI {
 
     private static void addHandler(TemplateRecipeHandler handler) {
         FMLInterModComms.sendRuntimeMessage(
-            GT_Values.GT,
+            GTValues.GT,
             "NEIPlugins",
             "register-crafting-handler",
             "gregtech@" + handler.getRecipeName() + "@" + handler.getOverlayIdentifier());
@@ -85,9 +85,9 @@ public class NEI_GT_Config implements IConfigureNEI {
             .filter(
                 recipeCategory -> recipeCategory.recipeMap.getFrontend()
                     .getNEIProperties().registerNEI)
-            .map(GT_NEI_DefaultHandler::new)
+            .map(GTNEIDefaultHandler::new)
             .sorted(RECIPE_MAP_HANDLER_COMPARATOR)
-            .forEach(NEI_GT_Config::addHandler);
+            .forEach(GTNEIConfig::addHandler);
     }
 
     private void registerCatalysts() {
@@ -101,7 +101,7 @@ public class NEI_GT_Config implements IConfigureNEI {
                         recipeMapWorkable.getRecipeCatalystPriority()));
         }
         API.addRecipeCatalyst(
-            GT_ModHandler.getIC2Item("nuclearReactor", 1, null),
+            GTModHandler.getIC2Item("nuclearReactor", 1, null),
             RecipeMaps.ic2NuclearFakeRecipes.unlocalizedName);
     }
 
@@ -112,9 +112,9 @@ public class NEI_GT_Config implements IConfigureNEI {
     private void registerDumpers() {
         API.addOption(new MetaTileEntityDumper());
         API.addOption(new MaterialDumper());
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_01.INSTANCE, "metaitem01"));
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_02.INSTANCE, "metaitem02"));
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_03.INSTANCE, "metaitem03"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem01.INSTANCE, "metaitem01"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem02.INSTANCE, "metaitem02"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem03.INSTANCE, "metaitem03"));
         API.addOption(new VoidProtectionSupportDumper());
         API.addOption(new InputSeparationSupportDumper());
         API.addOption(new BatchModeSupportDumper());
@@ -159,8 +159,8 @@ public class NEI_GT_Config implements IConfigureNEI {
         ImmutableListMultimap.Builder<RecipeCategory, RecipeMapWorkable> builder = new ImmutableListMultimap.Builder<>();
         builder
             .orderValuesBy(Comparator.comparing(recipeMapWorkable -> -recipeMapWorkable.getRecipeCatalystPriority()));
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
             if (!(mte instanceof RecipeMapWorkable recipeMapWorkable)) continue;
             for (RecipeMap<?> recipeMap : recipeMapWorkable.getAvailableRecipeMaps()) {
                 for (RecipeCategory recipeCategory : recipeMap.getAssociatedCategories()) {
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
index 99e7dc5459..3887ad321b 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
@@ -1,6 +1,6 @@
 package gregtech.nei;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.awt.Rectangle;
 import java.lang.ref.SoftReference;
@@ -46,12 +46,12 @@ import codechicken.nei.recipe.ICraftingHandler;
 import codechicken.nei.recipe.IUsageHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.TemplateRecipeHandler;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
 import gregtech.api.objects.ItemData;
@@ -63,14 +63,14 @@ import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeCategorySetting;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMapFrontend;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.ItemMachines;
 import gregtech.common.gui.modularui.UIHelper;
 
-public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
+public class GTNEIDefaultHandler extends TemplateRecipeHandler {
 
     private static final int offsetX = 5;
     private static final int offsetY = 11;
@@ -113,11 +113,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
      */
     private NEIHandlerAbsoluteTooltip recipeNameTooltip;
 
-    protected final GT_GUIColorOverride colorOverride = GT_GUIColorOverride
-        .get(GT_UITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
+    protected final GUIColorOverride colorOverride = GUIColorOverride
+        .get(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
     private int neiTextColorOverride = -1;
 
-    public GT_NEI_DefaultHandler(RecipeCategory recipeCategory) {
+    public GTNEIDefaultHandler(RecipeCategory recipeCategory) {
         this.recipeCategory = recipeCategory;
         this.recipeMap = recipeCategory.recipeMap;
         this.frontend = recipeMap.getFrontend();
@@ -152,20 +152,20 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     public List<CachedDefaultRecipe> getCache() {
         SortedRecipeListCache cacheHolder = getCacheHolder();
         List<CachedDefaultRecipe> cache;
-        if (cacheHolder.getCachedRecipesVersion() != GT_Mod.gregtechproxy.getNEIReloadCount()
+        if (cacheHolder.getCachedRecipesVersion() != GTMod.gregtechproxy.getNEIReloadCount()
             || (cache = cacheHolder.getCachedRecipes()) == null) {
             try {
                 RecipeCategory defaultCategory = recipeMap.getDefaultRecipeCategory();
-                Collection<GT_Recipe> recipes;
+                Collection<GTRecipe> recipes;
                 if (this.recipeCategory == defaultCategory) {
                     // This is main category, so merge categories that are configured as such
-                    Stream<GT_Recipe> recipesToMerge = recipeMap.getBackend()
+                    Stream<GTRecipe> recipesToMerge = recipeMap.getBackend()
                         .getRecipeCategoryMap()
                         .entrySet()
                         .stream()
                         .flatMap(entry -> {
                             boolean merge = entry.getKey() != defaultCategory
-                                && GT_Mod.gregtechproxy.recipeCategorySettings
+                                && GTMod.gregtechproxy.recipeCategorySettings
                                     .getOrDefault(entry.getKey(), RecipeCategorySetting.getDefault())
                                     == RecipeCategorySetting.MERGE;
                             return merge ? entry.getValue()
@@ -179,7 +179,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                         .collect(Collectors.toList());
                 } else {
                     // This is "sub" category
-                    if (GT_Mod.gregtechproxy.recipeCategorySettings
+                    if (GTMod.gregtechproxy.recipeCategorySettings
                         .getOrDefault(recipeCategory, RecipeCategorySetting.getDefault())
                         == RecipeCategorySetting.ENABLE) {
                         recipes = recipeMap.getBackend()
@@ -199,7 +199,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                 // even if it does break, at worst case it's just recreating the cache multiple times, which should be
                 // fine
                 cacheHolder.setCachedRecipes(cache);
-                cacheHolder.setCachedRecipesVersion(GT_Mod.gregtechproxy.getNEIReloadCount());
+                cacheHolder.setCachedRecipesVersion(GTMod.gregtechproxy.getNEIReloadCount());
             } catch (Exception e) {
                 throw new RuntimeException(
                     "Could not construct GT NEI Handler cache for category " + recipeCategory
@@ -213,7 +213,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public TemplateRecipeHandler newInstance() {
-        return new GT_NEI_DefaultHandler(recipeCategory);
+        return new GTNEIDefaultHandler(recipeCategory);
     }
 
     @Override
@@ -236,15 +236,15 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadCraftingRecipes(ItemStack aResult) {
-        ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
+        ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aResult);
 
         ArrayList<ItemStack> tResults = new ArrayList<>();
         tResults.add(aResult);
-        tResults.add(GT_OreDictUnificator.get(true, aResult));
+        tResults.add(GTOreDictUnificator.get(true, aResult));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed)
             && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
             for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-                tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
+                tResults.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
             }
         }
         if (aResult.getUnlocalizedName()
@@ -261,14 +261,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     }
 
     private void addFluidStacks(ItemStack aStack, ArrayList<ItemStack> tResults) {
-        FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, true);
+        FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, true);
         FluidStack tFluidStack;
         if (tFluid != null) {
             tFluidStack = tFluid;
-            tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-        } else tFluidStack = GT_Utility.getFluidFromDisplayStack(aStack);
+            tResults.add(GTUtility.getFluidDisplayStack(tFluid, false));
+        } else tFluidStack = GTUtility.getFluidFromDisplayStack(aStack);
         if (tFluidStack != null) {
-            tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack));
+            tResults.addAll(GTUtility.getContainersFromFluid(tFluidStack));
         }
     }
 
@@ -301,13 +301,13 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadUsageRecipes(ItemStack aInput) {
-        ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
+        ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aInput);
         ArrayList<ItemStack> tInputs = new ArrayList<>();
         tInputs.add(aInput);
-        tInputs.add(GT_OreDictUnificator.get(false, aInput));
+        tInputs.add(GTOreDictUnificator.get(false, aInput));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
             for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-                tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
+                tInputs.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
             }
         }
         addFluidStacks(aInput, tInputs);
@@ -321,9 +321,9 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     public IUsageHandler getUsageAndCatalystHandler(String inputId, Object... ingredients) {
         if (inputId.equals("item")) {
             ItemStack candidate = (ItemStack) ingredients[0];
-            GT_NEI_DefaultHandler handler = (GT_NEI_DefaultHandler) newInstance();
+            GTNEIDefaultHandler handler = (GTNEIDefaultHandler) newInstance();
             if (RecipeCatalysts.containsCatalyst(handler, candidate)) {
-                IMetaTileEntity metaTile = GT_Item_Machines.getMetaTileEntity(candidate);
+                IMetaTileEntity metaTile = ItemMachines.getMetaTileEntity(candidate);
                 OverclockDescriber overclockDescriber;
                 if (metaTile instanceof IOverclockDescriptionProvider provider) {
                     overclockDescriber = provider.getOverclockDescriber();
@@ -339,7 +339,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public ICraftingHandler getRecipeHandler(String outputId, Object... results) {
-        GT_NEI_DefaultHandler handler = (GT_NEI_DefaultHandler) super.getRecipeHandler(outputId, results);
+        GTNEIDefaultHandler handler = (GTNEIDefaultHandler) super.getRecipeHandler(outputId, results);
         if (results.length > 0 && results[0] instanceof OverclockDescriber) {
             handler.overclockDescriber = (OverclockDescriber) results[0];
         }
@@ -453,14 +453,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     }
 
     private void drawDescription(CachedDefaultRecipe cachedRecipe) {
-        GT_Recipe recipe = cachedRecipe.mRecipe;
+        GTRecipe recipe = cachedRecipe.mRecipe;
         if (overclockDescriber == null) {
             // By default, assume generic LV EU with no overclocks
             overclockDescriber = new EUNoOverclockDescriber((byte) 1, uiProperties.amperage);
         }
 
-        GT_OverclockCalculator calculator = overclockDescriber.createCalculator(
-            new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+        OverclockCalculator calculator = overclockDescriber.createCalculator(
+            new OverclockCalculator().setRecipeEUt(recipe.mEUt)
                 .setDuration(recipe.mDuration),
             recipe);
         calculator.calculate();
@@ -528,7 +528,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
         public FixedPositionedStack(Object object, boolean renderRealStackSize, int x, int y, int aChance,
             boolean aUnificate) {
-            super(aUnificate ? GT_OreDictUnificator.getNonUnifiedStacks(object) : object, x, y, true);
+            super(aUnificate ? GTOreDictUnificator.getNonUnifiedStacks(object) : object, x, y, true);
             this.mChance = aChance;
             realStackSize = item != null ? item.stackSize : 0;
             this.renderRealStackSize = renderRealStackSize;
@@ -558,11 +558,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe {
 
-        public final GT_Recipe mRecipe;
+        public final GTRecipe mRecipe;
         public final List<PositionedStack> mOutputs;
         public final List<PositionedStack> mInputs;
 
-        public CachedDefaultRecipe(GT_Recipe aRecipe) {
+        public CachedDefaultRecipe(GTRecipe aRecipe) {
             super();
             this.mRecipe = aRecipe;
             mOutputs = new ArrayList<>();
@@ -574,14 +574,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                         .getItemHandler() == itemInputsInventory) {
                         int i = widget.getMcSlot()
                             .getSlotIndex();
-                        Object input = aRecipe instanceof GT_Recipe.GT_Recipe_WithAlt
-                            ? ((GT_Recipe.GT_Recipe_WithAlt) aRecipe).getAltRepresentativeInput(i)
+                        Object input = aRecipe instanceof GTRecipe.GTRecipe_WithAlt
+                            ? ((GTRecipe.GTRecipe_WithAlt) aRecipe).getAltRepresentativeInput(i)
                             : aRecipe.getRepresentativeInput(i);
                         if (input != null) {
                             mInputs.add(
                                 new FixedPositionedStack(
                                     input,
-                                    GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                    GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                     widget.getPos().x + 1,
                                     widget.getPos().y + 1,
                                     true));
@@ -595,11 +595,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                 mOutputs.add(
                                     new FixedPositionedStack(
                                         output,
-                                        GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                        GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                         widget.getPos().x + 1,
                                         widget.getPos().y + 1,
                                         aRecipe.getOutputChance(i),
-                                        GT_NEI_DefaultHandler.this.neiProperties.unificateOutput));
+                                        GTNEIDefaultHandler.this.neiProperties.unificateOutput));
                             }
                         } else if (widget.getMcSlot()
                             .getItemHandler() == specialSlotInventory) {
@@ -607,7 +607,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                     mInputs.add(
                                         new FixedPositionedStack(
                                             aRecipe.mSpecialItems,
-                                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                             widget.getPos().x + 1,
                                             widget.getPos().y + 1));
                                 }
@@ -620,8 +620,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                         && aRecipe.mFluidInputs[i].getFluid() != null) {
                                         mInputs.add(
                                             new FixedPositionedStack(
-                                                GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
-                                                GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                                GTUtility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
+                                                GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                                 widget.getPos().x + 1,
                                                 widget.getPos().y + 1));
                                     }
@@ -633,8 +633,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                             && aRecipe.mFluidOutputs[i].getFluid() != null) {
                                             mOutputs.add(
                                                 new FixedPositionedStack(
-                                                    GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
-                                                    GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                                    GTUtility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
+                                                    GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                                     widget.getPos().x + 1,
                                                     widget.getPos().y + 1));
                                         }
@@ -644,50 +644,50 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
             // items and fluids that exceed usual count
             UIHelper.forEachSlots((i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxItemInputs && aRecipe.mInputs[i] != null) {
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxItemInputs && aRecipe.mInputs[i] != null) {
                     mInputs.add(
                         new FixedPositionedStack(
                             aRecipe.mInputs[i],
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1,
                             true));
                 }
             }, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxItemOutputs && aRecipe.mOutputs[i] != null) {
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxItemOutputs && aRecipe.mOutputs[i] != null) {
                     mOutputs.add(
                         new FixedPositionedStack(
                             aRecipe.mOutputs[i],
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1,
                             aRecipe.getOutputChance(i),
-                            GT_NEI_DefaultHandler.this.neiProperties.unificateOutput));
+                            GTNEIDefaultHandler.this.neiProperties.unificateOutput));
                 }
             }, (i, backgrounds, pos) -> {}, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxFluidInputs && aRecipe.mFluidInputs[i] != null
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxFluidInputs && aRecipe.mFluidInputs[i] != null
                     && aRecipe.mFluidInputs[i].getFluid() != null) {
                     mInputs.add(
                         new FixedPositionedStack(
-                            GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTUtility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1));
                 }
             }, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxFluidOutputs && aRecipe.mFluidOutputs[i] != null
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxFluidOutputs && aRecipe.mFluidOutputs[i] != null
                     && aRecipe.mFluidOutputs[i].getFluid() != null) {
                     mOutputs.add(
                         new FixedPositionedStack(
-                            GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTUtility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1));
                 }
             },
                 IDrawable.EMPTY,
                 IDrawable.EMPTY,
-                GT_NEI_DefaultHandler.this.frontend.getUIProperties(),
+                GTNEIDefaultHandler.this.frontend.getUIProperties(),
                 aRecipe.mInputs.length,
                 aRecipe.mOutputs.length,
                 aRecipe.mFluidInputs.length,
@@ -760,8 +760,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
             byte lowestTier = 0;
             while (iterator.hasNext()) {
                 CachedDefaultRecipe recipe = iterator.next();
-                byte recipeTier = GT_Utility
-                    .getTier(recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.recipeMap.getAmperage());
+                byte recipeTier = GTUtility
+                    .getTier(recipe.mRecipe.mEUt / GTNEIDefaultHandler.this.recipeMap.getAmperage());
                 if (recipeTier != previousTier) {
                     if (maxIndex != -1) {
                         mTierIndexes.put(previousTier, Range.between(minIndex, maxIndex));
diff --git a/src/main/java/gregtech/nei/RecipeDisplayInfo.java b/src/main/java/gregtech/nei/RecipeDisplayInfo.java
index f9cc1a9a8c..d9e6b1d65b 100644
--- a/src/main/java/gregtech/nei/RecipeDisplayInfo.java
+++ b/src/main/java/gregtech/nei/RecipeDisplayInfo.java
@@ -1,6 +1,6 @@
 package gregtech.nei;
 
-import static gregtech.api.util.GT_Utility.isStringInvalid;
+import static gregtech.api.util.GTUtility.isStringInvalid;
 
 import java.util.List;
 
@@ -12,9 +12,9 @@ import net.minecraft.client.Minecraft;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.util.FieldsAreNonnullByDefault;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 
 /**
  * Holds info used for drawing descriptions on NEI.
@@ -27,7 +27,7 @@ public class RecipeDisplayInfo {
     /**
      * Recipe to show description.
      */
-    public final GT_Recipe recipe;
+    public final GTRecipe recipe;
 
     /**
      * RecipeMap the recipe belongs to.
@@ -43,7 +43,7 @@ public class RecipeDisplayInfo {
     /**
      * Pre-built overclock calculator, used for drawing OC information. Do not calculate it again.
      */
-    public final GT_OverclockCalculator calculator;
+    public final OverclockCalculator calculator;
 
     /**
      * Current Y position for drawing description.
@@ -52,8 +52,8 @@ public class RecipeDisplayInfo {
 
     private final int neiTextColorOverride;
 
-    RecipeDisplayInfo(GT_Recipe recipe, RecipeMap<?> recipeMap, OverclockDescriber overclockDescriber,
-        GT_OverclockCalculator calculator, int descriptionYOffset, int neiTextColorOverride) {
+    RecipeDisplayInfo(GTRecipe recipe, RecipeMap<?> recipeMap, OverclockDescriber overclockDescriber,
+        OverclockCalculator calculator, int descriptionYOffset, int neiTextColorOverride) {
         this.recipe = recipe;
         this.recipeMap = recipeMap;
         this.overclockDescriber = overclockDescriber;
diff --git a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
index ea0168073a..a69a0aa0d6 100644
--- a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class BatchModeSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public BatchModeSupportDumper() {
-        super("batch_mode", ControllerWithOptionalFeatures::supportsBatchMode);
+        super("batch_mode", IControllerWithOptionalFeatures::supportsBatchMode);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
index 5b0d293827..d0a68d1131 100644
--- a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class InputSeparationSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public InputSeparationSupportDumper() {
-        super("input_separation", ControllerWithOptionalFeatures::supportsInputSeparation);
+        super("input_separation", IControllerWithOptionalFeatures::supportsInputSeparation);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/MaterialDumper.java b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
index 3234779de8..197fbba6b3 100644
--- a/src/main/java/gregtech/nei/dumper/MaterialDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 
 public class MaterialDumper extends GregTechIDDumper {
@@ -24,7 +24,7 @@ public class MaterialDumper extends GregTechIDDumper {
     @Override
     protected Iterable<String[]> dump(Mode mode) {
         List<String[]> dump = new ArrayList<>();
-        Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials)
+        Map<Integer, Materials> idMap = Arrays.stream(GregTechAPI.sGeneratedMaterials)
             .filter(Objects::nonNull)
             .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m));
         for (int i = 0; i < 1000; i++) {
diff --git a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
index 519af48e93..44e2ef8637 100644
--- a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
@@ -7,14 +7,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 
 import codechicken.nei.NEIClientUtils;
-import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.items.MetaGeneratedItem;
 
 public class MetaItemDumper extends GregTechIDDumper {
 
-    private final GT_MetaGenerated_Item item;
+    private final MetaGeneratedItem item;
     private final String nameSuffix;
 
-    public MetaItemDumper(GT_MetaGenerated_Item item, String name) {
+    public MetaItemDumper(MetaGeneratedItem item, String name) {
         super(name);
         this.nameSuffix = name;
         this.item = item;
diff --git a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
index ee30cdfb8a..a3fbd199fd 100644
--- a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
@@ -3,7 +3,7 @@ package gregtech.nei.dumper;
 import java.util.ArrayList;
 import java.util.List;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 
 public class MetaTileEntityDumper extends GregTechIDDumper {
@@ -20,8 +20,8 @@ public class MetaTileEntityDumper extends GregTechIDDumper {
     @Override
     protected Iterable<String[]> dump(Mode mode) {
         List<String[]> list = new ArrayList<>();
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
             if (mode == Mode.FREE && mte == null) {
                 list.add(new String[] { String.valueOf(i), "", "", });
             } else if (mode == Mode.USED && mte != null) {
diff --git a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
index dc378ff9ad..37045c6b58 100644
--- a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
@@ -5,16 +5,16 @@ import java.util.List;
 import java.util.function.Function;
 
 import codechicken.nei.config.DataDumper;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public abstract class MultiBlockFeatureSupportDumper extends DataDumper {
 
-    private final Function<ControllerWithOptionalFeatures, Boolean> isFeatureSupported;
+    private final Function<IControllerWithOptionalFeatures, Boolean> isFeatureSupported;
 
     public MultiBlockFeatureSupportDumper(String name,
-        Function<ControllerWithOptionalFeatures, Boolean> isFeatureSupported) {
+        Function<IControllerWithOptionalFeatures, Boolean> isFeatureSupported) {
         super("tools.dump.gt5u." + name);
         this.isFeatureSupported = isFeatureSupported;
     }
@@ -27,9 +27,9 @@ public abstract class MultiBlockFeatureSupportDumper extends DataDumper {
     @Override
     public Iterable<String[]> dump(int mode) {
         List<String[]> list = new ArrayList<>();
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
-            if (!(mte instanceof ControllerWithOptionalFeatures controller)) continue;
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
+            if (!(mte instanceof IControllerWithOptionalFeatures controller)) continue;
             if (!isFeatureSupported.apply(controller)) {
                 list.add(
                     new String[] { controller.getClass()
diff --git a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
index 05deba6c39..0c901e49eb 100644
--- a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class RecipeLockingSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public RecipeLockingSupportDumper() {
-        super("recipe_locking", ControllerWithOptionalFeatures::supportsSingleRecipeLocking);
+        super("recipe_locking", IControllerWithOptionalFeatures::supportsSingleRecipeLocking);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
index b48efb2cdc..b870d0c984 100644
--- a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class VoidProtectionSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public VoidProtectionSupportDumper() {
-        super("void_protection", ControllerWithOptionalFeatures::supportsVoidProtection);
+        super("void_protection", IControllerWithOptionalFeatures::supportsVoidProtection);
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
index 1c4d486319..b190710368 100644
--- a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
@@ -1,13 +1,13 @@
 package gregtech.nei.formatter;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -20,13 +20,13 @@ public class DefaultSpecialValueFormatter implements INEISpecialInfoFormatter {
     @Override
     public List<String> format(RecipeDisplayInfo recipeInfo) {
         int specialValue = recipeInfo.recipe.mSpecialValue;
-        if (specialValue == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {
+        if (specialValue == -100 && GTMod.gregtechproxy.mLowGravProcessing) {
             return Collections.singletonList(trans("159", "Needs Low Gravity"));
-        } else if (specialValue == -200 && GT_Mod.gregtechproxy.mEnableCleanroom) {
+        } else if (specialValue == -200 && GTMod.gregtechproxy.mEnableCleanroom) {
             return Collections.singletonList(trans("160", "Needs Cleanroom"));
         } else if (specialValue == -201) {
             return Collections.singletonList(trans("206", "Scan for Assembly Line"));
-        } else if (specialValue == -300 && GT_Mod.gregtechproxy.mEnableCleanroom) {
+        } else if (specialValue == -300 && GTMod.gregtechproxy.mEnableCleanroom) {
             return Collections.singletonList(trans("160.1", "Needs Cleanroom & LowGrav"));
         } else if (specialValue == -400) {
             return Collections.singletonList(trans("216", "Deprecated Recipe"));
diff --git a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
index dcfe2617dd..a4d53c46dc 100644
--- a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
@@ -7,7 +7,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -22,6 +22,6 @@ public class FuelSpecialValueFormatter implements INEISpecialInfoFormatter {
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 "GT5U.nei.fuel",
-                GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L)));
+                GTUtility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L)));
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
index 77cd41b343..eb77fba072 100644
--- a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
@@ -7,8 +7,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -26,7 +26,7 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter {
         int tier = getFusionTier(euToStart, voltage);
 
         return Collections.singletonList(
-            StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GT_Utility.formatNumbers(euToStart), tier));
+            StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GTUtility.formatNumbers(euToStart), tier));
     }
 
     public static int getFusionTier(long startupPower, long voltage) {
@@ -43,13 +43,13 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter {
             tier = 5;
         }
 
-        if (voltage <= GT_Values.V[6]) {
+        if (voltage <= GTValues.V[6]) {
             // no-op
-        } else if (voltage <= GT_Values.V[7]) {
+        } else if (voltage <= GTValues.V[7]) {
             tier = Math.max(tier, 2);
-        } else if (voltage <= GT_Values.V[8]) {
+        } else if (voltage <= GTValues.V[8]) {
             tier = Math.max(tier, 3);
-        } else if (voltage <= GT_Values.V[9]) {
+        } else if (voltage <= GTValues.V[9]) {
             tier = Math.max(tier, 4);
         } else {
             tier = 5;
diff --git a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
index f5c17a1163..a02efde73c 100644
--- a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
@@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.util.StatCollector;
 
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -24,7 +24,7 @@ public class HeatingCoilSpecialValueFormatter implements INEISpecialInfoFormatte
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 "GT5U.nei.heat_capacity",
-                GT_Utility.formatNumbers(heat),
+                GTUtility.formatNumbers(heat),
                 HeatingCoilLevel.getDisplayNameFromHeat(heat, false)));
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
index 21228240d4..c8d2db6928 100644
--- a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
@@ -4,11 +4,12 @@ import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
 /**
- * Getter for description for {@link gregtech.api.util.GT_Recipe#mSpecialValue} etc. that will be drawn on NEI.
+ * Getter for description for {@link GTRecipe#mSpecialValue} etc. that will be drawn on NEI.
  */
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
diff --git a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
index 8f2098c0a9..93b060eacb 100644
--- a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
@@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -44,6 +44,6 @@ public class SimpleSpecialValueFormatter implements INEISpecialInfoFormatter {
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 translationKey,
-                GT_Utility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier)));
+                GTUtility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier)));
     }
 }