The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

5 files changed, 76 insertions, 86 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 924484e098..e11f4fae02 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.helpers;
 
-import static gregtech.api.GregTech_API.mEUtoRF;
+import static gregtech.api.GregTechAPI.mEUtoRF;
 import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.COFHCore;
 
@@ -20,26 +20,26 @@ import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem02;
+import gregtech.common.items.MetaGeneratedItem03;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 
 public class ChargingHelper {
 
-    private static final Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = new HashMap<>();
-    protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = new HashMap<>();
+    private static final Map<String, Pair<MTEWirelessCharger, Byte>> mValidPlayers = new HashMap<>();
+    protected static Map<BlockPos, MTEWirelessCharger> mChargerMap = new HashMap<>();
     private int mTickTimer = 0;
     private static final int mTickMultiplier = 20;
 
@@ -75,7 +75,7 @@ public class ChargingHelper {
                     }
                 }
 
-                for (GregtechMetaWirelessCharger mEntityTemp : mChargerMap.values()) {
+                for (MTEWirelessCharger mEntityTemp : mChargerMap.values()) {
                     if (mEntityTemp != null) {
                         if (mEntityTemp.getBaseMetaTileEntity() == null || !mEntityTemp.getBaseMetaTileEntity()
                             .isAllowedToWork()) continue;
@@ -96,11 +96,11 @@ public class ChargingHelper {
                                 if (mStartingEu - mEntityTemp.getEUVar() <= 0) {
                                     long mMaxDistance;
                                     if (mEntityTemp.getMode() == 0) {
-                                        mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()]);
+                                        mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()]);
                                     } else if (mEntityTemp.getMode() == 1) {
                                         mMaxDistance = (mEntityTemp.getTier() * 10L);
                                     } else {
-                                        mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()] / 2);
+                                        mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()] / 2);
                                     }
                                     double mDistance = calculateDistance(mEntityTemp, mPlayerMan);
                                     long mVoltageCost = MathUtils.findPercentageOfInt(mMaxDistance, (float) mDistance);
