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>

8 files changed, 235 insertions, 161 deletions

diff --git a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
index 3ba59a54a2..a4b3129bc3 100644
--- a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
+++ b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java
@@ -42,23 +42,23 @@ public interface IGlobalWirelessEnergy {
     String GlobalEnergyTeamFileName = "GlobalEnergyTeamMap";
 
     // 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) {
+    default void joinUserNetwork(String user_uuid_0, String user_uuid_1) {
         GlobalEnergyTeam.put(user_uuid_0, user_uuid_1);
     }
 
     // --- Save data for global energy network --
 
-    default void SaveGlobalEnergyInfo(String world_name) {
+    default void saveGlobalEnergyInfo(String world_name) {
         // Replace chars because of bug in forge that doesn't understand MC converts . to _ upon world creation.
         world_name = world_name.replace('.','_');
-        CreateStorageIfNotExist(world_name);
-        SaveGlobalEnergyMap(world_name);
-        SaveGlobalEnergyName(world_name);
-        SaveGlobalEnergyTeam(world_name);
+        createStorageIfNotExist(world_name);
+        saveGlobalEnergyMap(world_name);
+        saveGlobalEnergyName(world_name);
+        saveGlobalEnergyTeam(world_name);
 
     }
 
-    default void SaveGlobalEnergyMap(String world_name) {
+    default void saveGlobalEnergyMap(String world_name) {
         try {
             List<String> lines = GlobalEnergy.entrySet()
                 .stream()
@@ -73,7 +73,7 @@ public interface IGlobalWirelessEnergy {
         }
     }
 
-    default void SaveGlobalEnergyName(String world_name) {
+    default void saveGlobalEnergyName(String world_name) {
         try {
             List<String> lines = GlobalEnergyName.entrySet()
                 .stream()
@@ -88,7 +88,7 @@ public interface IGlobalWirelessEnergy {
         }
     }
 
-    default void SaveGlobalEnergyTeam(String world_name) {
+    default void saveGlobalEnergyTeam(String world_name) {
         try {
             List<String> lines = GlobalEnergyTeam.entrySet()
                 .stream()
@@ -105,17 +105,17 @@ public interface IGlobalWirelessEnergy {
 
     // --- Load data for global energy network ---
 
-    default void LoadGlobalEnergyInfo(World world) {
+    default void loadGlobalEnergyInfo(World world) {
         // Replace chars because of bug in forge that doesn't understand MC converts . to _ upon world creation.
         String world_name = world.getWorldInfo().getWorldName().replace('.','_');
         PrivateGlobalEnergy.WorldName = world_name;
-        CreateStorageIfNotExist(world_name);
-        LoadGlobalEnergyMap(world);
-        LoadGlobalEnergyName(world);
+        createStorageIfNotExist(world_name);
+        loadGlobalEnergyMap(world);
+        loadGlobalEnergyName(world);
         LoadGlobalEnergyTeam(world);
     }
 
-    default void LoadGlobalEnergyMap(World world) {
+    default void loadGlobalEnergyMap(World world) {
         try {
             Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyMapFileName + ".txt").toAbsolutePath();
 
@@ -133,7 +133,7 @@ public interface IGlobalWirelessEnergy {
         }
     }
 
-    default void LoadGlobalEnergyName(World world) {
+    default void loadGlobalEnergyName(World world) {
         try {
             Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/"
                 + GlobalEnergyFolderName + "/" + GlobalEnergyNameFileName + ".txt").toAbsolutePath();
@@ -167,7 +167,7 @@ public interface IGlobalWirelessEnergy {
 
     // ------------------
 
-    default void CreateStorageIfNotExist(String world_name) {
+    default void createStorageIfNotExist(String world_name) {
         Path folder_path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName).toAbsolutePath();
 
         // Create folder for storing global energy network info.
@@ -195,15 +195,15 @@ public interface IGlobalWirelessEnergy {
     // 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) {
-        StrongCheckOrAddUser(user.getUniqueID().toString(), user.getDisplayName());
+    default void strongCheckOrAddUser(EntityPlayer user) {
+        strongCheckOrAddUser(user.getUniqueID().toString(), user.getDisplayName());
     }
 
-    default void StrongCheckOrAddUser(UUID user_uuid, String user_name) {
-        StrongCheckOrAddUser(user_uuid.toString(), user_name);
+    default void strongCheckOrAddUser(UUID user_uuid, String user_name) {
+        strongCheckOrAddUser(user_uuid.toString(), user_name);
     }
 
-    default void StrongCheckOrAddUser(String user_uuid, String user_name) {
+    default void strongCheckOrAddUser(String user_uuid, String user_name) {
 
         // Check if the user has a team. Add them if not.
         GlobalEnergyTeam.putIfAbsent(user_uuid, user_uuid);
@@ -233,7 +233,7 @@ public interface IGlobalWirelessEnergy {
         PrivateGlobalEnergy.EnergyAdds += 1;
 
         if (PrivateGlobalEnergy.EnergyAddsBeforeSaving >= PrivateGlobalEnergy.EnergyAdds) {
-            SaveGlobalEnergyInfo(PrivateGlobalEnergy.WorldName);
+            saveGlobalEnergyInfo(PrivateGlobalEnergy.WorldName);
             PrivateGlobalEnergy.EnergyAdds = 0;
         }
 
@@ -276,12 +276,12 @@ public interface IGlobalWirelessEnergy {
 
     // ------------------------------------------------------------------------------------
 
-    default BigInteger GetUserEU(String user_uuid) {
+    default BigInteger getUserEU(String user_uuid) {
         return GlobalEnergy.getOrDefault(GlobalEnergyTeam.getOrDefault(user_uuid, user_uuid), BigInteger.ZERO);
     }
 
     // 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) {
+    default void setUserEU(String user_uuid, BigInteger EU) {
         GlobalEnergy.put(GlobalEnergyTeam.get(user_uuid), EU);
     }
 
@@ -289,11 +289,11 @@ public interface IGlobalWirelessEnergy {
         return GlobalEnergyName.getOrDefault(GlobalEnergyTeam.getOrDefault(uuid, ""), "");
     }
 
-    default String GetUUIDFromUsername(String username) {
+    default String getUUIDFromUsername(String username) {
         return GlobalEnergyTeam.getOrDefault(GlobalEnergyName.getOrDefault(username, ""), "");
     }
 
-    default void ClearMaps() {
+    default void clearMaps() {
         // Do not use this unless you are 100% certain you know what you are doing.
         GlobalEnergy.clear();
         GlobalEnergyName.clear();
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IWirelessEnergyHatchInformation.java b/src/main/java/gregtech/api/interfaces/tileentity/IWirelessEnergyHatchInformation.java
new file mode 100644
index 0000000000..fb6492d894
--- /dev/null
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IWirelessEnergyHatchInformation.java
@@ -0,0 +1,19 @@
+package gregtech.api.interfaces.tileentity;
+
+import static gregtech.api.enums.GT_Values.V;
+
+public interface IWirelessEnergyHatchInformation {
+
+    // This interface is solely for usage by wireless hatches/dynamos.
+
+    // Ticks between energy additions to the hatch. For a dynamo this is how many ticks between energy being consumed
+    // and added to the global energy map.
+    long ticks_between_energy_addition = 100L * 20L;
+
+    // Total number of energy additions this multi can store before it is full.
+    long number_of_energy_additions = 4L;
+
+    default long totalStorage(long tier_eu_per_tick) {
+        return tier_eu_per_tick * ticks_between_energy_addition * number_of_energy_additions;
+    }
+}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java
index 7f59b13669..bfc9b2118e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java
@@ -4,21 +4,18 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IGlobalWirelessEnergy;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import java.math.BigInteger;
 
 import static gregtech.GT_Mod.gregtechproxy;
 import static gregtech.api.enums.GT_Values.*;
 
-public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_Dynamo implements IGlobalWirelessEnergy {
+public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_Dynamo implements IGlobalWirelessEnergy, IWirelessEnergyHatchInformation {
 
-    private static final long ticks_between_energy_addition = 100L*20L;
-    private static final long number_of_energy_additions = 2L;
-    private final BigInteger eu_transferred_per_operation = BigInteger.valueOf(2L * V[mTier] * ticks_between_energy_addition);
     private String owner_uuid;
     private String owner_name;
 
@@ -82,16 +79,14 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D
 
     @Override
     public long maxEUStore() {
-        return V[mTier] * number_of_energy_additions * ticks_between_energy_addition;
+        return totalStorage(V[mTier]);
     }
 
     @Override
     public String[] getDescription() {
-        String uuid = gregtechproxy.getThePlayer().getUniqueID().toString();
         return new String[] {
-//            "Transmits " + EnumChatFormatting.RED + GT_Utility.formatNumbers(eu_transferred_per_operation/V[mTier]) + EnumChatFormatting.GRAY + " A of " + TIER_COLORS[mTier] + VN[mTier] + EnumChatFormatting.GRAY + " through trans-dimensional space every " + EnumChatFormatting.RED + GT_Utility.formatNumbers(ticks_between_energy_addition) + EnumChatFormatting.GRAY + " ticks.",
-            EnumChatFormatting.GRAY + "Does not connect to wires.",
-            EnumChatFormatting.GRAY + "There is currently " + EnumChatFormatting.RED + GT_Utility.formatNumbers(GlobalEnergy.getOrDefault(uuid, BigInteger.ZERO)) + EnumChatFormatting.GRAY + " EU in your network.",
+            EnumChatFormatting.GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.",
+            EnumChatFormatting.GRAY + "Does not connect to wires. This block accepts EU into the network.",
             AuthorColen
         };
     }
@@ -131,15 +126,15 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D
 
                 // Attempt to load in map from file.
                 if (GlobalEnergy.size() == 0)
-                    IGlobalWirelessEnergy.super.LoadGlobalEnergyInfo(aBaseMetaTileEntity.getWorld());
+                    loadGlobalEnergyInfo(aBaseMetaTileEntity.getWorld());
 
-                IGlobalWirelessEnergy.super.StrongCheckOrAddUser(owner_uuid, owner_name);
+                strongCheckOrAddUser(owner_uuid, owner_name);
 
             }
 
             // Every ticks_between_energy_addition ticks change the energy content of the machine.
             if (aTick % ticks_between_energy_addition == 0L) {
-                IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(owner_uuid, getEUVar());
+                addEUToGlobalEnergyMap(owner_uuid, getEUVar());
                 setEUVar(0L);
             }
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java
index cd999fce4e..84e6ed7e51 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java
@@ -4,6 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IGlobalWirelessEnergy;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,16 +16,14 @@ import java.math.BigInteger;
 import static gregtech.GT_Mod.gregtechproxy;
 import static gregtech.api.enums.GT_Values.*;
 
-public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy implements IGlobalWirelessEnergy {
+public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy implements IGlobalWirelessEnergy, IWirelessEnergyHatchInformation {
+
+    private final BigInteger eu_transferred_per_operation = BigInteger.valueOf(V[mTier] * ticks_between_energy_addition);
+    private final long eu_transferred_per_operation_long = eu_transferred_per_operation.longValue();
 
-    private static final long ticks_between_energy_addition = 100L*20L;
-    private static final long number_of_energy_additions = 2L;
-    private final BigInteger eu_transferred_per_operation = BigInteger.valueOf(2L * V[mTier] * ticks_between_energy_addition);
-    private final long eu_transferred_per_operation_long = eu_transferred_per_operation.longValueExact();
     private String owner_uuid;
     private String owner_name;
 
-
     public GT_MetaTileEntity_Wireless_Hatch(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
@@ -35,11 +34,9 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     @Override
     public String[] getDescription() {
-        String uuid = gregtechproxy.getThePlayer().getUniqueID().toString();
         return new String[] {
-//            "Receives " + EnumChatFormatting.RED + GT_Utility.formatNumbers(eu_transferred_per_operation.divide(BigInteger.valueOf(V[mTier]))) + EnumChatFormatting.GRAY + " A of " + TIER_COLORS[mTier] + VN[mTier] + EnumChatFormatting.GRAY + " through trans-dimensional space every " + EnumChatFormatting.RED + GT_Utility.formatNumbers(ticks_between_energy_addition) + EnumChatFormatting.GRAY + " ticks.",
-            EnumChatFormatting.GRAY + "Does not connect to wires.",
-            EnumChatFormatting.GRAY + "There is currently " + EnumChatFormatting.RED + GT_Utility.formatNumbers(IGlobalWirelessEnergy.super.GetUserEU(uuid)) + EnumChatFormatting.GRAY + " EU in your network.",
+            EnumChatFormatting.GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.",
+            EnumChatFormatting.GRAY + "Does not connect to wires. This block withdraws EU from the network.",
             AuthorColen
         };
     }
@@ -96,11 +93,9 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     @Override
     public long maxEUStore() {
-        return V[mTier] * number_of_energy_additions * ticks_between_energy_addition;
+        return totalStorage(V[mTier]);
     }
 
-    public long getEUCapacity() { return 40000L; }
-
     @Override
     public long maxAmperesIn() {
         return 2;
@@ -137,11 +132,11 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
                 // Attempt to load in map from file.
                 if (GlobalEnergy.size() == 0)
-                    IGlobalWirelessEnergy.super.LoadGlobalEnergyInfo(aBaseMetaTileEntity.getWorld());
+                    loadGlobalEnergyInfo(aBaseMetaTileEntity.getWorld());
 
-                IGlobalWirelessEnergy.super.StrongCheckOrAddUser(owner_uuid, owner_name);
+                strongCheckOrAddUser(owner_uuid, owner_name);
 
-                if (IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(owner_uuid, eu_transferred_per_operation.negate()))
+                if (addEUToGlobalEnergyMap(owner_uuid, eu_transferred_per_operation.negate()))
                     setEUVar(eu_transferred_per_operation_long);
             }
 
@@ -153,11 +148,12 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
                 long total_eu = this.getBaseMetaTileEntity().getStoredEU();
 
                 // Can the machine store the EU being added?
-                if (total_eu + eu_transferred_per_operation_long <= maxEUStore()) {
+                long new_eu_storage = total_eu + eu_transferred_per_operation_long;
+                if (new_eu_storage <= maxEUStore()) {
 
                     // Attempt to remove energy from the network and add it to the internal buffer of the machine.
-                    if (IGlobalWirelessEnergy.super.addEUToGlobalEnergyMap(owner_uuid, eu_transferred_per_operation.negate())) {
-                        setEUVar(total_eu + eu_transferred_per_operation_long);
+                    if (addEUToGlobalEnergyMap(owner_uuid, eu_transferred_per_operation.negate())) {
+                        setEUVar(new_eu_storage);
                     }
                 }
             }
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index bc5b5f3fb1..af70a836d9 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -909,8 +909,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
     public void onServerStopping() {
         File tSaveDirectory = getSaveDirectory();
         GregTech_API.sWirelessRedstone.clear();
-        IGlobalWirelessEnergy.super.SaveGlobalEnergyInfo(mUniverse.getWorldInfo().getWorldName());
-        IGlobalWirelessEnergy.super.ClearMaps();
+        saveGlobalEnergyInfo(mUniverse.getWorldInfo().getWorldName());
+        clearMaps();
         if (tSaveDirectory != null) {
             try {
                 for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index d60bef3ff0..1e3402618a 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -279,27 +279,27 @@ public class GT_MetaGenerated_Item_03
         OreDictionary.registerOre("UHV", ItemList.Circuit_ExoticProcessor.get(1));
         ItemList.Circuit_ExoticAssembly.set(addItem(tLastID = 167, "Exotic Assembly", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UEV", ItemList.Circuit_ExoticAssembly.get(1));
-        ItemList.Circuit_ExoticComputer.set(addItem(tLastID = 168, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_ExoticComputer.set(addItem(tLastID = 168, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UIV", ItemList.Circuit_ExoticComputer.get(1));
         ItemList.Circuit_ExoticMainframe.set(addItem(tLastID = 169, "Exotic Mainframe", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UMV", ItemList.Circuit_ExoticMainframe.get(1));
 
         // Cosmic circuits
-        ItemList.Circuit_CosmicProcessor.set(addItem(tLastID = 170, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_CosmicProcessor.set(addItem(tLastID = 170, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UEV", ItemList.Circuit_CosmicProcessor.get(1));
-        ItemList.Circuit_CosmicAssembly.set(addItem(tLastID = 171, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_CosmicAssembly.set(addItem(tLastID = 171, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UIV", ItemList.Circuit_CosmicAssembly.get(1));
-        ItemList.Circuit_CosmicComputer.set(addItem(tLastID = 172, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_CosmicComputer.set(addItem(tLastID = 172, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UMV", ItemList.Circuit_CosmicComputer.get(1));
         ItemList.Circuit_CosmicMainframe.set(addItem(tLastID = 173, "Cosmic Mainframe", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UXV", ItemList.Circuit_CosmicMainframe.get(1));
 
         // Transcendent circuits
-        ItemList.Circuit_TranscendentProcessor.set(addItem(tLastID = 174, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_TranscendentProcessor.set(addItem(tLastID = 174, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UIV", ItemList.Circuit_TranscendentProcessor.get(1));
-        ItemList.Circuit_TranscendentAssembly.set(addItem(tLastID = 175, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_TranscendentAssembly.set(addItem(tLastID = 175, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UMV", ItemList.Circuit_TranscendentAssembly.get(1));
-        ItemList.Circuit_TranscendentComputer.set(addItem(tLastID = 176, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION));
+        ItemList.Circuit_TranscendentComputer.set(addItem(tLastID = 176, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("UXV", ItemList.Circuit_TranscendentComputer.get(1));
         ItemList.Circuit_TranscendentMainframe.set(addItem(tLastID = 177, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION));
         OreDictionary.registerOre("MAX", ItemList.Circuit_TranscendentMainframe.get(1));
diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java
index c478d219c7..29fd7a0226 100644
--- a/src/main/java/gregtech/common/misc/GT_Command.java
+++ b/src/main/java/gregtech/common/misc/GT_Command.java
@@ -52,11 +52,14 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner
         ));
         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + " --- Global wireless EU controls ---"));
         sender.addChatMessage(new ChatComponentText("Allows you to set the amount of EU in a users wireless network."));
-        sender.addChatMessage(new ChatComponentText("Usage: global_energy_set [Name] [EU]"));
+        sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_set " + EnumChatFormatting.BLUE + "[Name] " + EnumChatFormatting.LIGHT_PURPLE + "[EU]"));
         sender.addChatMessage(new ChatComponentText("Allows you to add EU to a users wireless network. Also accepts negative numbers."));
-        sender.addChatMessage(new ChatComponentText("Usage: global_energy_add [Name] [EU]"));
+        sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_add " + EnumChatFormatting.BLUE + "[Name] " + EnumChatFormatting.LIGHT_PURPLE + "[EU]"));
         sender.addChatMessage(new ChatComponentText("Allows you to join two users together into one network. Can be undone by writing the users name twice."));
-        sender.addChatMessage(new ChatComponentText("Usage: global_energy_join [User joining] [User to join]"));
+        sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_join " + EnumChatFormatting.BLUE + "[User joining] [User to join]"));
+        sender.addChatMessage(new ChatComponentText("Shows the amount of EU in a users energy network."));
+        sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_display " + EnumChatFormatting.BLUE + "[Name]"));
+
     }
 
     @Override
@@ -83,10 +86,6 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner
             printHelp(sender);
             return;
         }
-
-        String username;
-        String uuid;
-
         switch (strings[0]) {
             case "toggle":
                 if (strings.length < 2) {
@@ -127,73 +126,138 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner
                     amount
                 );
                 break;
-            case "global_energy_add":
-
-                username = strings[1];
-                uuid = IGlobalWirelessEnergy.super.GetUUIDFromUsername(username);
+            case "global_energy_add": {
+                String username = strings[1];
+                String formatted_username = EnumChatFormatting.BLUE + username + EnumChatFormatting.RESET;
+                String uuid = getUUIDFromUsername(username);
 
                 String EU_String = strings[2];
 
                 // Usage is /gt global_energy_add username EU
 
                 if (uuid.equals("")) {
-                    sender.addChatMessage(new ChatComponentText("User " + username + " has no global energy network."));
+                    sender.addChatMessage(new ChatComponentText("User " + formatted_username + " has no global energy network."));
                     break;
                 }
 
+                String EU_string_formatted = EnumChatFormatting.RED + GT_Utility.formatNumbers(new BigInteger(EU_String)) + EnumChatFormatting.RESET;
+
                 if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String)))
-                    sender.addChatMessage(new ChatComponentText("Successfully added " + EU_String + "EU to the global energy network of " + username + "."));
+                    sender.addChatMessage(new ChatComponentText("Successfully added "
+                        + EU_string_formatted + "EU to the global energy network of " + formatted_username + "."));
                 else
-                    sender.addChatMessage(new ChatComponentText("Failed to add " + EU_String + "EU to the global energy map of " + username +
-                        ". Insufficient energy in network. " + username + "currently has " + IGlobalWirelessEnergy.super.GetUserEU(uuid).toString() + " in their network."));
+                    sender.addChatMessage(new ChatComponentText(
+                        "Failed to add " + EU_string_formatted + "EU to the global energy map of " +
+                            formatted_username + ". Insufficient energy in network. "));
+
+                sender.addChatMessage(new ChatComponentText(formatted_username + " currently has " + EnumChatFormatting.RED +
+                    GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString())) + EnumChatFormatting.RESET +
+                    "EU in their network."));
 
                 break;
-            case "global_energy_set":
+            }
+            case "global_energy_set": {
 
                 // Usage is /gt global_energy_set username EU
 
-                username = strings[1];
-                uuid = IGlobalWirelessEnergy.super.GetUUIDFromUsername(username);
+                String username = strings[1];
+                String formatted_username = EnumChatFormatting.BLUE + username + EnumChatFormatting.RESET;
+                String uuid = getUUIDFromUsername(username);
+
+                if (uuid.equals("")) {
+                    sender.addChatMessage(new ChatComponentText(
+                        "User " + formatted_username + " has no global energy network."));
+                    break;
+                }
 
                 String EU_String_0 = strings[2];
 
-                IGlobalWirelessEnergy.super.SetUserEU(uuid, new BigInteger(EU_String_0));
-                break;
+                if ((new BigInteger(EU_String_0).compareTo(BigInteger.ZERO)) < 0) {
+                    sender.addChatMessage(new ChatComponentText("Cannot set a users energy network to a negative value."));
+                    break;
+                }
+
+                setUserEU(uuid, new BigInteger(EU_String_0));
 
-            case "global_energy_join":
+                sender.addChatMessage(new ChatComponentText(
+                    "Successfully set " + formatted_username + "'s global energy network to " + EnumChatFormatting.RED +
+                        GT_Utility.formatNumbers(new BigInteger(EU_String_0)) + EnumChatFormatting.RESET + "EU.")
+                );
+
+                break;
+            }
+            case "global_energy_join": {
 
                 // Usage is /gt global_energy_join username_of_you username_to_join
 
                 String username_0 = strings[1];
                 String username_1 = strings[2];
 
-                String uuid_0 = IGlobalWirelessEnergy.super.GetUUIDFromUsername(username_0);
-                String uuid_1 = IGlobalWirelessEnergy.super.GetUUIDFromUsername(username_1);
+                String formatted_username_0 = EnumChatFormatting.BLUE + username_0 + EnumChatFormatting.RESET;
+                String formatted_username_1 = EnumChatFormatting.BLUE + username_1 + EnumChatFormatting.RESET;
 
-                if (uuid_0.equals("")) {
-                    sender.addChatMessage(new ChatComponentText("User " + username_0 + " has no global energy network."));
+                String uuid_0 = getUUIDFromUsername(username_0);
+                String uuid_1 = getUUIDFromUsername(username_1);
+
+                if (uuid_1.equals("") && uuid_0.equals("")) {
+                    if (username_0.equals(username_1)) {
+                        sender.addChatMessage(new ChatComponentText(
+                            "User " + formatted_username_0 + " has no global energy network."));
+                    } else {
+                        sender.addChatMessage(new ChatComponentText(
+                            "User " + formatted_username_0 + " and " + formatted_username_1 +
+                                " have no global energy networks."));
+                    }
                     break;
                 }
 
                 if (uuid_0.equals("")) {
-                    sender.addChatMessage(new ChatComponentText("User " + username_1 + " has no global energy network."));
+                    sender.addChatMessage(new ChatComponentText(
+                        "User " + formatted_username_0 + " has no global energy network."));
                     break;
                 }
 
-                IGlobalWirelessEnergy.super.JoinUserNetwork(uuid_0, uuid_1);
+                if (uuid_1.equals("")) {
+                    sender.addChatMessage(new ChatComponentText(
+                        "User " + formatted_username_1 + " has no global energy network."));
+                    break;
+                }
 
-                sender.addChatMessage(new ChatComponentText("Success! " + username_0 + " has joined " + username_1 + "."));
-                sender.addChatMessage(new ChatComponentText("To undo this simply join your own network again with /gt global_energy_join " + username_0 + " " + username_0 + "."));
+                if (uuid_0.equals(uuid_1)) {
+                    joinUserNetwork(uuid_0, uuid_1);
+                    sender.addChatMessage(new ChatComponentText("User " + formatted_username_0 +
+                        " has rejoined their own global energy network."));
+                    break;
+                }
+
+                joinUserNetwork(uuid_0, uuid_1);
+
+                sender.addChatMessage(new ChatComponentText("Success! " + formatted_username_0 + " has joined " + formatted_username_1 + "."));
+                sender.addChatMessage(new ChatComponentText("To undo this simply join your own network again with /gt global_energy_join " + formatted_username_0 + " " + formatted_username_0 + "."));
 
                 break;
-            case "global_energy_display":
+            }
+            case "global_energy_display": {
+
+                // Usage is /gt global_energy_display username.
+
+                String username = strings[1];
+                String formatted_username = EnumChatFormatting.BLUE + username + EnumChatFormatting.RESET;
+                String uuid = getUUIDFromUsername(username);
 
-                // Usage is /gt global_energy_display username
+                if (uuid.equals("")) {
+                    sender.addChatMessage(new ChatComponentText(
+                        "User " + formatted_username + " has no global energy network."));
+                    break;
+                }
 
-                String username_3 = strings[1];
-                sender.addChatMessage(new ChatComponentText("User " + username_3 + " has " + EnumChatFormatting.RED + GT_Utility.formatNumbers(IGlobalWirelessEnergy.super.GetUserEU(IGlobalWirelessEnergy.super.GetUUIDFromUsername(username_3))) + EnumChatFormatting.RESET + "EU in their network."));
+                sender.addChatMessage(new ChatComponentText(
+                    "User " + formatted_username + " has "
+                    + EnumChatFormatting.RED + GT_Utility.formatNumbers(getUserEU(uuid)) + EnumChatFormatting.RESET
+                        + "EU in their network."));
 
                 break;
+            }
             default:
                 sender.addChatMessage(new ChatComponentText( EnumChatFormatting.RED + "Invalid command/syntax detected."));
                 printHelp(sender);
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();
     }
 }