TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-02 20:11:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix a few issues with /list and group formatting.

Browse source
This commit is contained in:
KHobbits 2013-08-18 22:08:57 +01:00
parent 3b8df2d18e
commit 8cba8da516
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Essentials/src/com/earth2me/essentials/commands/Commandlist.java
View file

@ -27,7 +27,7 @@ public class Commandlist extends EssentialsCommand
} }
sender.sendMessage(listSummary(server, showHidden)); sender.sendMessage(listSummary(server, showHidden));
Map<String, List<User>> playerList = getPlayerLists(server, showHidden); final Map<String, List<User>> playerList = getPlayerLists(server, showHidden);
if (args.length > 0) if (args.length > 0)
{ {
@ -66,7 +66,7 @@ public class Commandlist extends EssentialsCommand
// Build the basic player list, divided by groups. // Build the basic player list, divided by groups.
private Map<String, List<User>> getPlayerLists(final Server server, final boolean showHidden) private Map<String, List<User>> getPlayerLists(final Server server, final boolean showHidden)
{ {
Map<String, List<User>> playerList = new HashMap<String, List<User>>(); final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
final User onlineUser = ess.getUser(onlinePlayer); final User onlineUser = ess.getUser(onlinePlayer);
@ -74,7 +74,7 @@ public class Commandlist extends EssentialsCommand
{ {
continue; continue;
} }
final String group = FormatUtil.stripFormat(onlineUser.getGroup().toLowerCase()); final String group = FormatUtil.stripFormat(FormatUtil.stripEssentialsFormat(onlineUser.getGroup().toLowerCase()));
List<User> list = playerList.get(group); List<User> list = playerList.get(group);
if (list == null) if (list == null)
{ {
@ -91,7 +91,7 @@ public class Commandlist extends EssentialsCommand
{ {
final List<User> users = getMergedList(playerList, groupName); final List<User> users = getMergedList(playerList, groupName);
List<User> groupUsers = playerList.get(groupName); final List<User> groupUsers = playerList.get(groupName);
if (groupUsers != null && !groupUsers.isEmpty()) if (groupUsers != null && !groupUsers.isEmpty())
{ {
users.addAll(groupUsers); users.addAll(groupUsers);
@ -101,13 +101,16 @@ public class Commandlist extends EssentialsCommand
throw new Exception(_("groupDoesNotExist")); throw new Exception(_("groupDoesNotExist"));
} }
return outputFormat(groupName, listUsers(users)); final StringBuilder displayGroupName = new StringBuilder();
displayGroupName.append(Character.toTitleCase(groupName.charAt(0)));
displayGroupName.append(groupName.substring(1));
return outputFormat(displayGroupName.toString(), listUsers(users));
} }
// Handle the merging of groups // Handle the merging of groups
private List<User> getMergedList(final Map<String, List<User>> playerList, final String groupName) private List<User> getMergedList(final Map<String, List<User>> playerList, final String groupName)
{ {
Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet(); final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
final List<User> users = new ArrayList<User>(); final List<User> users = new ArrayList<User>();
for (String configGroup : configGroups) for (String configGroup : configGroups)
@ -117,6 +120,7 @@ public class Commandlist extends EssentialsCommand
String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" "); String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" ");
for (String groupValue : groupValues) for (String groupValue : groupValues)
{ {
groupValue = groupValue.toLowerCase(Locale.ENGLISH);
if (groupValue == null || groupValue.equals("")) if (groupValue == null || groupValue.equals(""))
{ {
continue; continue;
@ -137,8 +141,8 @@ public class Commandlist extends EssentialsCommand
// Output the standard /list output, when no group is specified // Output the standard /list output, when no group is specified
private void sendGroupedList(CommandSender sender, String commandLabel, Map<String, List<User>> playerList) private void sendGroupedList(CommandSender sender, String commandLabel, Map<String, List<User>> playerList)
{ {
Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet(); final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
List<String> asterisk = new ArrayList<String>(); final List<String> asterisk = new ArrayList<String>();
// Loop through the custom defined groups and display them // Loop through the custom defined groups and display them
for (String oConfigGroup : configGroups) for (String oConfigGroup : configGroups)
@ -161,7 +165,7 @@ public class Commandlist extends EssentialsCommand
} }
List<User> outputUserList = new ArrayList<User>(); List<User> outputUserList = new ArrayList<User>();
List<User> matchedList = playerList.get(configGroup); final List<User> matchedList = playerList.get(configGroup);
// If the group value is an int, then we might need to truncate it // If the group value is an int, then we might need to truncate it
if (NumberUtil.isInt(groupValue)) if (NumberUtil.isInt(groupValue))
@ -265,7 +269,6 @@ public class Commandlist extends EssentialsCommand
final StringBuilder outputString = new StringBuilder(); final StringBuilder outputString = new StringBuilder();
outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group))); outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group)));
outputString.append(message); outputString.append(message);
outputString.setCharAt(0, Character.toTitleCase(outputString.charAt(0)));
return outputString.toString(); return outputString.toString();
} }
} }

12
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java
View file

@ -25,7 +25,17 @@ public class FormatUtil
{ {
return null; return null;
} }
return VANILLA_PATTERN.matcher(input).replaceAll(""); return stripColor(input, VANILLA_PATTERN);
}
//This method is used to simply strip the & convention colour codes
public static String stripEssentialsFormat(final String input)
{
if (input == null)
{
return null;
}
return stripColor(input, REPLACE_PATTERN);
} }
//This is the general permission sensitive message format function, checks for urls. //This is the general permission sensitive message format function, checks for urls.