EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-03 10:33:43 +01:00
Code Issues Projects Releases Wiki Activity

Formatting, and reminding myself to come back and fix this even further.

Browse Source
This commit is contained in:
GJ
2013-01-16 17:37:35 -05:00
parent 2a4fe4aa48
commit 1a888d3116
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java
View File

@@ -6,6 +6,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
@@ -17,30 +18,36 @@ public class McrankCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if(!Config.getInstance().getUseMySQL()) //TODO: Better input handling, add usage string
Leaderboard.updateLeaderboards(); //Make sure the information is up to date
if (!Config.getInstance().getUseMySQL()) {
Leaderboard.updateLeaderboards(); //Make sure the information is up to date
}
if (CommandHelper.noConsoleUsage(sender)) {
return true;
}
if(sender instanceof Player) {
Player player = (Player) sender; Player player = (Player) sender;
String playerName; String playerName;
switch(args.length){ switch (args.length) {
case 0: case 0:
playerName = player.getName(); playerName = player.getName();
break; break;
case 1: case 1:
playerName = args[0]; playerName = args[0];
break; break;
default: default:
return false; return false;
} }
if(Config.getInstance().getUseMySQL()) {
sqlDisplay(sender, playerName);
} else {
flatfileDisplay(sender, playerName);
}
} else { if (Config.getInstance().getUseMySQL()) {
sender.sendMessage("Command currently not supported for console."); sqlDisplay(sender, playerName);
}
else {
flatfileDisplay(sender, playerName);
} }
return true; return true;
@@ -50,15 +57,16 @@ public class McrankCommand implements CommandExecutor {
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading")); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName})); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName}));
for (SkillType skillType : SkillType.values()) { for (SkillType skillType : SkillType.values()) {
int[] rankInts = Leaderboard.getPlayerRank(playerName, skillType); int[] rankInts = Leaderboard.getPlayerRank(playerName, skillType);
if (skillType.equals(SkillType.ALL)) if (skillType.equals(SkillType.ALL)) {
continue; // We want the overall ranking to be at the bottom continue; // We want the overall ranking to be at the bottom
}
if (rankInts[1] == 0) { if (rankInts[1] == 0) {
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
} else { }
else {
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), String.valueOf(rankInts[0])} )); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), String.valueOf(rankInts[0])} ));
} }
} }
@@ -68,12 +76,12 @@ public class McrankCommand implements CommandExecutor {
if (rankInts[1] == 0) { if (rankInts[1] == 0) {
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
} else { }
else {
sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {String.valueOf(rankInts[0])} )); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {String.valueOf(rankInts[0])} ));
} }
} }
private void sqlDisplay(CommandSender sender, String playerName) { private void sqlDisplay(CommandSender sender, String playerName) {
Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getPluginManager().getPlugin("mcMMO"), new McRankAsync(playerName, sender)); Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getPluginManager().getPlugin("mcMMO"), new McRankAsync(playerName, sender));
} }