Redstoner/Modules
Archived
0
Fork 0
Code Activity

Updated /seen to work with 1.13 statistics.

Browse Source 
Also, Reverted /seen message structural change
This commit is contained in:
Minenash
2018-11-12 14:36:12 -05:00
parent 779aa95bc5
commit 99264ae65f
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/redstoner/modules/seen/Seen.java
View File

@@ -2,6 +2,7 @@ package com.redstoner.modules.seen;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.UUID;
@@ -59,7 +60,7 @@ public class Seen implements Module, Listener
@Command(hook = "seen2", async = AsyncType.ALWAYS)
public boolean seen(CommandSender sender, String player, boolean show_ips)
{
Message m = new Message(sender, null);
ArrayList<String> message = new ArrayList<>();
OfflinePlayer p;
if (Utils.isUUID(player))
p = Bukkit.getOfflinePlayer(UUID.fromString(player));
@@ -92,22 +93,22 @@ public class Seen implements Module, Listener
timestamp = (long) DataManager.getOrDefault(p.getUniqueId().toString(), "lastquit", p.getLastPlayed());
}
String time = DateUtil.formatDateDiff(timestamp);
m.appendText("&e" + p.getName() + " &7has been " + state + " &7for &e" + time + "&7.");
message.add("&e" + p.getName() + " &7has been " + state + " &7for &e" + time + "&7.");
JSONArray _names;
if (online)
{
if (DataManager.getState((Player) p, "afk"))
{
m.appendText("\nThey're currently &eAFK&7:");
message.add("They're currently &eAFK&7:");
String reason = (String) DataManager.getOrDefault(p.getUniqueId().toString(), "AFK", "afk_reason", "");
Long timeAFK = (Long) DataManager.getOrDefault(p.getUniqueId().toString(), "AFK", "afk_time", 0L);
m.appendText("\n &7Duration: &e" + DateUtil.formatDateDiff(timeAFK));
message.add(" &7Duration: &e" + DateUtil.formatDateDiff(timeAFK));
if (reason.length() >= 1)
m.appendText("\n &7Reason: &e" + reason);
message.add(" &7Reason: &e" + reason);
}
if (DataManager.getState((Player) p, "vanished"))
m.appendText("\nThey're currently &evanished&7!");
message.add("They're currently &evanished&7!");
_names = names.get(p.getUniqueId());
}
else
@@ -115,7 +116,7 @@ public class Seen implements Module, Listener
_names = loadNames(p.getUniqueId());
}
if (_names != null && _names.size() > 1)
m.appendText("\nThey've also been known as: &e"
message.add("They've also been known as: &e"
+ _names.toJSONString().replaceAll("[\"\\[\\]]", "").replace(",", "&7, &e"));
if (sender.hasPermission("utils.seen.ip"))
{
@@ -127,13 +128,12 @@ public class Seen implements Module, Listener
else
_ips = loadIPs(p.getUniqueId());
if (_ips != null && _ips.size() > 0)
m.appendText("\nThey've joined with the following IPs: &e"
message.add("They've joined with the following IPs: &e"
+ _ips.toJSONString().replaceAll("[\"\\[\\]]", "").replace(",", "&7, &e"));
}
m.appendText("\n" +
"Their current IP is: &a" + DataManager.getOrDefault(p.getUniqueId().toString(), "ip", "unknown"));
message.add("Their current IP is: &a" + DataManager.getOrDefault(p.getUniqueId().toString(), "ip", "unknown"));
}
m.send();
getLogger().message(sender, message.toArray(new String[] {}));
return true;
}
@@ -258,30 +258,27 @@ public class Seen implements Module, Listener
return true;
}
int ticks_lived = player.getStatistic(Statistic.PLAY_ONE_TICK);
int ticks_lived = player.getStatistic(Statistic.PLAY_ONE_MINUTE);
int days = ticks_lived / 1728000;
int hours = (ticks_lived % 1728000) / 72000;
int minutes = (ticks_lived % 72000) / 1200;
int seconds = ticks_lived % 1200;
if (sender.getName().equals(name))
{
getLogger().message(sender, "You have played for &b"
+ (days == 0 && hours == 0 && minutes == 0 ? seconds
: ("a total of: &e"
+ (days != 0 ? days + "d " : "")
getLogger().message(sender, "You have played for a total of: &e"
+ (days == 0 && hours == 0 && minutes == 0 ? "< 1m"
: (days != 0 ? days + "d " : "")
+ (hours != 0 || days != 0 ? hours + "h " : "")
+ (minutes != 0 || hours != 0 || days != 0 ? minutes + "m" : "")))
+ (minutes != 0 || hours != 0 || days != 0 ? minutes + "m" : ""))
+ "&7.");
}
else
{
getLogger().message(sender, "&3" + Utils.getName(player) + " &7has played for "
+ (days == 0 && hours == 0 && minutes == 0 ? seconds
: ("a total of: &e"
+ (days != 0 ? days + "d " : "")
getLogger().message(sender, "&3" + Utils.getName(player) + " &7has played for a total of: &e"
+ (days == 0 && hours == 0 && minutes == 0 ? "< 1m"
: (days != 0 ? days + "d " : "")
+ (hours != 0 || days != 0 ? hours + "h " : "")
+ (minutes != 0 || hours != 0 || days != 0 ? minutes + "m" : "")))
+ (minutes != 0 || hours != 0 || days != 0 ? minutes + "m" : ""))
+ "&7.");
}
return true;