Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 22:13:25 +01:00
Code Issues Projects Releases Wiki Activity

Added messages to log commands to show the total amount of money, exp & points

Browse Source
This commit is contained in:
montlikadani 2020-01-13 20:45:40 +01:00
parent 95c3ae3578
commit acc22ea436
3 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/gamingmesh/jobs/commands/list/glog.java
View File

@ -1,6 +1,8 @@
package com.gamingmesh.jobs.commands.list;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@ -27,31 +29,28 @@ public class glog implements Cmd {
Jobs.getCommandManager().sendUsage(sender, "glog");
return true;
}
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
Map<LogAmounts, Double> unsortMap = new HashMap<>();
int time = TimeManage.timeInInt();
for (Integer OneP : Jobs.getJobsDAO().getLognameList(time, time)) {
PlayerInfo info = Jobs.getPlayerManager().getPlayerInfo(OneP);
if (info == null)
continue;
String name = info.getName();
if (name == null)
continue;
JobsPlayer JPlayer = Jobs.getPlayerManager().getJobsPlayer(info.getUuid());
if (JPlayer == null)
continue;
HashMap<String, Log> logList = JPlayer.getLog();
if (logList.isEmpty())
if (logList == null || logList.isEmpty())
continue;
for (Entry<String, Log> l : logList.entrySet()) {
@ -66,24 +65,42 @@ public class glog implements Cmd {
}
unsortMap = Sorting.sortDoubleDESCByLog(unsortMap);
if (unsortMap.isEmpty()) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.nodata"));
return;
}
int count = 1;
int max = 10;
double totalMoney = 0;
double totalExp = 0;
double totalPoints = 0;
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.topline"));
for (Entry<LogAmounts, Double> one : unsortMap.entrySet()) {
LogAmounts info = one.getKey();
double money = info.get(CurrencyType.MONEY);
totalMoney = totalMoney + money;
String moneyS = "";
if (info.get(CurrencyType.MONEY) != 0D)
moneyS = Jobs.getLanguage().getMessage("command.glog.output.money", "%amount%", info.get(CurrencyType.MONEY));
if (money != 0D)
moneyS = Jobs.getLanguage().getMessage("command.glog.output.money", "%amount%", money);
double exp = info.get(CurrencyType.EXP);
totalExp = totalExp + exp;
String expS = "";
if (info.get(CurrencyType.EXP) != 0D)
expS = Jobs.getLanguage().getMessage("command.glog.output.exp", "%amount%", info.get(CurrencyType.EXP));
if (exp != 0D)
expS = Jobs.getLanguage().getMessage("command.glog.output.exp", "%amount%", exp);
double points = info.get(CurrencyType.POINTS);
totalPoints = totalPoints + points;
String pointsS = "";
if (info.get(CurrencyType.POINTS) != 0D)
pointsS = Jobs.getLanguage().getMessage("command.glog.output.points", "%amount%", info.get(CurrencyType.POINTS));
if (points != 0D)
pointsS = Jobs.getLanguage().getMessage("command.glog.output.points", "%amount%", points);
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.ls",
"%number%", count,
@ -99,11 +116,12 @@ public class glog implements Cmd {
if (count > max)
break;
}
if (unsortMap.isEmpty())
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.nodata"));
NumberFormat format = NumberFormat.getInstance(Locale.ENGLISH);
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.totalIncomes", "%money%", format.format(totalMoney),
"%exp%", format.format(totalExp), "%points%", format.format(totalPoints)));
sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.bottomline"));
return;
}
});

55
src/main/java/com/gamingmesh/jobs/commands/list/log.java
View File