@@ -121,7 +121,7 @@ public class ChargingHelper {
         } catch (Throwable t) {
             if (!mChargerMap.isEmpty()) {
                 for (BlockPos aPos : mChargerMap.keySet()) {
-                    GregtechMetaWirelessCharger r = mChargerMap.get(aPos);
+                    MTEWirelessCharger r = mChargerMap.get(aPos);
                     if (r == null || r.getBaseMetaTileEntity()
                         .isInvalidTileEntity()) {
                         mChargerMap.remove(aPos);
@@ -131,11 +131,11 @@ public class ChargingHelper {
         }
     }
 
-    public static GregtechMetaWirelessCharger getEntry(BlockPos mPos) {
+    public static MTEWirelessCharger getEntry(BlockPos mPos) {
         return mChargerMap.get(mPos);
     }
 
-    public static boolean addEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) {
+    public static boolean addEntry(BlockPos mPos, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
@@ -143,7 +143,7 @@ public class ChargingHelper {
         return true;
     }
 
-    public static boolean removeEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) {
+    public static boolean removeEntry(BlockPos mPos, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
@@ -154,31 +154,31 @@ public class ChargingHelper {
         }
     }
 
-    public static boolean addValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) {
+    public static boolean addValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
         if (mValidPlayers.containsKey(mPlayer.getDisplayName())) {
             return false;
         } else {
-            Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
+            Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
             return mValidPlayers.put(mPlayer.getDisplayName(), mEntry) == null;
         }
     }
 
-    public static boolean removeValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) {
+    public static boolean removeValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
         if (mValidPlayers.containsKey(mPlayer.getDisplayName())) {
-            Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
+            Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
             return mValidPlayers.remove(mPlayer.getDisplayName(), mEntry);
         } else {
             return false;
         }
     }
 
-    private boolean canCharge(GregtechMetaWirelessCharger charger, EntityPlayer chargeablePlayer,
+    private boolean canCharge(MTEWirelessCharger charger, EntityPlayer chargeablePlayer,
         Map<String, UUID> longRangeChargers, Map<String, UUID> shortRangeChargers) {
         if (charger.getMode() == 0) {
             return !longRangeChargers.isEmpty() && longRangeChargers.containsKey(chargeablePlayer.getDisplayName());
@@ -192,7 +192,7 @@ public class ChargingHelper {
         }
     }
 
-    private double calculateDistance(GregtechMetaWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) {
+    private double calculateDistance(MTEWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) {
         if (mEntityTemp == null || mPlayerMan == null) {
             return 0;
         }
@@ -201,14 +201,14 @@ public class ChargingHelper {
             mEntityTemp.getPositionOfEntity(mPlayerMan));
     }
 
-    private void chargeItems(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) {
+    private void chargeItems(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) {
         if (mItems == null || mItems.length == 0) {
             return;
         }
         chargeItemsEx(mEntity, mItems);
     }
 
-    private void chargeItemsEx(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) {
+    private void chargeItemsEx(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) {
         // Bad Inventory
         if (mItems == null || mItems.length == 0) {
             return;
@@ -234,19 +234,18 @@ public class ChargingHelper {
                     }
 
                     // Try to get charge direct from NBT for GT and IC2 stacks
-                    if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_01
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_02
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_03
+                    if (mTemp.getItem() instanceof MetaGeneratedTool01 || mTemp.getItem() instanceof MetaGeneratedItem01
+                        || mTemp.getItem() instanceof MetaGeneratedItem02
+                        || mTemp.getItem() instanceof MetaGeneratedItem03
                         || mTemp.getItem()
                             .getClass()
                             .getName()
-                            .equalsIgnoreCase(GT_MetaGenerated_Tool_01.class.getName())) {
+                            .equalsIgnoreCase(MetaGeneratedTool01.class.getName())) {
                         if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")) {
                             if (!mTemp.getDisplayName()
                                 .toLowerCase()
                                 .contains("battery")) {
-                                if (!GT_ModHandler.isElectricItem(mTemp)) {
+                                if (!GTModHandler.isElectricItem(mTemp)) {
                                     continue;
                                 }
                             } else {
@@ -284,8 +283,7 @@ public class ChargingHelper {
                     int mMultiVoltage = (int) (mMulti * mVoltageIncrease);
 
                     if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge) {
-                        if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false)
-                            > 0) {
+                        if (GTModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false) > 0) {
                             for (int i = 0; i < mMulti; i++) {
                                 ElectricItem.manager.charge(mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false);
                             }
@@ -300,7 +298,7 @@ public class ChargingHelper {
                     mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp);
                     if (mitemCurrentCharge < mItemMaxCharge && mitemCurrentCharge >= (mItemMaxCharge - mVoltage)) {
                         int xDif = (int) (mItemMaxCharge - mitemCurrentCharge);
-                        if (GT_ModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) {
+                        if (GTModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) {
                             if (ElectricItem.manager.getCharge(mTemp) >= mItemMaxCharge) {
                                 mEntity.setEUVar(mEntity.getEUVar() - (xDif));
                                 mEuStored = mEntity.getEUVar();
@@ -334,7 +332,7 @@ public class ChargingHelper {
         if (itemstack == null) {
             return false;
         }
-        if (GT_ModHandler.isElectricItem(itemstack)) {
+        if (GTModHandler.isElectricItem(itemstack)) {
             return true;
         }
         return itemstack.getItem() instanceof IElectricItem;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index 8cbb473a42..773bf0127e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 
@@ -31,14 +31,14 @@ public class FlotationRecipeHandler {
     public static Material getMaterialOfMilledProduct(ItemStack aMilled) {
         for (String aKey : sMilledMap.keySet()) {
             ItemStack aTempMilledStack = sMilledMap.get(aKey);
-            if (GT_Utility.areStacksEqual(aTempMilledStack, aMilled, true)) {
+            if (GTUtility.areStacksEqual(aTempMilledStack, aMilled, true)) {
                 return sMaterialMap.get(aKey);
             }
         }
         return null;
     }
 
-    public static ItemStack findMilledStack(GT_Recipe aRecipe) {
+    public static ItemStack findMilledStack(GTRecipe aRecipe) {
         if (aRecipe == null || aRecipe.mInputs == null || aRecipe.mInputs.length <= 0) {
             return null;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java
index ced9b46c3e..357764c820 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 
-public class GT_MethodHelper {
+public class GTMethodHelper {
 
     public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, ForgeDirection side) {
         if (tTileEntity instanceof ITexturedTileEntity) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 2b0e2a7a4d..57a985f3f3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_VolumetricFlask;
+import gregtech.common.items.ItemVolumetricFlask;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class VolumetricFlaskHelper {
@@ -42,8 +42,8 @@ public class VolumetricFlaskHelper {
     public static int getMaxFlaskCapacity(ItemStack aStack) {
         if (aStack != null) {
             Item aItem = aStack.getItem();
-            if (aItem instanceof GT_VolumetricFlask) {
-                return ((GT_VolumetricFlask) aItem).getMaxCapacity();
+            if (aItem instanceof ItemVolumetricFlask) {
+                return ((ItemVolumetricFlask) aItem).getMaxCapacity();
             }
         }
         return 0;
@@ -120,6 +120,6 @@ public class VolumetricFlaskHelper {
     }
 
     public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
-        return new GT_VolumetricFlask(unlocalized, english, maxCapacity);
+        return new ItemVolumetricFlask(unlocalized, english, maxCapacity);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
index 3717f17554..03a4ace32f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.helpers.tesseract;
 
-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.HashMap;
 import java.util.Map;
@@ -12,8 +12,8 @@ import java.util.UUID;
 import net.minecraft.entity.player.EntityPlayer;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal;
 
 public class TesseractHelper {
 
@@ -25,8 +25,7 @@ public class TesseractHelper {
      */
 
     // Checks if a Generator is owned by a player.
-    public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player,
-        GT_MetaTileEntity_TesseractGenerator generator) {
+    public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) {
         if (player == null) {
             Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]");
             return false;
@@ -35,9 +34,9 @@ public class TesseractHelper {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
             // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2");
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
+            Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractGenerator> current : players) {
                 // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3");
                 if (current.getValue()
                     .equals(generator)) {
@@ -52,23 +51,22 @@ public class TesseractHelper {
 
     // Saves A Generator to the Players UUID map along with the Freq.
     public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq,
-        GT_MetaTileEntity_TesseractGenerator generator) {
+        MTETesseractGenerator generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         Logger.WARNING("Setting Generator on " + freq + " for " + player.getDisplayName() + ".");
         if (playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap
-                .get(playerIdentifier);
+            Map<Integer, MTETesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap.get(playerIdentifier);
             if (playerOwned == null || playerOwned.isEmpty()) {
-                Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<>();
+                Map<Integer, MTETesseractGenerator> newOwnershipMap = new HashMap<>();
                 newOwnershipMap.put(freq, generator);
                 sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap);
                 Logger.WARNING("Success! [Empty Map]");
                 return true;
             } else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) {
-                Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap
+                Map<Integer, MTETesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap
                     .get(playerIdentifier);
                 if (!ownershipMap.containsKey(freq)) {
                     ownershipMap.put(freq, generator);
@@ -84,7 +82,7 @@ public class TesseractHelper {
     }
 
     // Gets Generator based on Frequency.
-    public static final GT_MetaTileEntity_TesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) {
+    public static final MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) {
         if (player == null) {
             return null;
         }
@@ -92,9 +90,9 @@ public class TesseractHelper {
         Logger.WARNING("Getting Generator on " + freq + " for " + player.getDisplayName() + ".");
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
             // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1");
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
+            Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractGenerator> current : players) {
                 // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2");
                 if (current.getKey()
                     .equals(freq)) {
@@ -131,16 +129,15 @@ public class TesseractHelper {
      */
 
     // Checks if a Terminal is owned by a player.
-    public static final boolean isTerminalOwnedByPlayer(EntityPlayer player,
-        GT_MetaTileEntity_TesseractTerminal generator) {
+    public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
+            Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractTerminal> current : players) {
                 if (current.getValue()
                     .equals(generator)) {
                     return true;
@@ -152,24 +149,22 @@ public class TesseractHelper {
 
     // Saves A Terminal to the Players UUID map along with the Freq.
     public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq,
-        GT_MetaTileEntity_TesseractTerminal generator) {
+        MTETesseractTerminal generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         if (playerIdentifier != null) {
             Logger.WARNING("Setting Terminal on " + freq + " for " + player.getDisplayName() + ".");
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap
-                .get(playerIdentifier);
+            Map<Integer, MTETesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap.get(playerIdentifier);
             if (playerOwned == null || playerOwned.isEmpty()) {
-                Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<>();
+                Map<Integer, MTETesseractTerminal> newOwnershipMap = new HashMap<>();
                 newOwnershipMap.put(freq, generator);
                 sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap);
                 Logger.WARNING("Success! [Empty Map]");
                 return true;
             } else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) {
-                Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap
-                    .get(playerIdentifier);
+                Map<Integer, MTETesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap.get(playerIdentifier);
                 if (!ownershipMap.containsKey(freq)) {
                     ownershipMap.put(freq, generator);
                 }
@@ -183,16 +178,16 @@ public class TesseractHelper {
     }
 
     // Gets Terminal based on Frequency.
-    public static final GT_MetaTileEntity_TesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) {
+    public static final MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) {
         if (player == null) {
             return null;
         }
         UUID playerIdentifier = player.getUniqueID();
         Logger.WARNING("Getting Terminal on " + freq + " for " + player.getDisplayName() + ".");
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
+            Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractTerminal> current : players) {
                 if (current.getKey()
                     .equals(freq)) {
                     Logger.WARNING("Success!");
@@ -223,13 +218,11 @@ public class TesseractHelper {
      * Internal Methods
      *
      */
-    private static Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer(
-        EntityPlayer player) {
+    private static Map<Integer, MTETesseractGenerator> getGeneratorOwnershipByPlayer(EntityPlayer player) {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap
-                .entrySet();
-            for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current : players) {
+            Set<Entry<UUID, Map<Integer, MTETesseractGenerator>>> players = sTesseractGeneratorOwnershipMap.entrySet();
+            for (Entry<UUID, Map<Integer, MTETesseractGenerator>> current : players) {
                 if (current.getKey()
                     .compareTo(playerIdentifier) == 0) {
                     return current.getValue();
@@ -239,12 +232,11 @@ public class TesseractHelper {
         return null;
     }
 
-    private static Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) {
+    private static Map<Integer, MTETesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap
-                .entrySet();
-            for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current : players) {
+            Set<Entry<UUID, Map<Integer, MTETesseractTerminal>>> players = sTesseractTerminalOwnershipMap.entrySet();
+            for (Entry<UUID, Map<Integer, MTETesseractTerminal>> current : players) {
                 if (current.getKey()
                     .compareTo(playerIdentifier) == 0) {
                     return current.getValue();