From fe595d51866c8b43fb07b2d8aa3d76ffcbfbc48e Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Sun, 11 Sep 2022 01:59:07 +0100 Subject: Fix global wireless EU bugging by transferring to world NBT system (#1371) * Transfer to NBT * Half working, write only. * Fix load data * Works, thanks Kuba. * spotlessApply (#1372) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Fix NPE in unit tests * Spotless * Move clear map * Spotless and import cleanup * Suppressions and warning corrections * Warnings, warnings, warnings smh. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: kuba6000 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../globalenergymap/IGlobalWirelessEnergy_UnitTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/test/java/gregtech') diff --git a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java index 81b48bb7d6..81e0672f8e 100644 --- a/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java +++ b/src/test/java/gregtech/globalenergymap/IGlobalWirelessEnergy_UnitTest.java @@ -1,5 +1,6 @@ package gregtech.globalenergymap; +import static gregtech.common.misc.GlobalVariableStorage.*; import static org.junit.jupiter.api.Assertions.*; import gregtech.api.interfaces.IGlobalWirelessEnergy; @@ -24,7 +25,7 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { addEUToGlobalEnergyMap(test_id, 1L); assertEquals(GlobalEnergy.get(test_id), new BigInteger("3"), message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } @Test @@ -50,7 +51,7 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { assertTrue(addEUToGlobalEnergyMap(user_uuid, new BigInteger("-2"))); assertEquals(getUserEU(user_uuid), BigInteger.ZERO, message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } @Test @@ -63,7 +64,7 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { assertEquals(GlobalEnergyTeam.get(user_uuid), user_uuid, message); assertEquals(GlobalEnergyName.get(user_uuid), user_name, message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } @Test @@ -91,7 +92,7 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { assertEquals(GlobalEnergyName.get(user_uuid), user_name_0, message); assertEquals(GlobalEnergyName.get(user_name_0), user_uuid, message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } @Test @@ -147,7 +148,7 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { assertEquals(getUserEU(user_uuid_1), BigInteger.ONE, message); assertEquals(getUserEU(user_uuid_2), BigInteger.ONE, message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } @Test @@ -169,6 +170,6 @@ class IGlobalWirelessEnergy_UnitTest implements IGlobalWirelessEnergy { assertEquals(GetUsernameFromUUID(user_uuid_0), user_name_1, message); assertEquals(GetUsernameFromUUID(user_uuid_1), user_name_1, message); - clearMaps(); + IGlobalWirelessEnergy.clearGlobalEnergyInformationMaps(); } } -- cgit