@ -1,6 +1,8 @@
package com.gamingmesh.jobs.commands.list;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@ -21,7 +23,6 @@ public class log implements Cmd {
@Override
@JobCommand(1100)
public boolean perform(Jobs plugin, final CommandSender sender, final String[] args) {
if (!(sender instanceof Player) && args.length != 1) {
sender.sendMessage(Jobs.getLanguage().getMessage("general.error.ingame"));
return false;
@ -31,6 +32,7 @@ public class log implements Cmd {
Jobs.getCommandManager().sendUsage(sender, "log");
return true;
}
JobsPlayer JPlayer = null;
if (args.length == 0)
JPlayer = Jobs.getPlayerManager().getJobsPlayer((Player) sender);
@ -47,8 +49,7 @@ public class log implements Cmd {
}
HashMap<String, Log> logList = JPlayer.getLog();
if (logList.size() == 0) {
if (logList == null || logList.isEmpty()) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.bottomline"));
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.nodata"));
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.bottomline"));
@ -58,56 +59,80 @@ public class log implements Cmd {
Map<String, Double> unsortMap = new HashMap<>();
for (Entry<String, Log> l : logList.entrySet()) {
Log one = l.getValue();
HashMap<String, LogAmounts> AmountList = one.getAmountList();
for (Entry<String, LogAmounts> oneMap : AmountList.entrySet()) {
for (Entry<String, LogAmounts> oneMap : l.getValue().getAmountList().entrySet()) {
unsortMap.put(oneMap.getKey(), oneMap.getValue().get(CurrencyType.MONEY));
}
}
unsortMap = Sorting.sortDoubleDESC(unsortMap);
if (unsortMap.isEmpty()) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.nodata"));
return true;
}
int count = 0;
int max = 10;
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.topline", "%playername%", JPlayer.getName()));
for (Entry<String, Log> l : logList.entrySet()) {
Log one = l.getValue();
HashMap<String, LogAmounts> AmountList = one.getAmountList();
double totalMoney = 0;
double totalExp = 0;
double totalPoints = 0;
for (Entry<String, Double> oneSorted : unsortMap.entrySet()) {
for (Entry<String, LogAmounts> oneMap : AmountList.entrySet()) {
if (oneMap.getKey().equalsIgnoreCase(oneSorted.getKey())) {
count++;
LogAmounts amounts = oneMap.getValue();
double money = amounts.get(CurrencyType.MONEY);
totalMoney = totalMoney + money;
String moneyS = "";
if (oneMap.getValue().get(CurrencyType.MONEY) != 0D)
moneyS = Jobs.getLanguage().getMessage("command.log.output.money", "%amount%", oneMap.getValue().get(CurrencyType.MONEY));
if (money != 0D)
moneyS = Jobs.getLanguage().getMessage("command.log.output.money", "%amount%", money);
double exp = amounts.get(CurrencyType.EXP);
totalExp = totalExp + exp;
String expS = "";
if (oneMap.getValue().get(CurrencyType.EXP) != 0D)
expS = Jobs.getLanguage().getMessage("command.log.output.exp", "%amount%", oneMap.getValue().get(CurrencyType.EXP));
if (exp != 0D)
expS = Jobs.getLanguage().getMessage("command.log.output.exp", "%amount%", exp);
double points = amounts.get(CurrencyType.POINTS);
totalPoints = totalPoints + points;
String pointsS = "";
if (oneMap.getValue().get(CurrencyType.POINTS) != 0D)
pointsS = Jobs.getLanguage().getMessage("command.log.output.points", "%amount%", oneMap.getValue().get(CurrencyType.POINTS));
if (points != 0D)
pointsS = Jobs.getLanguage().getMessage("command.log.output.points", "%amount%", points);
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.ls",
"%number%", count,
"%action%", one.getActionType(),
"%item%", oneMap.getValue().getItemName().replace(":0", "").replace("_", " ").toLowerCase(),
"%qty%", oneMap.getValue().getCount(),
"%item%", amounts.getItemName().replace(":0", "").replace("_", " ").toLowerCase(),
"%qty%", amounts.getCount(),
"%money%", moneyS,
"%exp%", expS,
"%points%", pointsS));
break;
}
}
if (count > max)
break;
}
NumberFormat format = NumberFormat.getInstance(Locale.ENGLISH);
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.totalIncomes", "%money%", format.format(totalMoney),
"%exp%", format.format(totalExp), "%points%", format.format(totalPoints)));
if (count > max)
break;
}
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.bottomline"));
sender.sendMessage(Jobs.getLanguage().getMessage("command.log.output.bottomline"));
return true;
}
}

2
src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -540,6 +540,7 @@ public class LanguageManager {
c.get("command.log.output.money", "&6money: %amount% ");
c.get("command.log.output.exp", "&eexp: %amount% ");
c.get("command.log.output.points", "&6points: %amount%");
c.get("command.log.output.totalIncomes", " &6Total money:&2 %money%&6, Total exp:&2 %exp%&6, Total points:&2 %points%");
c.get("command.log.output.bottomline", "&7***********************************************************");
c.get("command.log.output.prev", "&e<<<<< Prev page &2|");
c.get("command.log.output.next", "&2|&e Next Page >>>>");
@ -552,6 +553,7 @@ public class LanguageManager {
c.get("command.glog.output.money", "&6money: %amount% ");
c.get("command.glog.output.exp", "&eexp: %amount% ");
c.get("command.glog.output.points", "&6points: %amount%");
c.get("command.glog.output.totalIncomes", " &6Total money:&2 %money%&6, Total exp:&2 %exp%&6, Total points:&2 %points%");
c.get("command.glog.output.bottomline", "&7**************************************************************");
c.get("command.glog.output.nodata", "&cData not found");