1 files changed, 34 insertions, 42 deletions
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();