Fix bug on initialisation that economy section could be reset in some environments?

Author: rickiewars

src/main/java/com/rwconnected/serverkit/api/economy/ICurrency.java

@@ -7,4 +7,5 @@ public interface ICurrency {
 
     public Identifier getId();
     public IAccount getDefaultAccount(IPlayer<?> player);
+    String formatValue(long value);
 }

src/main/java/com/rwconnected/serverkit/api/economy/Patbox/PbCurrency.java

@@ -25,4 +25,9 @@ public IAccount getDefaultAccount(IPlayer<?> player) {
         ServerPlayerEntity mcPlayer = ((Player) player).getSource();
         return new PbAccount(currency.provider().getDefaultAccount(mcPlayer, currency));
     }
+
+    @Override
+    public String formatValue(long value) {
+        return currency.formatValue(value, false);
+    }
 }

src/main/java/com/rwconnected/serverkit/config/Config.java

@@ -193,19 +193,27 @@ public HttpServerConfig() {
     }
 
     public record EconomyConfig(
-        Identifier currencyId,
-        Identifier accountId
+        String currencyId,
+        String accountId
     ) {
-        public EconomyConfig(Identifier currencyId, Identifier accountId) {
+        public EconomyConfig(String currencyId, String accountId) {
             this.currencyId = currencyId;
             this.accountId = accountId;
         }
         public EconomyConfig() {
             this(
-                Identifier.of("guishop", "credit"),
-                Identifier.of("guishop", "account")
+                "guishop:credit",
+                "guishop:account"
             );
         }
+
+        public Identifier CurrencyIdentifier() {
+            return Identifier.of(currencyId);
+        }
+
+        public Identifier AccountIdentifier() {
+            return Identifier.of(accountId);
+        }
     }
 
 }

src/main/java/com/rwconnected/serverkit/service/LoginStreakService.java

@@ -5,9 +5,9 @@
 import com.rwconnected.serverkit.api.economy.ITransaction;
 import com.rwconnected.serverkit.api.minecraft.player.IPlayer;
 import com.rwconnected.serverkit.api.minecraft.storage.virtual.IStorage;
+import com.rwconnected.serverkit.api.util.time.ITimeProvider;
 import com.rwconnected.serverkit.config.Config;
 import com.rwconnected.serverkit.module.Log;
-import com.rwconnected.serverkit.api.util.time.ITimeProvider;
 import com.rwconnected.serverkit.util.ModUtils;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
@@ -74,7 +74,7 @@ record = 0;
     public int reward(IPlayer<?> player, int amount) {
         amount = Math.max(0, amount);
 
-        Identifier currencyId = Config.instance().economy.currencyId();
+        Identifier currencyId = Config.instance().economy.CurrencyIdentifier();
         try {
             IAccount account = economyProvider.getDefaultAccount(player, currencyId);
             ITransaction transaction = account.increaseBalance(amount);

src/test/java/com/rwconnected/api/economy/mock/MockCurrency.java

@@ -9,6 +9,10 @@ public class MockCurrency implements ICurrency {
     private final Identifier id;
     private final MockAccount defaultAccount;
 
+    public String prefix = "";
+    public String suffix = " RP";
+    public int decimalPlaces = 2;
+
     public MockCurrency(Identifier id, MockAccount defaultAccount) {
         this.id = id;
         this.defaultAccount = defaultAccount;
@@ -29,4 +33,11 @@ public Identifier getId() {
     public IAccount getDefaultAccount(IPlayer<?> player) {
         return defaultAccount;
     }
+
+    @Override
+    public String formatValue(long value) {
+        int fraction = (int) (value % (long) Math.pow(10, decimalPlaces));
+        long whole = value / (long) Math.pow(10, decimalPlaces);
+        return String.format("%s%d.%0" + decimalPlaces + "d%s", prefix, whole, fraction, suffix);
+    }
 }

src/test/java/com/rwconnected/serverkit/service/LoginStreakServiceTest.java

@@ -5,7 +5,6 @@
 import com.rwconnected.serverkit.api.economy.IAccount;
 import com.rwconnected.serverkit.api.util.time.MockTimeProvider;
 import com.rwconnected.serverkit.config.Config;
-import net.minecraft.util.Identifier;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
@@ -57,8 +56,8 @@ private void initConfig(
             null,
             null,
             economyConfig != null ? economyConfig : new Config.EconomyConfig(
-                Identifier.of("mock", "currency"),
-                Identifier.of("mock", "account")
+                "mock:currency",
+                "mock:account"
             )
         ));
     }
@@ -221,7 +220,7 @@ public void testPlayerGetsRewardedForStreak() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(DAILY_REWARD, account.getBalance());
@@ -238,7 +237,7 @@ public void testPlayerGetsNoRewardAfterMissingDay() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(0, account.getBalance());
@@ -255,7 +254,7 @@ public void testPlayerGetsRewardForWeeklyMilestone() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(DAILY_REWARD + WEEKLY_REWARD, account.getBalance());
@@ -272,7 +271,7 @@ public void testPlayerGetsRewardForMultipleMilestones() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(DAILY_REWARD + WEEKLY_REWARD + MONTHLY_REWARD, account.getBalance());
@@ -289,7 +288,7 @@ public void testPlayerGetsRewardForRegularMilestone() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(DAILY_REWARD + DAY_100_REWARD, account.getBalance());
@@ -307,7 +306,7 @@ public void testPlayerGetsNoRewardForAlreadyReceivedRegularMilestone() {
         loginStreakService.process(player);
 
         IAccount account = this.economyProvider.getDefaultAccount(
-            this.player, Config.instance().economy.currencyId()
+            this.player, Config.instance().economy.CurrencyIdentifier()
         );
 
         assertEquals(DAILY_REWARD, account.getBalance());
@@ -316,8 +315,8 @@ public void testPlayerGetsNoRewardForAlreadyReceivedRegularMilestone() {
     @Test
     public void testLoginStreakServiceStillWorksWithMisconfiguredEconomyConfig() {
         initConfig(new Config.EconomyConfig(
-            Identifier.of("invalid", "id1"),
-            Identifier.of("invalid", "id2")
+            "invalid:id1",
+            "invalid:id2"
         ));
         setupService();
         initPlayer();