More wireless fixes/updates (#1206)

* Fix possible out-of-bounds error.

* Bye bye OpV

* Bye bye OpV

* Some textures while I'm here

* Test

* Maybe

* New command

* Fix forge minecraft shenanigans interfering with saving data.

* Localisation of achievements

* Add save intervals for energy map.

* Refactor as to not use dumb bloat

* New interface for wireless hatches

* Remove prefix

* Big refactor and code cleanup. Also fixes bug with energy not getting added sometimes

* Fix typo causing ore dict issues

* New interface

* Clean up commands a little

* Add some colouring and clean up a little.

* Update desc

* Add more catches for command misuse and colours

* Jenkins

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>

1 files changed, 61 insertions, 61 deletions

diff --git a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
index d5a986a4f5..61b7fa758c 100644
--- a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
+++ b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java
@@ -16,16 +16,16 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
 
         String test_id = "TEST_ID";
 
-        IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(test_id, new BigInteger("1"));
+        addEUToGlobalEnergyMap(test_id, new BigInteger("1"));
         assertEquals(GlobalEnergy.get(test_id), new BigInteger("1"), message);
 
-        IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(test_id, 1);
+        addEUToGlobalEnergyMap(test_id, 1);
         assertEquals(GlobalEnergy.get(test_id), new BigInteger("2"), message);
 
-        IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(test_id, 1L);
+        addEUToGlobalEnergyMap(test_id, 1L);
         assertEquals(GlobalEnergy.get(test_id), new BigInteger("3"), message);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 
     @Test
@@ -34,24 +34,24 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
         String user_uuid = "TEST_ID";
         String user_user = "TEST";
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid, user_user);
+        strongCheckOrAddUser(user_uuid, user_user);
 
-        assertFalse(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid, new BigInteger("-1")));
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ZERO, message);
+        assertFalse(addEUToGlobalEnergyMap(user_uuid, new BigInteger("-1")));
+        assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
 
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid, new BigInteger("1")));
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ONE, message);
+        assertTrue(addEUToGlobalEnergyMap(user_uuid, new BigInteger("1")));
+        assertEquals(getUserEU(user_uuid), BigInteger.ONE, message);
 
-        assertFalse(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid, new BigInteger("-2")));
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ONE, message);
+        assertFalse(addEUToGlobalEnergyMap(user_uuid, new BigInteger("-2")));
+        assertEquals(getUserEU(user_uuid), BigInteger.ONE, message);
 
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid, new BigInteger("1")));
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.valueOf(2L), message);
+        assertTrue(addEUToGlobalEnergyMap(user_uuid, new BigInteger("1")));
+        assertEquals(getUserEU(user_uuid), BigInteger.valueOf(2L), message);
 
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid, new BigInteger("-2")));
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ZERO, message);
+        assertTrue(addEUToGlobalEnergyMap(user_uuid, new BigInteger("-2")));
+        assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 
     @Test
@@ -59,12 +59,12 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
         String user_uuid = "12345";
         String user_name = "Colen";
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid, user_name);
+        strongCheckOrAddUser(user_uuid, user_name);
         assertEquals(GlobalEnergy.get(user_uuid), BigInteger.ZERO, message);
         assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message);
         assertEquals(GlobalEnergyName.get(user_uuid), user_name, message);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 
     @Test
@@ -74,26 +74,26 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
         String user_uuid = "12345";
         String user_name_0 = "Colen";
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid, user_name_0);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ZERO, 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);
 
         String user_name_1 = "Steve";
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid, user_name_1);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ZERO, message);
+        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);
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid, user_name_0);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid), BigInteger.ZERO, 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);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 
     @Test
@@ -108,48 +108,48 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
         String user_uuid_2 = "12321";
         String user_name_2 = "Sarah";
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_0, user_name_0);
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_1, user_name_1);
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_2, user_name_2);
+        strongCheckOrAddUser(user_uuid_0, user_name_0);
+        strongCheckOrAddUser(user_uuid_1, user_name_1);
+        strongCheckOrAddUser(user_uuid_2, user_name_2);
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_0), BigInteger.ZERO, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_1), BigInteger.ZERO, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_2), BigInteger.ZERO, message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.ZERO, message);
+        assertEquals(getUserEU(user_uuid_1), BigInteger.ZERO, message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.ZERO, message);
 
-        IGlobalWirelessEnergy.super.JoinUserNetwork(user_uuid_0, user_uuid_1);
-        IGlobalWirelessEnergy.super.JoinUserNetwork(user_uuid_2, user_uuid_1);
+        joinUserNetwork(user_uuid_0, user_uuid_1);
+        joinUserNetwork(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);
 
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid_0, BigInteger.ONE));
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid_2, BigInteger.ONE));
+        assertTrue(addEUToGlobalEnergyMap(user_uuid_0, BigInteger.ONE));
+        assertTrue(addEUToGlobalEnergyMap(user_uuid_2, BigInteger.ONE));
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_0), BigInteger.valueOf(2L), message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_1), BigInteger.valueOf(2L), message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_2), BigInteger.valueOf(2L), message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.valueOf(2L), message);
+        assertEquals(getUserEU(user_uuid_1), BigInteger.valueOf(2L), message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.valueOf(2L), message);
 
-        assertTrue(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid_0, BigInteger.valueOf(-1L)));
+        assertTrue(addEUToGlobalEnergyMap(user_uuid_0, BigInteger.valueOf(-1L)));
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_0), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_1), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_2), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message);
 
-        assertFalse(IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(user_uuid_0, BigInteger.valueOf(-2L)));
+        assertFalse(addEUToGlobalEnergyMap(user_uuid_0, BigInteger.valueOf(-2L)));
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_0), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_1), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_2), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message);
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_0, user_name_0);
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_1, user_name_1);
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_2, user_name_2);
+        strongCheckOrAddUser(user_uuid_0, user_name_0);
+        strongCheckOrAddUser(user_uuid_1, user_name_1);
+        strongCheckOrAddUser(user_uuid_2, user_name_2);
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_0), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_1), BigInteger.ONE, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUserEU(user_uuid_2), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_0), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message);
+        assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 
     @Test
@@ -160,17 +160,17 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy {
         String user_uuid_1 = "54321";
         String user_name_1 = "Steve";
 
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_0, user_name_0);
-        IGlobalWirelessEnergy.super.StrongCheckOrAddUser(user_uuid_1, user_name_1);
+        strongCheckOrAddUser(user_uuid_0, user_name_0);
+        strongCheckOrAddUser(user_uuid_1, user_name_1);
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUsernameFromUUID(user_uuid_0), user_name_0, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUsernameFromUUID(user_uuid_1), user_name_1, message);
+        assertEquals(GetUsernameFromUUID(user_uuid_0), user_name_0, message);
+        assertEquals(GetUsernameFromUUID(user_uuid_1), user_name_1, message);
 
-        IGlobalWirelessEnergy.super.JoinUserNetwork(user_uuid_0, user_uuid_1);
+        joinUserNetwork(user_uuid_0, user_uuid_1);
 
-        assertEquals(IGlobalWirelessEnergy.super.GetUsernameFromUUID(user_uuid_0), user_name_1, message);
-        assertEquals(IGlobalWirelessEnergy.super.GetUsernameFromUUID(user_uuid_1), user_name_1, message);
+        assertEquals(GetUsernameFromUUID(user_uuid_0), user_name_1, message);
+        assertEquals(GetUsernameFromUUID(user_uuid_1), user_name_1, message);
 
-        IGlobalWirelessEnergy.super.ClearMaps();
+        clearMaps();
     }
 }