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, 439 insertions, 483 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java
index 78ed9982fc..fc4aefcf14 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java
@@ -16,7 +16,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW;
-import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
+import static gregtech.common.UndergroundOil.undergroundOilReadInformation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,22 +33,22 @@ import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 import ic2.core.Ic2Items;
 
-public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_BasicMachine {
+public class MTEAdvSeismicProspector extends MTEBasicMachine {
 
     boolean ready = false;
     final int radius;
@@ -56,8 +56,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
     int cX;
     int cZ;
 
-    public GT_MetaTileEntity_AdvSeismicProspector(int aID, String aName, String aNameRegional, int aTier, int aRadius,
-        int aStep) {
+    public MTEAdvSeismicProspector(int aID, String aName, String aNameRegional, int aTier, int aRadius, int aStep) {
         super(
             aID,
             aName,
@@ -128,8 +127,8 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             "Oil prospecting area 3x3 oilfields, each is 8x8 chunks" };
     }
 
-    protected GT_MetaTileEntity_AdvSeismicProspector(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, int aRadius, int aStep) {
+    protected MTEAdvSeismicProspector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+        int aRadius, int aStep) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
         radius = aRadius;
         step = aStep;
@@ -137,7 +136,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AdvSeismicProspector(
+        return new MTEAdvSeismicProspector(
             this.mName,
             this.mTier,
             this.mDescriptionArray,
@@ -151,10 +150,10 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
         if (aBaseMetaTileEntity.isServerSide()) {
             ItemStack aStack = aPlayer.getCurrentEquippedItem();
 
-            if (!ready && (GT_Utility.consumeItems(aPlayer, aStack, Item.getItemFromBlock(Blocks.tnt), 16)
-                || GT_Utility.consumeItems(aPlayer, aStack, Ic2Items.industrialTnt.getItem(), 8)
-                || GT_Utility.consumeItems(aPlayer, aStack, Materials.Glyceryl, 4)
-                || GT_Utility.consumeItems(aPlayer, aStack, ItemList.Block_Powderbarrel.getItem(), 2))) {
+            if (!ready && (GTUtility.consumeItems(aPlayer, aStack, Item.getItemFromBlock(Blocks.tnt), 16)
+                || GTUtility.consumeItems(aPlayer, aStack, Ic2Items.industrialTnt.getItem(), 8)
+                || GTUtility.consumeItems(aPlayer, aStack, Materials.Glyceryl, 4)
+                || GTUtility.consumeItems(aPlayer, aStack, ItemList.Block_Powderbarrel.getItem(), 2))) {
 
                 this.ready = true;
                 this.mMaxProgresstime = (aPlayer.capabilities.isCreativeMode ? 20 : 800);
@@ -174,7 +173,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
                     ArrayList<String> tOils = new ArrayList<>();
                     prospectOils(tOils);
 
-                    GT_Utility.ItemNBT.setAdvancedProspectionData(
+                    GTUtility.ItemNBT.setAdvancedProspectionData(
                         mTier,
                         aStack,
                         this.getBaseMetaTileEntity()
@@ -186,7 +185,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
                         this.getBaseMetaTileEntity()
                             .getWorld().provider.dimensionId,
                         tOils,
-                        GT_Utility.sortByValueToList(tOres),
+                        GTUtility.sortByValueToList(tOres),
                         radius);
                 }
         }
@@ -275,15 +274,14 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
         Block tBlock = this.getBaseMetaTileEntity()
             .getBlock(x, y, z);
 
-        if (tBlock instanceof GT_Block_Ores_Abstract) {
+        if (tBlock instanceof BlockOresAbstract) {
             TileEntity tTileEntity = getBaseMetaTileEntity().getWorld()
                 .getTileEntity(x, y, z);
 
-            if ((tTileEntity instanceof GT_TileEntity_Ores) && (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000)) { // Filtering
-                                                                                                                         // small
-                                                                                                                         // ores
-                Materials tMaterial = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData
-                    % 1000];
+            if ((tTileEntity instanceof TileEntityOres) && (((TileEntityOres) tTileEntity).mMetaData < 16000)) { // Filtering
+                                                                                                                 // small
+                                                                                                                 // ores
+                Materials tMaterial = GregTechAPI.sGeneratedMaterials[((TileEntityOres) tTileEntity).mMetaData % 1000];
 
                 if ((tMaterial != null) && (tMaterial != Materials._NULL)) return tMaterial.mDefaultLocalName;
             }
@@ -291,10 +289,10 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             int tMetaID = getBaseMetaTileEntity().getWorld()
                 .getBlockMetadata(x, y, z);
             ItemStack is = new ItemStack(tBlock, 1, tMetaID);
-            ItemData association = GT_OreDictUnificator.getAssociation(is);
+            ItemData association = GTOreDictUnificator.getAssociation(is);
             if ((association != null) && (association.mPrefix.toString()
                 .startsWith("ore"))) return association.mMaterial.mMaterial.mDefaultLocalName;
-            else if (GT_Utility.isOre(tBlock, tMetaID)) return tBlock.getLocalizedName();
+            else if (GTUtility.isOre(tBlock, tMetaID)) return tBlock.getLocalizedName();
         }
         return null;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBetterJukebox.java
index f9a9fba8f4..8f1db317a2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBetterJukebox.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_JUKEBOX;
@@ -44,22 +44,21 @@ import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.parts.p2p.PartP2PSound;
-import gregtech.api.enums.GTVoltageIndex;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.VoltageIndex;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_MusicSystem;
+import gregtech.api.util.GTMusicSystem;
 import gregtech.common.gui.modularui.UIHelper;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 
-public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMachine
-    implements IAddUIWidgets, ISoundP2PHandler {
+public class MTEBetterJukebox extends MTEBasicMachine implements IAddUIWidgets, ISoundP2PHandler {
 
     // Stored state
     public UUID jukeboxUuid = UNSET_UUID;
@@ -73,7 +72,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
     public boolean superFastDebugMode = false;
     // Computed state
     private final Vector4i interdimPositionCache = new Vector4i(); // XYZ, Dimension ID
-    private GT_MusicSystem.MusicSource musicSource = null;
+    private GTMusicSystem.MusicSource musicSource = null;
     private boolean powered = false;
     private long discStartMs = 0;
     public long discDurationMs = 1;
@@ -95,7 +94,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
 
     public static final class BalanceMath {
 
-        public static int MAX_TIER = GTVoltageIndex.IV;
+        public static int MAX_TIER = VoltageIndex.IV;
         public static float VANILLA_JUKEBOX_RANGE = 4.0f; // 64 blocks
 
         private static final float[] LISTENING_VOLUME = new float[] { //
@@ -127,9 +126,9 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         }
 
         public static HeadphoneLimit headphoneLimit(int tier) {
-            if (tier <= GTVoltageIndex.HV) {
+            if (tier <= VoltageIndex.HV) {
                 return HeadphoneLimit.BLOCK_RANGE;
-            } else if (tier == GTVoltageIndex.EV) {
+            } else if (tier == VoltageIndex.EV) {
                 return HeadphoneLimit.INSIDE_DIMENSION;
             } else {
                 return HeadphoneLimit.BETWEEN_DIMENSIONS;
@@ -173,23 +172,23 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                 .format("Headphones work anywhere, in %sany dimension", EnumChatFormatting.WHITE);
         });
         strings.add(String.format("Cost: %s%d EU/t", EnumChatFormatting.WHITE, BalanceMath.eutUsage(aTier)));
-        strings.add(GT_Values.AuthorEigenRaven);
+        strings.add(GTValues.AuthorEigenRaven);
         return strings.toArray(new String[0]);
     }
 
-    public GT_MetaTileEntity_BetterJukebox(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEBetterJukebox(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, buildDescription(aTier), INPUT_SLOTS, 1);
         playbackVolume = BalanceMath.listeningVolume(aTier);
     }
 
-    public GT_MetaTileEntity_BetterJukebox(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBetterJukebox(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, INPUT_SLOTS, 1);
         playbackVolume = BalanceMath.listeningVolume(aTier);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BetterJukebox(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBetterJukebox(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -223,7 +222,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             markDirty();
         }
         if (musicSource == null) {
-            musicSource = GT_MusicSystem.ServerSystem.registerOrGetMusicSource(jukeboxUuid);
+            musicSource = GTMusicSystem.ServerSystem.registerOrGetMusicSource(jukeboxUuid);
             musicSource.originPosition.set(interdimPosition);
             musicSource.headphoneLimit = BalanceMath.headphoneLimit(mTier);
             musicSource.headphoneBlockRange = BalanceMath.headphoneBlockRange(mTier);
@@ -235,7 +234,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             final ResourceLocation resource = record.getRecordResource(record.recordName);
             currentlyPlaying = record;
             // Assume a safe disc duration of 500 seconds if not known in the registry
-            discDurationMs = GT_MusicSystem.getMusicRecordDurations()
+            discDurationMs = GTMusicSystem.getMusicRecordDurations()
                 .getOrDefault(resource, 500_000);
             discStartMs = System.currentTimeMillis() - discProgressMs;
             musicSource.setRecord(
@@ -324,7 +323,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                     musicSource.setRecord(
                         new ResourceLocation(resource.getResourceDomain(), "records." + resource.getResourcePath()));
                     // Assume a safe disc duration of 500 seconds if not known in the registry
-                    discDurationMs = GT_MusicSystem.getMusicRecordDurations()
+                    discDurationMs = GTMusicSystem.getMusicRecordDurations()
                         .getOrDefault(resource, 500_000);
                     discProgressMs = 0;
                     discStartMs = now;
@@ -395,7 +394,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         if (jukeboxUuid == UNSET_UUID) {
             return;
         }
-        GT_MusicSystem.ServerSystem.removeMusicSource(jukeboxUuid);
+        GTMusicSystem.ServerSystem.removeMusicSource(jukeboxUuid);
     }
 
     @Override
@@ -490,7 +489,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             .itemOutputPositionsGetter(count -> UIHelper.getGridPositions(count, 153, 24, 1))
             .specialItemPositionGetter(() -> new Pos2d(115, 62))
             .progressBarPos(Pos2d.cartesian(133, 24))
-            .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_ARROW))
+            .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_ARROW))
             .build();
     }
 
@@ -530,8 +529,8 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         // Loop
         builder.widget(
             new CycleButtonWidget().setToggle(() -> loopMode, val -> loopMode = val)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_CYCLIC)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.betterjukebox.loop.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(153, 6)
@@ -545,8 +544,8 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                 playbackSlot = 0;
             }
         })
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_SHUFFLE)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_SHUFFLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.betterjukebox.shuffle.tooltip"))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(153, 42)
@@ -632,7 +631,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
     private final ObjectArrayList<PartP2PSound> combinedOutputsListCache = new ObjectArrayList<>(new PartP2PSound[0]);
 
     private void updateEmitterList() {
-        final GT_MusicSystem.MusicSource target = musicSource;
+        final GTMusicSystem.MusicSource target = musicSource;
         if (target == null) {
             return;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
index 8d2e0959e1..43d2d6b295 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
@@ -3,26 +3,27 @@ package gregtech.common.tileentities.machines.basic;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine {
+public class MTEBoxinator extends MTEBasicMachine {
 
     ItemStack aInputCache;
     ItemStack aOutputCache;
     int aTypeCache = 0;
 
-    public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEBoxinator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -96,13 +97,13 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
                     .build()));
     }
 
-    public GT_MetaTileEntity_Boxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -138,11 +139,11 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
         }
         ItemStack tSlot0 = getInputAt(0);
         ItemStack tSlot1 = getInputAt(1);
-        if ((GT_Utility.isStackValid(tSlot0)) && (GT_Utility.isStackValid(tSlot1))
-            && (GT_Utility.getContainerItem(tSlot0, true) == null)) {
+        if ((GTUtility.isStackValid(tSlot0)) && (GTUtility.isStackValid(tSlot1))
+            && (GTUtility.getContainerItem(tSlot0, true) == null)) {
             if ((ItemList.Schematic_1by1.isStackEqual(tSlot1)) && (tSlot0.stackSize >= 1)) {
                 boolean tIsCached = hasValidCache(tSlot0, 1, true);
-                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GT_ModHandler.getRecipeOutput(tSlot0);
+                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GTModHandler.getRecipeOutput(tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
                         tSlot0.stackSize -= 1;
@@ -159,7 +160,7 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if ((ItemList.Schematic_2by2.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 4)) {
                 boolean tIsCached = hasValidCache(tSlot0, 2, true);
                 this.mOutputItems[0] = tIsCached ? aOutputCache.copy()
-                    : GT_ModHandler.getRecipeOutput(tSlot0, tSlot0, null, tSlot0, tSlot0);
+                    : GTModHandler.getRecipeOutput(tSlot0, tSlot0, null, tSlot0, tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
                         getInputAt(0).stackSize -= 4;
@@ -176,7 +177,7 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if ((ItemList.Schematic_3by3.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 9)) {
                 boolean tIsCached = hasValidCache(tSlot0, 3, true);
                 this.mOutputItems[0] = tIsCached ? aOutputCache.copy()
-                    : GT_ModHandler
+                    : GTModHandler
                         .getRecipeOutput(tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
@@ -208,20 +209,21 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if (RecipeMaps.packagerRecipes.findRecipe(
                 getBaseMetaTileEntity(),
                 true,
-                gregtech.api.enums.GT_Values.V[mTier],
+                GTValues.V[mTier],
                 null,
-                GT_Utility.copyAmount(64, aStack),
+                GTUtility.copyAmount(64, aStack),
                 tInput1) != null) {
                 return true;
             }
-            if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(aStack) != null)
+            if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GTModHandler.getRecipeOutput(aStack) != null)
                 return true;
             if (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))
-                && GT_ModHandler.getRecipeOutput(aStack, aStack, null, aStack, aStack) != null) {
+                && GTModHandler.getRecipeOutput(aStack, aStack, null, aStack, aStack) != null) {
                 return true;
             }
-            return ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler
-                .getRecipeOutput(aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack) != null);
+            return ItemList.Schematic_3by3.isStackEqual(getInputAt(1))
+                && (GTModHandler.getRecipeOutput(aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack)
+                    != null);
         } else {
             return RecipeMaps.packagerRecipes.containsInput(aStack);
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTECharger.java
index de43fd715e..52c15cc6df 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTECharger.java
@@ -1,36 +1,33 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
+public class MTECharger extends MTEBasicBatteryBuffer {
 
-    public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription,
-        int aSlotCount) {
+    public MTECharger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
     }
 
-    public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-        int aSlotCount) {
+    public MTECharger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
         super(aName, aTier, aDescription, aTextures, aSlotCount);
     }
 
-    public GT_MetaTileEntity_Charger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
-        int aSlotCount) {
+    public MTECharger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) {
         super(aName, aTier, aDescription, aTextures, aSlotCount);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Charger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
+        return new MTECharger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
     }
 
     @Override
@@ -68,9 +65,9 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
                             if (mMetaTileEntity.mInventory[i] != null
                                 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
                                 mBaseMetaTileEntity.increaseStoredEnergyUnits(
-                                    GT_ModHandler.dischargeElectricItem(
+                                    GTModHandler.dischargeElectricItem(
                                         mMetaTileEntity.mInventory[i],
-                                        GT_Utility.safeInt(
+                                        GTUtility.safeInt(
                                             Math.min(
                                                 V[mTier] * 15,
                                                 mBaseMetaTileEntity.getEUCapacity()
@@ -90,9 +87,9 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
                             if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
                                 mBaseMetaTileEntity
                                     .decreaseStoredEU(
-                                        GT_ModHandler.chargeElectricItem(
+                                        GTModHandler.chargeElectricItem(
                                             mMetaTileEntity.mInventory[i],
-                                            GT_Utility
+                                            GTUtility
                                                 .safeInt(Math.min(V[mTier] * 15, mBaseMetaTileEntity.getStoredEU())),
                                             (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()),
                                             true,
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEIndustrialApiary.java
index 9249673c7c..f43c8d0a5e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEIndustrialApiary.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.AuthorKuba;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorKuba;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW;
@@ -20,7 +20,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_INDUSTRIAL_APIA
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW;
 import static gregtech.api.metatileentity.BaseTileEntity.STALLED_STUTTERING_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -100,24 +100,24 @@ import forestry.apiculture.genetics.Bee;
 import forestry.apiculture.genetics.alleles.AlleleEffectThrottled;
 import forestry.core.errors.EnumErrorCode;
 import forestry.plugins.PluginApiculture;
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ApiaryModifier;
-import gregt