Better constants

This commit is contained in:
tastybento 2023-11-25 14:54:07 -08:00
parent 59c84990e5
commit 90751224d7
1 changed files with 111 additions and 107 deletions

View File

@ -17,12 +17,14 @@ import world.bentobox.bentobox.managers.RanksManager;
*/
public class BentoBoxRankCommand extends CompositeCommand {
private static final String REMOVE = "remove";
private int rankValue;
private String firstElement;
private final RanksManager rm;
/**
* Rank management. Add and remove
*
* @param parent command parent
*/
public BentoBoxRankCommand(CompositeCommand parent) {
@ -45,15 +47,15 @@ public class BentoBoxRankCommand extends CompositeCommand {
showHelp(this, user);
return false;
}
// Check if the first element is "add" or "remove" or "list"
// Check if the first element is "add" or REMOVE or "list"
firstElement = args.get(0);
if (!("list".equals(firstElement) || "add".equals(firstElement) || "remove".equals(firstElement))) {
if (!("list".equals(firstElement) || "add".equals(firstElement) || REMOVE.equals(firstElement))) {
// Show help
showHelp(this, user);
return false;
}
if ("remove".equals(firstElement) && args.size() != 2) {
if (REMOVE.equals(firstElement) && args.size() != 2) {
// Show help
showHelp(this, user);
return false;
@ -92,18 +94,20 @@ public class BentoBoxRankCommand extends CompositeCommand {
}
if ("add".equals(firstElement)) {
if (rm.addRank(args.get(1), rankValue)) {
user.sendMessage("commands.bentobox.rank.add.success", "[rank]", args.get(1), TextVariables.NUMBER, String.valueOf(rankValue));
user.sendMessage("commands.bentobox.rank.add.success", TextVariables.RANK, args.get(1),
TextVariables.NUMBER, String.valueOf(rankValue));
showRanks(user);
} else {
user.sendMessage("commands.bentobox.rank.add.failure", "[rank]", args.get(1), TextVariables.NUMBER, String.valueOf(rankValue));
user.sendMessage("commands.bentobox.rank.add.failure", TextVariables.RANK, args.get(1),
TextVariables.NUMBER, String.valueOf(rankValue));
return false;
}
} else {
if (rm.removeRank(args.get(1))) {
user.sendMessage("commands.bentobox.rank.remove.success", "[rank]", args.get(1));
user.sendMessage("commands.bentobox.rank.remove.success", TextVariables.RANK, args.get(1));
showRanks(user);
} else {
user.sendMessage("commands.bentobox.rank.remove.failure", "[rank]", args.get(1));
user.sendMessage("commands.bentobox.rank.remove.failure", TextVariables.RANK, args.get(1));
return false;
}
}
@ -125,14 +129,14 @@ public class BentoBoxRankCommand extends CompositeCommand {
}
firstElement = args.get(1);
if (args.size() <= 2) {
return Optional.of(List.of("add","remove","list"));
return Optional.of(List.of("add", REMOVE, "list"));
}
if (args.size() > 1 && "add".equals(firstElement)) {
List<String> options = new ArrayList<>(RanksManager.DEFAULT_RANKS.keySet());
options.removeIf(rm.getRanks().keySet()::contains);
return Optional.of(options);
}
if (args.size() > 1 && "remove".equals(firstElement)) {
if (args.size() > 1 && REMOVE.equals(firstElement)) {
return Optional.of(new ArrayList<>(rm.getRanks().keySet()));
}
return Optional.empty();