Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add COORDS, UPTIME and TPS keywords

This commit is contained in:
Chris Ward 2013-08-20 22:13:51 +10:00
parent b85aaea039
commit ed007589f3
19 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View File

@ -2,18 +2,23 @@ package com.earth2me.essentials.textreader;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.NumberUtil;
import java.lang.management.ManagementFactory;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import static com.earth2me.essentials.I18n._;
public class KeywordReplacer implements IText
{
@ -45,7 +50,8 @@ public class KeywordReplacer implements IText
String displayName, ipAddress, balance, mails, world;
String worlds, online, unique, playerlist, date, time;
String worldTime12, worldTime24, worldDate, plugins;
String userName, version, address;
String userName, version, address, tps, uptime;
String coords;
if (sender instanceof Player)
{
final User user = ess.getUser(sender);
@ -55,14 +61,16 @@ public class KeywordReplacer implements IText
address = user.getAddress() == null ? "" : user.getAddress().toString();
balance = NumberUtil.displayCurrency(user.getMoney(), ess);
mails = Integer.toString(user.getMails().size());
world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName();
final Location location = user.getLocation();
world = location == null || location.getWorld() == null ? "" : location.getWorld().getName();
worldTime12 = DescParseTickFormat.format12(user.getWorld() == null ? 0 : user.getWorld().getTime());
worldTime24 = DescParseTickFormat.format24(user.getWorld() == null ? 0 : user.getWorld().getTime());
worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld() == null ? 0 : user.getWorld().getFullTime()));
coords = _("coordsKeyword", location.getBlockX(), location.getBlockY(), location.getBlockZ());
}
else
{
displayName = address = ipAddress = balance = mails = world = worldTime12 = worldTime24 = worldDate = "";
displayName = address = ipAddress = balance = mails = world = worldTime12 = worldTime24 = worldDate = coords = "";
}
userName = sender.getName();
@ -118,6 +126,9 @@ public class KeywordReplacer implements IText
time = DateFormat.getTimeInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(new Date());
version = ess.getServer().getVersion();
tps = Double.toString(ess.getTimer().getAverageTPS());
uptime = DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime());
for (int i = 0; i < input.getLines().size(); i++)
{
@ -138,6 +149,9 @@ public class KeywordReplacer implements IText
line = line.replace("{WORLDTIME12}", worldTime12);
line = line.replace("{WORLDTIME24}", worldTime24);
line = line.replace("{WORLDDATE}", worldDate);
line = line.replace("{COORDS}", coords);
line = line.replace("{TPS}", tps);
line = line.replace("{UPTIME}", uptime);
if (extended)
{

1
Essentials/src/messages.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_cs.properties
View File

@ -529,3 +529,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_da.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_de.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_en.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_es.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_fi.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_fr.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_it.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_nl.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_pl.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_pt.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_ro.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_ru.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_sv.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_zh.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_zh_HK.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}

1
Essentials/src/messages_zh_TW.properties
View File

@ -524,3 +524,4 @@ isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}