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

7 files changed, 87 insertions, 108 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/MTEChestBuffer.java
index 67c38fad9e..27bc56dd62 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEChestBuffer.java
@@ -7,19 +7,19 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
+public class MTEChestBuffer extends MTEBuffer {
 
     private static final int[] tickRate = { 400, 200, 100, 20, 4, 1, 1, 1, 1, 1, 1, 1, 1 };
     private static final int[] maxStacks = { 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 128 };
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -30,29 +30,27 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
                 getTickRateDesc(aTier) });
     }
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEChestBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEChestBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ChestBuffer(
+        return new MTEChestBuffer(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -125,7 +123,7 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
         addInvertRedstoneButton(builder);
         addStockingModeButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(69, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(69, true))
                 .setPos(98, 60)
                 .setSize(51, 22));
         addMainUI(builder);
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java b/src/main/java/gregtech/common/tileentities/automation/MTEFilter.java
index b6f1d53604..f731b5f915 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEFilter.java
@@ -12,21 +12,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_FilterBase;
+import gregtech.api.metatileentity.implementations.MTEFilterBase;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
+public class MTEFilter extends MTEFilterBase {
 
     private static final int NUM_FILTER_SLOTS = 9;
     private static final String IGNORE_NBT_TOOLTIP = "GT5U.machines.ignore_nbt.tooltip";
     private boolean ignoreNbt = false;
 
-    public GT_MetaTileEntity_Filter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -36,24 +36,17 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
             new String[] { "Filters up to 9 different Items", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_Filter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Filter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Filter(
-            this.mName,
-            this.mTier,
-            this.mInventory.length,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEFilter(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -86,13 +79,13 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
         }
         if (this.invertFilter) {
             for (int i = 0; i < NUM_FILTER_SLOTS; i++) {
-                if (GT_Utility.areStacksEqual(this.mInventory[FILTER_SLOT_INDEX + i], aStack, this.ignoreNbt)) {
+                if (GTUtility.areStacksEqual(this.mInventory[FILTER_SLOT_INDEX + i], aStack, this.ignoreNbt)) {
                     return false;
                 }
             }
             return true;
         }
-        return GT_Utility.areStacksEqual(this.mInventory[(FILTER_SLOT_INDEX + aIndex)], aStack, this.ignoreNbt);
+        return GTUtility.areStacksEqual(this.mInventory[(FILTER_SLOT_INDEX + aIndex)], aStack, this.ignoreNbt);
     }
 
     @Override
@@ -100,19 +93,19 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
         super.addUIWidgets(builder, buildContext);
         addAllowNbtButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(9, false))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_WHITE.apply(9, false))
                 .setPos(6, 19)
                 .setSize(9, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(24, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_BLUE.apply(24, true))
                     .setPos(71, 19)
                     .setSize(24, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_RED.apply(19, true))
                     .setPos(152, 19)
                     .setSize(19, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(16, 4)
                     .setSize(54, 54))
             .widget(
@@ -122,7 +115,7 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
                     .phantom(true)
                     .applyForWidget(
                         widget -> widget.disableShiftInsert()
-                            .setBackground(GT_UITextures.TRANSPARENT))
+                            .setBackground(GTUITextures.TRANSPARENT))
                     .build()
                     .setPos(16, 4))
             .widget(
@@ -138,7 +131,7 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
             createToggleButton(
                 () -> ignoreNbt,
                 val -> ignoreNbt = val,
-                GT_UITextures.OVERLAY_BUTTON_NBT,
+                GTUITextures.OVERLAY_BUTTON_NBT,
                 () -> mTooltipCache.getData(IGNORE_NBT_TOOLTIP)));
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
index 58b7fa57df..36f1e1be58 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
@@ -14,21 +14,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer {
+public class MTEItemDistributor extends MTEBuffer {
 
     private byte[] itemsPerSide = new byte[6];
     private ForgeDirection currentSide = ForgeDirection.DOWN;
     private byte currentSideItemCount = 0;
 
-    public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEItemDistributor(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -39,24 +39,24 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
                 "Use Screwdriver to increase/decrease Items per Side" });
     }
 
-    public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEItemDistributor(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ItemDistributor(String aName, int aTier, int aInvSlotCount, String aDescription,
+    public MTEItemDistributor(String aName, int aTier, int aInvSlotCount, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_ItemDistributor(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTEItemDistributor(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ItemDistributor(
+        return new MTEItemDistributor(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -144,7 +144,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
                 return;
             }
         }
-        movedItems = GT_Utility.moveOneItemStack(
+        movedItems = GTUtility.moveOneItemStack(
             aBaseMetaTileEntity,
             adjacentTileEntity,
             currentSide,
@@ -173,7 +173,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
         // Adjust items per side by 1 or -1, constrained to the cyclic interval [0, 127]
         itemsPerSide[ordinalSide] += aPlayer.isSneaking() ? -1 : 1;
         itemsPerSide[ordinalSide] = (byte) ((itemsPerSide[ordinalSide] + 128) % 128);
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("211", "Items per side: ") + itemsPerSide[ordinalSide]);
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("211", "Items per side: ") + itemsPerSide[ordinalSide]);
     }
 
     @Override
@@ -196,7 +196,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
         addEmitRedstoneIfFullButton(builder);
         addInvertRedstoneButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(87, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(87, true))
                 .setPos(62, 60)
                 .setSize(87, 22));
         addInventorySlots(builder);
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/MTERecipeFilter.java
index d446009ac7..24b57153af 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTERecipeFilter.java
@@ -34,15 +34,15 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter;
+import gregtech.api.metatileentity.implementations.MTESpecialFilter;
 import gregtech.api.multitileentity.MultiTileEntityItem;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.ItemMachines;
 import gregtech.loaders.preload.GT_Loader_MultiTileEntities;
 
-public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFilter {
+public class MTERecipeFilter extends MTESpecialFilter {
 
     private static final String TT_machineType = "GT5U.MBTT.MachineType";
     private static final String REPRESENTATION_SLOT_TOOLTIP = "GT5U.recipe_filter.representation_slot.tooltip";
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
     private List<ItemStack> filteredMachines = new ArrayList<>();
     public int mRotationIndex = 0;
 
-    public GT_MetaTileEntity_RecipeFilter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERecipeFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -60,19 +60,18 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
             new String[] { "Filters 1 Recipe Type", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_RecipeFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTERecipeFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RecipeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTERecipeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     private static RecipeMap<?> getItemStackMachineRecipeMap(ItemStack stack) {
         if (stack != null) {
-            IMetaTileEntity metaTileEntity = GT_Item_Machines.getMetaTileEntity(stack);
+            IMetaTileEntity metaTileEntity = ItemMachines.getMetaTileEntity(stack);
             if (metaTileEntity != null) {
                 return getMetaTileEntityRecipeMap(metaTileEntity);
             } else if (stack.getItem() instanceof MultiTileEntityItem) {
@@ -113,7 +112,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
         if (this.filteredMachines.isEmpty()) {
             return;
         }
-        this.mInventory[FILTER_SLOT_INDEX] = GT_Utility.copyAmount(
+        this.mInventory[FILTER_SLOT_INDEX] = GTUtility.copyAmount(
             1,
             this.filteredMachines.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.filteredMachines.size()));
         if (this.mInventory[FILTER_SLOT_INDEX] == null) return;
@@ -121,7 +120,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RecipeFilter(
+        return new MTERecipeFilter(
             this.mName,
             this.mTier,
             this.mInventory.length,
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/MTERegulator.java
index 08d3d32512..4205af7e08 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTERegulator.java
@@ -18,20 +18,20 @@ import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
+public class MTERegulator extends MTEBuffer {
 
     public int[] mTargetSlots = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
     private boolean charge = false, decharge = false;
 
-    public GT_MetaTileEntity_Regulator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERegulator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -42,24 +42,17 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                 "Allows Item-specific output slot" });
     }
 
-    public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTERegulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTERegulator(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Regulator(
-            this.mName,
-            this.mTier,
-            this.mInventory.length,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTERegulator(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -114,7 +107,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
     public void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
         for (int i = 0, tCosts; i < 9; i++) {
             if (this.mInventory[(i + 9)] != null) {
-                tCosts = GT_Utility.moveOneItemStackIntoSlot(
+                tCosts = GTUtility.moveOneItemStackIntoSlot(
                     getBaseMetaTileEntity(),
                     getBaseMetaTileEntity().getTileEntityAtSide(getBaseMetaTileEntity().getBackFacing()),
                     getBaseMetaTileEntity().getBackFacing(),
@@ -138,7 +131,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
         ItemStack aStack) {
         return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && aIndex >= 0
             && aIndex <= 8
-            && GT_Utility.areStacksEqual(aStack, this.mInventory[(aIndex + 9)]);
+            && GTUtility.areStacksEqual(aStack, this.mInventory[(aIndex + 9)]);
     }
 
     @Override
@@ -175,7 +168,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
         super.addUIWidgets(builder, buildContext);
         builder.widget(createChargerSlot(43, 62));
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(84, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(84, true))
                 .setPos(65, 60)
                 .setSize(84, 22))
             .widget(
@@ -185,7 +178,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                     .build()
                     .setPos(7, 5))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(62, 5)
                     .setSize(54, 54))
             .widget(
@@ -195,11 +188,11 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                     .endAtSlot(17)
                     .applyForWidget(
                         widget -> widget.setControlsAmount(true)
-                            .setBackground(GT_UITextures.TRANSPARENT))
+                            .setBackground(GTUITextures.TRANSPARENT))
                     .build()
                     .setPos(62, 5))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(117, 5)
                     .setSize(54, 54));
 
@@ -217,7 +210,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                             0,
                             mTargetSlots[index] + (clickData.mouseButton == 0 ? -1 : 1) * (clickData.shift ? 16 : 1)));
                 }
-            }.setBackground(GT_UITextures.TRANSPARENT)
+            }.setBackground(GTUITextures.TRANSPARENT)
                 .setPos(xPos, yPos))
                 .widget(
                     TextWidget.dynamicString(() -> String.valueOf(mTargetSlots[index]))
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/MTESuperBuffer.java
index 9a1d2d7dcf..fa1bdd60b9 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTESuperBuffer.java
@@ -13,16 +13,16 @@ import net.minecraft.item.ItemStack;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer {
+public class MTESuperBuffer extends MTEChestBuffer {
 
-    public GT_MetaTileEntity_SuperBuffer(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESuperBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -33,19 +33,17 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
                 getTickRateDesc(aTier) });
     }
 
-    public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTESuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTESuperBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperBuffer(
+        return new MTESuperBuffer(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -66,8 +64,8 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
     @Override
     protected void fillStacksIntoFirstSlots() {
         // no order, this is super buffer
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
         List<Integer> validSlots = new ArrayList<>(mInventory.length);
         // List<String> order = new ArrayList<>(mInventory.length);
         for (int i = 0; i < mInventory.length - 1; i++) {
@@ -75,14 +73,14 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             // order.add(sID);
             mInventory[i] = null;
         }
         int i = 0;
-        for (Map.Entry<GT_Utility.ItemId, Integer> entry : slots.entrySet()) {
+        for (Map.Entry<GTUtility.ItemId, Integer> entry : slots.entrySet()) {
             do {
                 int slot = validSlots.get(i);
                 mInventory[slot] = stacks.get(entry.getKey())
@@ -98,7 +96,7 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
     @Override
     protected void addMainUI(ModularWindow.Builder builder) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SUPER_BUFFER)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SUPER_BUFFER)
                 .setPos(61, 4)
                 .setSize(54, 54));
     }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/MTETypeFilter.java
index be4a2226a1..3b8cd3482e 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTETypeFilter.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.automation;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER;
 import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER_GLOW;
 
@@ -22,13 +22,13 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter;
+import gregtech.api.metatileentity.implementations.MTESpecialFilter;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilter {
+public class MTETypeFilter extends MTESpecialFilter {
 
     private static final String REPRESENTATION_SLOT_TOOLTIP = "GT5U.type_filter.representation_slot.tooltip";
     public int mRotationIndex = 0;
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
         OrePrefixes.oreBasalt,
         OrePrefixes.oreMarble);
 
-    public GT_MetaTileEntity_TypeFilter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTETypeFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -58,19 +58,17 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
             new String[] { "Filters 1 Item Type", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_TypeFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTETypeFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_TypeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTETypeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TypeFilter(
+        return new MTETypeFilter(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -99,7 +97,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
     }
 
     private void copyHeldItemPrefix(ItemStack handStack) {
-        ItemData data = GT_OreDictUnificator.getAssociation(handStack);
+        ItemData data = GTOreDictUnificator.getAssociation(handStack);
         if (data != null && data.hasValidPrefixData()) {
             this.mPrefix = data.mPrefix;
             this.mRotationIndex = -1;
@@ -142,7 +140,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
             this.mInventory[FILTER_SLOT_INDEX] = null;
             return;
         }
-        this.mInventory[FILTER_SLOT_INDEX] = GT_Utility.copyAmount(
+        this.mInventory[FILTER_SLOT_INDEX] = GTUtility.copyAmount(
             1,
             this.mPrefix.mPrefixedItems
                 .get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size()));
@@ -165,7 +163,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
     @Override
     protected boolean isStackAllowed(ItemStack aStack) {
         if (this.mPrefix == OrePrefixes.ore) {
-            ItemData data = GT_OreDictUnificator.getItemData(aStack);
+            ItemData data = GTOreDictUnificator.getItemData(aStack);
             if (data != null && data.mPrefix != null && OREBLOCK_PREFIXES.contains(data.mPrefix)) {
                 return true;
             }