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

3 files changed, 169 insertions, 175 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java
index c1ba23c3c7..05150c8478 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java
@@ -15,27 +15,27 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo {
+public class MTEElectricAutoWorkbench extends MTEBasicTank implements IAddGregtechLogo {
 
     public int mMode = 0, mCurrentSlot = 0, mThroughPut = 0, mTicksUntilNextUpdate = 20;
     public boolean mLastCraftSuccessful = false;
@@ -44,18 +44,18 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     private static final int MAX_MODES = 10;
     private static final int MAX_THROUGHPUT = 4;
 
-    public GT_MetaTileEntity_ElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) {
+    public MTEElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) {
         super(
             aID,
             "basicmachine.automation.autoworkbench.0" + aTier,
-            "Auto Workbench (" + GT_Values.VN[aTier] + ")",
+            "Auto Workbench (" + GTValues.VN[aTier] + ")",
             aTier,
             30,
             aDescription);
-        mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
+        mLocalName = "Auto Workbench (" + GTValues.VN[aTier] + ")";
     }
 
-    public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription,
+    public MTEElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 30, aDescription, aTextures);
     }
@@ -112,22 +112,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[mTier];
+        return GTValues.V[mTier];
     }
 
     @Override
     public long maxEUOutput() {
-        return mThroughPut % 2 == 0 ? GT_Values.V[mTier] : 0;
+        return mThroughPut % 2 == 0 ? GTValues.V[mTier] : 0;
     }
 
     @Override
     public long getMinimumStoredEU() {
-        return GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
     public long maxEUStore() {
-        return Math.max(2048L, GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]));
+        return Math.max(2048L, GTValues.V[this.mTier] * (this.mTier * GTValues.V[this.mTier]));
     }
 
     @Override
