Command & locale updates.

This commit is contained in:
GJ
2012-04-22 19:34:34 -04:00
parent 66b4388e64
commit c18b3e9114
15 changed files with 283 additions and 166 deletions

View File

@ -24,7 +24,7 @@ public class McrefreshCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
OfflinePlayer player;
PlayerProfile PP;
String usage = ChatColor.RED + "Proper usage is /mcrefresh [playername]"; //TODO: Needs more locale
String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
return true;

View File

@ -27,7 +27,7 @@ public class McremoveCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
String playerName;
String usage = ChatColor.RED + "Proper usage is /mcremove <playername>"; //TODO: Needs more locale.
String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
String success;
if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {

View File

@ -18,7 +18,7 @@ public class MctopCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
String usage = ChatColor.RED + "Proper usage is /mctop [skillname] [page]"; //TODO: Needs more locale.
String usage = ChatColor.RED + "Proper usage is /mctop [skill] [page]"; //TODO: Needs more locale.
if (!LoadProperties.useMySQL) {
switch (args.length) {
@ -34,13 +34,18 @@ public class MctopCommand implements CommandExecutor {
flatfileDisplay(1, args[0].toUpperCase(), sender);
}
else {
sender.sendMessage(usage);
sender.sendMessage(mcLocale.getString("Commands.Skill.Invalid"));
}
return true;
case 2:
if (Skills.isSkill(args[0]) && m.isInt(args[1])) {
if (!Skills.isSkill(args[0])) {
sender.sendMessage(mcLocale.getString("Commands.Skill.Invalid"));
return true;
}
if (m.isInt(args[1])) {
flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
}
else {
@ -70,19 +75,26 @@ public class MctopCommand implements CommandExecutor {
sqlDisplay(1, args[0].toLowerCase(), sender);
}
else {
sender.sendMessage(usage);
sender.sendMessage(mcLocale.getString("Commands.Skill.Invalid"));
}
return true;
case 2:
if (Skills.isSkill(args[0]) && m.isInt(args[1])) {
if (!Skills.isSkill(args[0])) {
sender.sendMessage(mcLocale.getString("Commands.Skill.Invalid"));
return true;
}
if (m.isInt(args[1])) {
sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
}
else {
sender.sendMessage(usage);
}
return true;
default:
sender.sendMessage(usage);
return true;