Beta 1.

- Fixed issue in IDFinder with console id. - Fixed /baltop - Fixed /transaction history
TheNewEconomy · May 20, 2018 · bd789e0 · bd789e0
1 parent b82d758
commit bd789e0
Show file tree

Hide file tree

Showing 53 changed files with 461 additions and 132 deletions.
diff --git a/TNE/src/net/tnemc/core/TNE.java b/TNE/src/net/tnemc/core/TNE.java
@@ -5,7 +5,6 @@
 import com.github.tnerevival.core.UpdateChecker;
 import com.github.tnerevival.core.collection.EventList;
 import com.github.tnerevival.core.collection.EventMap;
-import com.github.tnerevival.user.IDFinder;
 import net.milkbowl.vault.economy.Economy;
 import net.tnemc.core.commands.CommandManager;
 import net.tnemc.core.commands.TNECommand;
@@ -24,6 +23,7 @@
 import net.tnemc.core.common.WorldManager;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.api.Economy_TheNewEconomy;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.api.ReserveEconomy;
 import net.tnemc.core.common.api.TNEAPI;
 import net.tnemc.core.common.configurations.MainConfigurations;
@@ -540,7 +540,7 @@ public static void debug(String message) {
     int mil = now.get(ChronoField.MILLI_OF_SECOND);
     String time = "[" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second + "." + mil + "] ";
     if(consoleDebug) {
-      System.out.println(message);
+      TNE.debug(message);
     } else {
       try {
         BufferedWriter writer = new BufferedWriter(new FileWriter(new File(TNE.instance().getDataFolder(), "debug/debug-" + year + "-" + month + "-" + day + ".txt"), true));
@@ -551,7 +551,7 @@ public static void debug(String message) {
         e.printStackTrace();
       }
     }*/
-    //System.out.println(message);
+    //TNE.debug(message);
   }
 
   public void loadConfigurations() {

diff --git a/TNE/src/net/tnemc/core/commands/TNECommand.java b/TNE/src/net/tnemc/core/commands/TNECommand.java
@@ -1,9 +1,9 @@
 package net.tnemc.core.commands;
 
 import com.github.tnerevival.TNELib;
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.common.Message;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminBalanceCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminBalanceCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.TNETransaction;

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminCreateCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminCreateCommand.java
@@ -1,12 +1,12 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import org.bukkit.command.CommandSender;
 

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminDeleteCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminDeleteCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminIDCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminIDCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminMenuCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminMenuCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminPurgeCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminPurgeCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminStatusCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminStatusCommand.java
@@ -1,13 +1,13 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.AccountStatus;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 

diff --git a/TNE/src/net/tnemc/core/commands/admin/AdminTestCommand.java b/TNE/src/net/tnemc/core/commands/admin/AdminTestCommand.java
@@ -1,8 +1,8 @@
 package net.tnemc.core.commands.admin;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.utils.MISCUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

diff --git a/TNE/src/net/tnemc/core/commands/config/ConfigGetCommand.java b/TNE/src/net/tnemc/core/commands/config/ConfigGetCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.config;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/config/ConfigSetCommand.java b/TNE/src/net/tnemc/core/commands/config/ConfigSetCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.config;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/config/ConfigTNEGetCommand.java b/TNE/src/net/tnemc/core/commands/config/ConfigTNEGetCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.config;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/language/LanguageCurrentCommand.java b/TNE/src/net/tnemc/core/commands/language/LanguageCurrentCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.language;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/language/LanguageSetCommand.java b/TNE/src/net/tnemc/core/commands/language/LanguageSetCommand.java
@@ -1,12 +1,12 @@
 package net.tnemc.core.commands.language;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import org.bukkit.command.CommandSender;
 
 /**

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyBalanceCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyBalanceCommand.java
@@ -1,12 +1,12 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.TNETransaction;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyConvertCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyConvertCommand.java
@@ -1,12 +1,12 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.TNETransaction;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyGiveCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyGiveCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.MultiTransactionHandler;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyNoteCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyNoteCommand.java
@@ -1,12 +1,12 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.TNEAccount;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.TNETransaction;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyPayCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyPayCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.MultiTransactionHandler;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneySetCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneySetCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.TNETransaction;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyTakeCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyTakeCommand.java
@@ -1,11 +1,11 @@
 package net.tnemc.core.commands.money;
 
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.transaction.MultiTransactionHandler;

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyTopCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyTopCommand.java
@@ -8,10 +8,11 @@
 import net.tnemc.core.common.currency.CurrencyFormatter;
 import net.tnemc.core.common.currency.TNECurrency;
 import net.tnemc.core.common.utils.MISCUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
 import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -68,18 +69,20 @@ public boolean execute(CommandSender sender, String command, String[] arguments)
     }
 
     int max = TNE.saveManager().getTNEManager().getTNEProvider().balanceCount(world, currency.name(), limit);
+    if(max == 0) max = 1;
 
     if(page > max) page = max;
     TNE.debug("MoneyTopCommand.java(87): Max Pages - " + max);
 
-    Map<UUID, BigDecimal> values = TNE.saveManager().getTNEManager().getTNEProvider().topBalances(world, currency.name(), limit, page);
+    LinkedHashMap<UUID, BigDecimal> values = TNE.saveManager().getTNEManager().getTNEProvider().topBalances(world, currency.name(), limit, page);
 
     Message top = new Message("Messages.Money.Top");
     top.addVariable("$page", page + "");
     top.addVariable("$page_top", max + "");
     top.translate(world, sender);
-    for (Map.Entry<UUID, BigDecimal> entry : values.entrySet()) {
-      String username = (Bukkit.getOfflinePlayer(entry.getKey()) != null)? Bukkit.getOfflinePlayer(entry.getKey()).getName() : TNE.manager().getAccount(entry.getKey()).displayName();
+    Iterator<Map.Entry<UUID, BigDecimal>> it = values.entrySet().iterator();
+    while(it.hasNext()) {
+      Map.Entry<UUID, BigDecimal> entry = it.next();
       sender.sendMessage(TNE.manager().getAccount(entry.getKey()).displayName() + " has " + CurrencyFormatter.format(currency, world, entry.getValue()));
     }
     return true;

diff --git a/TNE/src/net/tnemc/core/commands/transaction/TransactionAwayCommand.java b/TNE/src/net/tnemc/core/commands/transaction/TransactionAwayCommand.java
@@ -2,12 +2,12 @@
 
 import com.github.tnerevival.core.collection.paginate.Page;
 import com.github.tnerevival.core.collection.paginate.Paginator;
-import com.github.tnerevival.user.IDFinder;
 import net.tnemc.core.TNE;
 import net.tnemc.core.commands.TNECommand;
 import net.tnemc.core.common.Message;
 import net.tnemc.core.common.WorldVariant;
 import net.tnemc.core.common.account.WorldFinder;
+import net.tnemc.core.common.api.IDFinder;
 import net.tnemc.core.common.transaction.TNETransaction;
 import net.tnemc.core.common.utils.MISCUtils;
 import org.bukkit.command.CommandSender;