@@ -142,17 +142,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ElectricAutoWorkbench(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEElectricAutoWorkbench(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -200,7 +196,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing() && side != getBaseMetaTileEntity().getBackFacing();
     }
 
@@ -226,12 +222,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
             if (mInventory[18] == null) {
                 for (byte i = 0; i < 18 && mFluid != null; i++) {
-                    ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true);
+                    ItemStack tOutput = GTUtility.fillFluidContainer(mFluid, mInventory[i], false, true);
                     if (tOutput != null) {
                         for (byte j = 0; j < 9; j++) {
-                            if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
+                            if (mInventory[j] == null || (GTUtility.areStacksEqual(tOutput, mInventory[j])
                                 && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) {
-                                mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount
+                                mFluid.amount -= GTUtility.getFluidForFilledItem(tOutput, true).amount
                                     * tOutput.stackSize;
                                 getBaseMetaTileEntity().decrStackSize(i, 1);
                                 if (mInventory[j] == null) {
@@ -274,7 +270,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             for (int i = 0; i < 9; i++) {
                                 tRecipe[i] = mInventory[i + 19];
                                 if (tRecipe[i] != null) {
-                                    tRecipe[i] = GT_Utility.copy(tRecipe[i]);
+                                    tRecipe[i] = GTUtility.copy(tRecipe[i]);
                                     tRecipe[i].stackSize = 1;
                                 }
                             }
@@ -288,22 +284,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 tRecipe[1] = tTempStack;
                                 tRecipe[3] = tTempStack;
                                 tRecipe[4] = tTempStack;
                             } else break;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 tRecipe[2] = tTempStack;
                                 tRecipe[5] = tTempStack;
                                 tRecipe[6] = tTempStack;
                                 tRecipe[7] = tTempStack;
                                 tRecipe[8] = tTempStack;
                             } else break;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -320,10 +316,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -340,13 +336,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
                             tRecipe[3] = tTempStack;
                             tRecipe[4] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -363,7 +359,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
@@ -374,7 +370,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             tRecipe[6] = tTempStack;
                             tRecipe[7] = tTempStack;
                             tRecipe[8] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -391,11 +387,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            tOutput = GT_OreDictUnificator.get(true, tTempStack);
-                            if (tOutput != null && GT_Utility.areStacksEqual(tOutput, tTempStack)) tOutput = null;
+                            tOutput = GTOreDictUnificator.get(true, tTempStack);
+                            if (tOutput != null && GTUtility.areStacksEqual(tOutput, tTempStack)) tOutput = null;
                             if (tOutput == null) {
                                 tRecipe[0] = null;
                                 if (mInventory[18] == null) {
@@ -413,13 +409,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                     mTicksUntilNextUpdate = 1;
                                 }
                             } else if (OrePrefixes.dustSmall.contains(mInventory[mCurrentSlot])) {
-                                tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                                tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                                 tTempStack.stackSize = 1;
                                 tRecipe[0] = tTempStack;
                                 tRecipe[1] = tTempStack;
                                 tRecipe[3] = tTempStack;
                                 tRecipe[4] = tTempStack;
-                                if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                     == null) {
                                     if (mInventory[18] == null) {
                                         mInventory[18] = mInventory[mCurrentSlot];
@@ -428,7 +424,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                     }
                                 }
                             } else if (OrePrefixes.dustTiny.contains(mInventory[mCurrentSlot])) {
-                                tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                                tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                                 tTempStack.stackSize = 1;
                                 tRecipe[0] = tTempStack;
                                 tRecipe[1] = tTempStack;
@@ -439,7 +435,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 tRecipe[6] = tTempStack;
                                 tRecipe[7] = tTempStack;
                                 tRecipe[8] = tTempStack;
-                                if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                     == null) {
                                     if (mInventory[18] == null) {
                                         mInventory[18] = mInventory[mCurrentSlot];
@@ -465,7 +461,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
@@ -476,7 +472,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             tRecipe[6] = tTempStack;
                             tRecipe[7] = tTempStack;
                             tRecipe[8] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -496,15 +492,15 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             for (int i = mCurrentSlot + 1; i < 18; i++) {
                                 if (mInventory[i] != null && mInventory[i].getItem() == tTempStack.getItem()
                                     && mInventory[mCurrentSlot].getItemDamage() + mInventory[i].getItemDamage()
                                         > tTempStack.getMaxDamage()) {
                                     tRecipe[0] = tTempStack;
-                                    tRecipe[1] = GT_Utility.copy(mInventory[i]);
-                                    if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                    tRecipe[1] = GTUtility.copy(mInventory[i]);
+                                    if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                         == null) {
                                         if (mInventory[18] == null) {
                                             mInventory[18] = mInventory[mCurrentSlot];
@@ -527,11 +523,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             }
                             for (byte i = 0, j = 0; i < 18 && j < 9
                                 && (j < 2
-                                    || GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                    || GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                         == null); i++) {
                                 tRecipe[j] = mInventory[(mCurrentSlot + i) % 18];
                                 if (tRecipe[j] != null) {
-                                    tRecipe[j] = GT_Utility.copy(tRecipe[j]);
+                                    tRecipe[j] = GTUtility.copy(tRecipe[j]);
                                     tRecipe[j].stackSize = 1;
                                     j++;
                                 }
@@ -542,19 +538,19 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                 }
 
                 if (tOutput == null)
-                    tOutput = GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe);
+                    tOutput = GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe);
 
                 if (tOutput != null || mMode == 0) mInventory[28] = tOutput;
 
                 if (tOutput == null) {
                     mLastCraftSuccessful = false;
                 } else {
-                    if ((tTempStack = GT_OreDictUnificator.get(true, tOutput)) != null) {
+                    if ((tTempStack = GTOreDictUnificator.get(true, tOutput)) != null) {
                         tTempStack.stackSize = tOutput.stackSize;
                         tOutput = tTempStack;
                     }
 
-                    mInventory[28] = GT_Utility.copy(tOutput);
+                    mInventory[28] = GTUtility.copy(tOutput);
                     ArrayList<ItemStack> tList = recipeContent(tRecipe), tContent = benchContent();
                     if (tList.size() > 0 && tContent.size() > 0) {
 
@@ -562,7 +558,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                         for (byte i = 0; i < tList.size() && success; i++) {
                             success = false;
                             for (byte j = 0; j < tContent.size() && !success; j++) {
-                                if (GT_Utility.areStacksEqual(tList.get(i), tContent.get(j))) {
+                                if (GTUtility.areStacksEqual(tList.get(i), tContent.get(j))) {
                                     if (tList.get(i).stackSize <= tContent.get(j).stackSize) {
                                         success = true;
                                     }
@@ -576,17 +572,17 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             for (byte i = 8; i > -1; i--) {
                                 for (byte j = 17; j > -1; j--) {
                                     if (tRecipe[i] != null && mInventory[j] != null) {
-                                        if (GT_Utility.areStacksEqual(tRecipe[i], mInventory[j])) {
-                                            ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true);
+                                        if (GTUtility.areStacksEqual(tRecipe[i], mInventory[j])) {
+                                            ItemStack tStack = GTUtility.getContainerItem(mInventory[j], true);
                                             if (tStack != null) {
                                                 getBaseMetaTileEntity().decrStackSize(j, 1);
                                                 if (!tStack.isItemStackDamageable()
                                                     || tStack.getItemDamage() < tStack.getMaxDamage()) {
                                                     for (byte k = 9; k < 18; k++) {
                                                         if (mInventory[k] == null) {
-                                                            mInventory[k] = GT_Utility.copy(tStack);
+                                                            mInventory[k] = GTUtility.copy(tStack);
                                                             break;
-                                                        } else if (GT_Utility.areStacksEqual(mInventory[k], tStack)
+                                                        } else if (GTUtility.areStacksEqual(mInventory[k], tStack)
                                                             && mInventory[k].stackSize + tStack.stackSize
                                                                 <= tStack.getMaxStackSize()) {
                                                                     mInventory[k].stackSize += tStack.stackSize;
@@ -603,7 +599,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                             }
 
-                            mInventory[18] = GT_Utility.copy(tOutput);
+                            mInventory[18] = GTUtility.copy(tOutput);
                             getBaseMetaTileEntity()
                                 .decreaseStoredEnergyUnits(mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, true);
                             mTicksUntilNextUpdate = 1;
@@ -620,7 +616,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     if (mInventory[18] == null && mThroughPut < 2) {
                         for (byte i = 0; i < 8; i++) {
                             for (byte j = i; ++j < 9;) {
-                                if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])
+                                if (GTUtility.areStacksEqual(mInventory[i], mInventory[j])
                                     && mInventory[i].getMaxStackSize() > 8) {
                                     mInventory[18] = mInventory[j];
                                     mInventory[j] = null;
@@ -635,7 +631,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
             if (mThroughPut < 2) {
                 getBaseMetaTileEntity().decreaseStoredEnergyUnits(
-                    GT_Utility.moveOneItemStack(
+                    GTUtility.moveOneItemStack(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity().getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()),
                         getBaseMetaTileEntity().getBackFacing(),
@@ -655,8 +651,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
         if (aStack == null) return true;
         for (byte i = 19; i < 28; i++) {
             if (mInventory[i] != null) {
-                if (GT_Utility.areStacksEqual(mInventory[i], aStack)) return true;
-                if (GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(mInventory[i], true), aStack))
+                if (GTUtility.areStacksEqual(mInventory[i], aStack)) return true;
+                if (GTUtility.areStacksEqual(GTUtility.getContainerForFilledItem(mInventory[i], true), aStack))
                     return true;
             }
         }
@@ -669,13 +665,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
             if (tRecipe[i] != null) {
                 boolean temp = false;
                 for (ItemStack itemStack : tList) {
-                    if (GT_Utility.areStacksEqual(tRecipe[i], itemStack)) {
+                    if (GTUtility.areStacksEqual(tRecipe[i], itemStack)) {
                         itemStack.stackSize++;
                         temp = true;
                         break;
                     }
                 }
-                if (!temp) tList.add(GT_Utility.copy(1, tRecipe[i]));
+                if (!temp) tList.add(GTUtility.copy(1, tRecipe[i]));
             }
         }
         return tList;
@@ -687,13 +683,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
             if (mInventory[i] != null) {
                 boolean temp = false;
                 for (byte j = 0; j < tList.size(); j++) {
-                    if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) {
+                    if (GTUtility.areStacksEqual(mInventory[i], mInventory[j])) {
                         tList.get(j).stackSize += mInventory[i].stackSize;
                         temp = true;
                         break;
                     }
                 }
-                if (!temp) tList.add(GT_Utility.copy(mInventory[i]));
+                if (!temp) tList.add(GTUtility.copy(mInventory[i]));
             }
         }
         return tList;
@@ -730,7 +726,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     public String[] getDescription() {
         return new String[] { "Automatic Crafting Table Mk III",
             // this.mDescription,
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
@@ -765,12 +761,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) };
+            new GTRenderedTexture(BlockIcons.OVERLAY_PIPE) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
@@ -779,12 +775,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     @Override
@@ -807,16 +803,16 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     .startFromSlot(9)
                     .endAtSlot(17)
                     .canInsert(false)
-                    .background(GT_UITextures.SLOT_DARK_GRAY)
+                    .background(GTUITextures.SLOT_DARK_GRAY)
                     .applyForWidget(SlotWidget::disableShiftInsert)
                     .build()
                     .setPos(7, 59))
             .widget(
                 new SlotWidget(inventoryHandler, 18).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(151, 40))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(62, 4)
                     .setSize(54, 54))
             .widget(
@@ -824,20 +820,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     .startFromSlot(19)
                     .endAtSlot(27)
                     .phantom(true)
-                    .background(GT_UITextures.TRANSPARENT)
+                    .background(GTUITextures.TRANSPARENT)
                     .build()
                     .setPos(62, 4))
             .widget(
                 SlotWidget.phantom(inventoryHandler, 28)
                     .disableInteraction()
-                    .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_ARROW_4)
                     .setPos(151, 4));
         builder.widget(
             new CycleButtonWidget().setGetter(() -> mThroughPut)
                 .setSetter(val -> mThroughPut = val)
                 .setLength(MAX_THROUGHPUT)
-                .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i])
-                .setBackground(GT_UITextures.BUTTON_STANDARD)
+                .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_THROUGHPUT[i])
+                .setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(120, 4)
                 .setSize(18, 18));
         String[] mModeText = new String[] { "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust",
@@ -848,20 +844,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                 switchMode();
             })
             .setLength(MAX_MODES)
-            .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]);
+            .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_MODE[i]);
         for (int i = 0; i < MAX_MODES; i++) {
             modeButton.addTooltip(i, "Mode: " + mModeText[i]);
         }
         builder.widget(
-            modeButton.setBackground(GT_UITextures.BUTTON_STANDARD)
+            modeButton.setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(120, 40)
                 .setSize(18, 18));
         builder.widget(
-            new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE)
+            new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_WORKBENCH_CIRCLE)
                 .setPos(136, 23)
                 .setSize(16, 16))
             .widget(
-                new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN)
+                new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_ARROW_WHITE_DOWN)
                     .setPos(155, 23)
                     .setSize(10, 16));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java
index 33dbfee6d4..08db4e19be 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
 
-import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap;
-import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap;
 
 import java.util.UUID;
 
@@ -27,16 +27,16 @@ import gregtech.api.interfaces.tileentity.IDigitalChest;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
 
-public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_BasicTank {
+public class MTETesseractGenerator extends MTEBasicTank {
 
     public static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512;
     public static int TESSERACT_ENERGY_COST = 128;
@@ -46,19 +46,18 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
     public int mFrequency = 0;
     public UUID mOwner;
 
-    public GT_MetaTileEntity_TesseractGenerator(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTETesseractGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, 3, "");
     }
 
-    public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTETesseractGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -215,12 +214,12 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
             .getFrontFacing()) {
             if (aPlayer.getUniqueID()
                 .compareTo(this.mOwner) == 0) {
-                final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+                final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
                 switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                     case 0:
                         Logger.WARNING("Freq. -1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 1;
@@ -229,7 +228,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
                     case 1:
                         Logger.WARNING("Freq. +1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 1;
@@ -238,15 +237,15 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
                         break;
                 }
                 if (getGeneratorEntity(this.mFreq