Add $pos as a possible replacement to TopEntry message.

TheNewEconomy · Aug 31, 2024 · 0215947 · 0215947
1 parent 854f43c
commit 0215947
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/.changelog/0.1.3.2.md b/.changelog/0.1.3.2.md
@@ -10,6 +10,7 @@
 - Added configuration to currencies that will determine if the currency is shown in balance commands.
 - Added new permissions to shared accounts; TRANSFER_OWNERSHIP and DELETE
 - Added ability for messages from some money commands to be sent to players on different servers through bungee/redis/velocity
+- Added $pos placeholder for TopEntry message.
 
 ## Internals
 - Various improvements to the module system

diff --git a/Core/src/net/tnemc/core/EconomyManager.java b/Core/src/net/tnemc/core/EconomyManager.java
@@ -54,6 +54,8 @@
  */
 public class EconomyManager {
 
+  public static final int TOP_PER_PAGE = 5;
+
   //Our core identifiers, leave these as static final, because they shouldn't be changed.
 
   //Normal and database are used internally only and don't have an associated holdings handler.

diff --git a/Core/src/net/tnemc/core/command/MoneyCommand.java b/Core/src/net/tnemc/core/command/MoneyCommand.java
@@ -56,6 +56,8 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import static net.tnemc.core.EconomyManager.TOP_PER_PAGE;
+
 /**
  * MoneyCommands
  *
@@ -862,19 +864,28 @@ public static void onTop(CmdSource<?> sender, Integer page, Currency currency, B
 
       TopManager.instance().load();
     }
+    final int max = TNECore.eco().getTopManager().page(currency.getUid());
+
+    if(page < 1) page = 1;
+    if(page > max) page = max;
 
-    TopPage<String> pageEntry = TNECore.eco().getTopManager().page(page, currency.getUid());
+    final TopPage<String> pageEntry = TNECore.eco().getTopManager().page(page, currency.getUid());
     if(pageEntry != null) {
       final MessageData data = new MessageData("Messages.Money.Top");
       data.addReplacement("$page", String.valueOf(page));
-      data.addReplacement("$page_top", String.valueOf(TNECore.eco().getTopManager().page(currency.getUid())));
+      data.addReplacement("$page_top", String.valueOf(max));
       sender.message(data);
 
+      final int adjusted = (page - 1) * TOP_PER_PAGE;
+      int i = 1;
       for(Map.Entry<String, BigDecimal> entry : pageEntry.getValues().entrySet()) {
         final MessageData en = new MessageData("Messages.Money.TopEntry");
+        en.addReplacement("$pos", (adjusted + i));
         en.addReplacement("$player", entry.getKey());
         en.addReplacement("$amount", CurrencyFormatter.format(senderAccount.get(), new HoldingsEntry(TNECore.eco().region().defaultRegion(), currency.getUid(), entry.getValue(), EconomyManager.NORMAL)));
         sender.message(en);
+
+        i++;
       }
     }
   }

diff --git a/Core/src/net/tnemc/core/io/message/BaseTranslationProvider.java b/Core/src/net/tnemc/core/io/message/BaseTranslationProvider.java
@@ -47,7 +47,7 @@ public class BaseTranslationProvider implements TranslationProvider {
   @Override
   public String getLang(UUID identifier) {
 
-    Optional<Account> account = TNECore.eco().account().findAccount(identifier);
+    final Optional<Account> account = TNECore.eco().account().findAccount(identifier);
 
     if(account.isPresent() && account.get().isPlayer()) {
       return ((PlayerAccount)account.get()).getLanguage();

diff --git a/Core/src/net/tnemc/core/manager/top/TopCurrency.java b/Core/src/net/tnemc/core/manager/top/TopCurrency.java
@@ -26,6 +26,8 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
+import static net.tnemc.core.EconomyManager.TOP_PER_PAGE;
+
 /**
  * TopCurrency
  *
@@ -34,7 +36,7 @@
  */
 public class TopCurrency {
 
-  private final MultiTreeMap<String> balances = new MultiTreeMap<>(5);
+  private final MultiTreeMap<String> balances = new MultiTreeMap<>(TOP_PER_PAGE);
 
   private final String region;
   private final UUID currency;