1 files changed, 21 insertions, 31 deletions

diff --git a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
index 47c03743a5..b931549a07 100644
--- a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
+++ b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
@@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.common.misc.WirelessNetworkManager;
+import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
 // If you are adding very late-game content feel free to tap into this interface.
 // The eventual goal is to bypass laser/dynamo stuff and have energy deposited directly from ultra-endgame
@@ -17,37 +18,33 @@ import gregtech.common.misc.WirelessNetworkManager;
 @Deprecated
 public interface IGlobalWirelessEnergy {
 
-    // User 0 will join user 1 by calling this function. They will share the same energy network.
-    default void joinUserNetwork(String user_uuid_0, String user_uuid_1) {
-        WirelessNetworkManager.joinUserNetwork(user_uuid_0, user_uuid_1);
-    }
-
-    // Adds a user to the energy map if they do not already exist. Otherwise, do nothing. Will also check if the user
-    // has changed their username and adjust the maps accordingly. This should be called infrequently. Ideally on first
+    // Adds a user to the energy map if they do not already exist. Otherwise, do
+    // nothing. Will also check if the user
+    // has changed their username and adjust the maps accordingly. This should be
+    // called infrequently. Ideally on first
     // tick of a machine being placed only.
 
     default void strongCheckOrAddUser(EntityPlayer user) {
-        WirelessNetworkManager.strongCheckOrAddUser(
-            user.getUniqueID()
-                .toString(),
-            user.getDisplayName());
+        WirelessNetworkManager.strongCheckOrAddUser(user.getUniqueID());
     }
 
     default void strongCheckOrAddUser(UUID user_uuid, String user_name) {
-        WirelessNetworkManager.strongCheckOrAddUser(user_uuid.toString(), user_name);
+        WirelessNetworkManager.strongCheckOrAddUser(user_uuid);
     }
 
     default void strongCheckOrAddUser(String user_uuid, String user_name) {
-        WirelessNetworkManager.strongCheckOrAddUser(user_uuid, user_name);
+        WirelessNetworkManager.strongCheckOrAddUser(UUID.fromString(user_uuid));
     }
 
     // ------------------------------------------------------------------------------------
-    // Add EU to the users global energy. You can enter a negative number to subtract it.
+    // Add EU to the users global energy. You can enter a negative number to
+    // subtract it.
     // If the value goes below 0 it will return false and not perform the operation.
-    // BigIntegers have much slower operations than longs/ints. You should call these methods
+    // BigIntegers have much slower operations than longs/ints. You should call
+    // these methods
     // as infrequently as possible and bulk store values to add to the global map.
     default boolean addEUToGlobalEnergyMap(String userUUID, BigInteger EU) {
-        return WirelessNetworkManager.addEUToGlobalEnergyMap(userUUID, EU);
+        return WirelessNetworkManager.addEUToGlobalEnergyMap(UUID.fromString(userUUID), EU);
     }
 
     default boolean addEUToGlobalEnergyMap(UUID user_uuid, BigInteger EU) {
@@ -73,36 +70,29 @@ public interface IGlobalWirelessEnergy {
     // ------------------------------------------------------------------------------------
 
     default BigInteger getUserEU(String user_uuid) {
-        return WirelessNetworkManager.getUserEU(user_uuid);
+        return WirelessNetworkManager.getUserEU(UUID.fromString(user_uuid));
     }
 
-    // This overwrites the EU in the network. Only use this if you are absolutely sure you know what you are doing.
+    // This overwrites the EU in the network. Only use this if you are absolutely
+    // sure you know what you are doing.
     default void setUserEU(String user_uuid, BigInteger EU) {
-        WirelessNetworkManager.setUserEU(user_uuid, EU);
+        WirelessNetworkManager.setUserEU(UUID.fromString(user_uuid), EU);
     }
 
     default String GetUsernameFromUUID(String uuid) {
-        return WirelessNetworkManager.getUsernameFromUUID(uuid);
+        return SpaceProjectManager.getPlayerNameFromUUID(UUID.fromString(uuid));
     }
 
     default String getUUIDFromUsername(String username) {
-        return WirelessNetworkManager.getUUIDFromUsername(username);
-    }
-
-    /**
-     *
-     * @param username
-     * @return
-     */
-    default String getRawUUIDFromUsername(String username) {
-        return WirelessNetworkManager.getRawUUIDFromUsername(username);
+        return SpaceProjectManager.getPlayerUUIDFromName(username)
+            .toString();
     }
 
     static void clearGlobalEnergyInformationMaps() {
         WirelessNetworkManager.clearGlobalEnergyInformationMaps();
     }
 
-    default String processInitialSettings(final IGregTechTileEntity machine) {
+    default UUID processInitialSettings(final IGregTechTileEntity machine) {
         return WirelessNetworkManager.processInitialSettings(machine);
     }
 }