Change over wireless teams to use SP teams (#2493)

* Change over wireless teams to use SP teams

* spotless

* null checks

* fix unit test being wrong

* update

* add tab autocomplete

* spotless

* make sure teams are transfered over correctly

* spotless

* do not delete space teams data when two world saves put something into it

* spotless

* go away from a stream

* make wireless networks load later

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 23 insertions, 81 deletions

diff --git a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
index 8e2b9f677e..012055133b 100644
--- a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
+++ b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
@@ -1,22 +1,21 @@
 package gregtech.globalenergymap;
 
 import static gregtech.common.misc.GlobalVariableStorage.GlobalEnergy;
-import static gregtech.common.misc.GlobalVariableStorage.GlobalEnergyName;
-import static gregtech.common.misc.GlobalVariableStorage.GlobalEnergyTeam;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static gregtech.common.misc.WirelessNetworkManager.clearGlobalEnergyInformationMaps;
 import static gregtech.common.misc.WirelessNetworkManager.getUserEU;
-import static gregtech.common.misc.WirelessNetworkManager.getUsernameFromUUID;
-import static gregtech.common.misc.WirelessNetworkManager.joinUserNetwork;
 import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigInteger;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 
+import gregtech.common.misc.spaceprojects.SpaceProjectManager;
+
 class IGlobalWirelessEnergy_UnitTest {
 
     static final String message = "Comparison failed";
@@ -24,7 +23,7 @@ class IGlobalWirelessEnergy_UnitTest {
     @Test
     void IGlobalWirelessEnergy_AddingEU() {
 
-        String test_id = "TEST_ID";
+        UUID test_id = UUID.randomUUID();
 
         addEUToGlobalEnergyMap(test_id, new BigInteger("1"));
         assertEquals(GlobalEnergy.get(test_id), new BigInteger("1"), message);
@@ -41,10 +40,9 @@ class IGlobalWirelessEnergy_UnitTest {
     @Test
     void IGlobalWirelessEnergy_NoNegativeEU() {
 
-        String user_uuid = "TEST_ID";
-        String user_user = "TEST";
+        UUID user_uuid = UUID.randomUUID();
 
-        strongCheckOrAddUser(user_uuid, user_user);
+        strongCheckOrAddUser(user_uuid);
 
         assertFalse(addEUToGlobalEnergyMap(user_uuid, new BigInteger("-1")));
         assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
@@ -66,41 +64,10 @@ class IGlobalWirelessEnergy_UnitTest {
 
     @Test
     void IGlobalWirelessEnergy_StrongCheckOrAddUser() {
-        String user_uuid = "12345";
-        String user_name = "Colen";
+        UUID user_uuid = UUID.randomUUID();
 
-        strongCheckOrAddUser(user_uuid, user_name);
+        strongCheckOrAddUser(user_uuid);
         assertEquals(GlobalEnergy.get(user_uuid), BigInteger.ZERO, message);
-        assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message);
-        assertEquals(GlobalEnergyName.get(user_uuid), user_name, message);
-
-        clearGlobalEnergyInformationMaps();
-    }
-
-    @Test
-    void IGlobalWirelessEnergy_NameChange() {
-
-        String user_uuid = "12345";
-        String user_name_0 = "Colen";
-
-        strongCheckOrAddUser(user_uuid, user_name_0);
-        assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
-        assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message);
-        assertEquals(GlobalEnergyName.get(user_uuid), user_name_0, message);
-        assertEquals(GlobalEnergyName.get(user_name_0), user_uuid, message);
-
-        String user_name_1 = "Steve";
-        strongCheckOrAddUser(user_uuid, user_name_1);
-        assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
-        assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message);
-        assertEquals(GlobalEnergyName.get(user_uuid), user_name_1, message);
-        assertEquals(GlobalEnergyName.get(user_name_1), user_uuid, message);
-
-        strongCheckOrAddUser(user_uuid, user_name_0);
-        assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
-        assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message);
-        assertEquals(GlobalEnergyName.get(user_uuid), user_name_0, message);
-        assertEquals(GlobalEnergyName.get(user_name_0), user_uuid, message);
 
         clearGlobalEnergyInformationMaps();
     }
@@ -108,28 +75,25 @@ class IGlobalWirelessEnergy_UnitTest {
     @Test
     void IGlobalWirelessEnergy_TeamChange() {
 
-        String user_uuid_0 = "12345";
-        String user_name_0 = "Colen";
+        UUID user_uuid_0 = UUID.randomUUID();
 
-        String user_uuid_1 = "54321";
-        String user_name_1 = "Steve";
+        UUID user_uuid_1 = UUID.randomUUID();
 
-        String user_uuid_2 = "12321";
-        String user_name_2 = "Sarah";
+        UUID user_uuid_2 = UUID.randomUUID();
 
-        strongCheckOrAddUser(user_uuid_0, user_name_0);
-        strongCheckOrAddUser(user_uuid_1, user_name_1);
-        strongCheckOrAddUser(user_uuid_2, user_name_2);
+        strongCheckOrAddUser(user_uuid_0);
+        strongCheckOrAddUser(user_uuid_1);
+        strongCheckOrAddUser(user_uuid_2);
 
         assertEquals(getUserEU(user_uuid_0), BigInteger.ZERO, message);
         assertEquals(getUserEU(user_uuid_1), BigInteger.ZERO, message);
         assertEquals(getUserEU(user_uuid_2), BigInteger.ZERO, message);
 
-        joinUserNetwork(user_uuid_0, user_uuid_1);
-        joinUserNetwork(user_uuid_2, user_uuid_1);
+        SpaceProjectManager.putInTeam(user_uuid_0, user_uuid_1);
+        SpaceProjectManager.putInTeam(user_uuid_2, user_uuid_1);
 
-        assertEquals(GlobalEnergyTeam.get(user_uuid_0), user_uuid_1, message);
-        assertEquals(GlobalEnergyTeam.get(user_uuid_2), user_uuid_1, message);
+        assertEquals(SpaceProjectManager.getLeader(user_uuid_0), user_uuid_1, message);
+        assertEquals(SpaceProjectManager.getLeader(user_uuid_2), user_uuid_1, message);
 
         assertTrue(addEUToGlobalEnergyMap(user_uuid_0, BigInteger.ONE));
         assertTrue(addEUToGlobalEnergyMap(user_uuid_2, BigInteger.ONE));
@@ -150,35 +114,13 @@ class IGlobalWirelessEnergy_UnitTest {
         assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message);
         assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message);
 
-        strongCheckOrAddUser(user_uuid_0, user_name_0);
-        strongCheckOrAddUser(user_uuid_1, user_name_1);
-        strongCheckOrAddUser(user_uuid_2, user_name_2);
+        SpaceProjectManager.putInTeam(user_uuid_0, user_uuid_0);
+        SpaceProjectManager.putInTeam(user_uuid_1, user_uuid_1);
+        SpaceProjectManager.putInTeam(user_uuid_2, user_uuid_2);
 
-        assertEquals(getUserEU(user_uuid_0), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.ZERO, message);
         assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message);
-        assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message);
-
-        clearGlobalEnergyInformationMaps();
-    }
-
-    @Test
-    void IGlobalWirelessEnergy_UUID() {
-        String user_uuid_0 = "12345";
-        String user_name_0 = "Colen";
-
-        String user_uuid_1 = "54321";
-        String user_name_1 = "Steve";
-
-        strongCheckOrAddUser(user_uuid_0, user_name_0);
-        strongCheckOrAddUser(user_uuid_1, user_name_1);
-
-        assertEquals(getUsernameFromUUID(user_uuid_0), user_name_0, message);
-        assertEquals(getUsernameFromUUID(user_uuid_1), user_name_1, message);
-
-        joinUserNetwork(user_uuid_0, user_uuid_1);
-
-        assertEquals(getUsernameFromUUID(user_uuid_0), user_name_1, message);
-        assertEquals(getUsernameFromUUID(user_uuid_1), user_name_1, message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.ZERO, message);
 
         clearGlobalEnergyInformationMaps();
     }