add /prestiges

also fix inconsistency with checking groups
This commit is contained in:
okx-code
2018-09-02 23:20:23 +01:00
parent e8d24a434a
commit f78bc81d0f
17 changed files with 136 additions and 45 deletions
@@ -6,11 +6,9 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import sh.okx.rankup.Rankup;
import sh.okx.rankup.ranks.Rankups;
import sh.okx.rankup.messages.Message;
import sh.okx.rankup.messages.MessageBuilder;
import sh.okx.rankup.messages.Variable;
import sh.okx.rankup.ranks.Rank;
import sh.okx.rankup.ranks.Rankups;
@RequiredArgsConstructor
public class RanksCommand implements CommandExecutor {
@@ -24,39 +22,22 @@ public class RanksCommand implements CommandExecutor {
playerRank = rankups.getByPlayer((Player) sender);
}
sendHeaderFooter(sender, playerRank, Message.RANKS_HEADER);
plugin.sendHeaderFooter(sender, playerRank, Message.RANKS_HEADER);
Message message = playerRank == null ? Message.RANKS_INCOMPLETE : Message.RANKS_COMPLETE;
Rank rank = rankups.getFirst();
do {
Rank next = rankups.next(rank);
if (rank.equals(playerRank)) {
sendMessage(sender, Message.RANKS_CURRENT, rank, next);
plugin.sendMessage(sender, Message.RANKS_CURRENT, rank, next);
message = Message.RANKS_INCOMPLETE;
} else {
sendMessage(sender, message, rank, next);
plugin.sendMessage(sender, message, rank, next);
}
rank = next;
} while (!rank.isLast());
sendHeaderFooter(sender, playerRank, Message.RANKS_FOOTER);
plugin.sendHeaderFooter(sender, playerRank, Message.RANKS_FOOTER);
return true;
}
private void sendHeaderFooter(CommandSender sender, Rank rank, Message type) {
MessageBuilder builder = plugin.getMessage(rank, type)
.failIfEmpty();
if (rank == null) {
builder.replace(Variable.PLAYER, sender.getName());
} else {
builder.replaceRanks(sender, rank);
}
builder.send(sender);
}
private void sendMessage(CommandSender player, Message message, Rank oldRank, Rank rank) {
plugin.replaceMoneyRequirements(plugin.getMessage(oldRank, message)
.replaceRanks(player, oldRank, rank), player, oldRank)
.send(player);
}
}