Skip to content

Commit

Permalink
Rename "criteria" with "progression" in method names
Browse files Browse the repository at this point in the history 
Rename methods like getCriteriaProgression to getProgression to improve comprehensibility.
This also updates javadoc.
  • Loading branch information
@frengor
frengor committed Nov 18, 2021
1 parent 20d5bc3 commit 598b60b
Show file tree
Hide file tree
Showing 45 changed files with 608 additions and 608 deletions.
1 change: 1 addition & 0 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 31 additions & 42 deletions ...ultimateAdvancementAPI/commands/commandAPI_v5_12/UltimateAdvancementAPICommand_v5_12.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,9 @@
import java.util.List;
import java.util.Objects;

public class UltimateAdvancementAPICommand_v5_12 {
import static com.fren_gor.ultimateAdvancementAPI.commands.CommandAPIManager.*;

public static final String PERMISSION_MAIN = "ultimateadvancementapi.command";
public static final String PERMISSION_CRITERIA = "ultimateadvancementapi.criteria";
public static final String PERMISSION_CRITERIA_GET = "ultimateadvancementapi.criteria.get";
public static final String PERMISSION_CRITERIA_SET = "ultimateadvancementapi.criteria.set";
public static final String PERMISSION_GRANT = "ultimateadvancementapi.grant";
public static final String PERMISSION_GRANT_ALL = "ultimateadvancementapi.grant.all";
public static final String PERMISSION_GRANT_TAB = "ultimateadvancementapi.grant.tab";
public static final String PERMISSION_GRANT_ONE = "ultimateadvancementapi.grant.one";
public static final String PERMISSION_REVOKE = "ultimateadvancementapi.revoke";
public static final String PERMISSION_REVOKE_ALL = "ultimateadvancementapi.revoke.all";
public static final String PERMISSION_REVOKE_TAB = "ultimateadvancementapi.revoke.tab";
public static final String PERMISSION_REVOKE_ONE = "ultimateadvancementapi.revoke.one";
public class UltimateAdvancementAPICommand_v5_12 {

private final AdvancementMain main;

Expand All @@ -42,8 +31,8 @@ protected UltimateAdvancementAPICommand_v5_12(@NotNull AdvancementMain main) {

@SuppressWarnings("unchecked")
public void register() {
CommandAPICommand mainCommand = new CommandAPICommand("ultimateadvancementapi").withPermission(PERMISSION_MAIN).withAliases("uladvapi", "uladv", "uaapi").executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi <criteria|grant|revoke> ...");
CommandAPICommand mainCommand = new CommandAPICommand("ultimateadvancementapi").withPermission(PERMISSION_MAIN_COMMAND).withAliases("uladvapi", "uladv", "uaapi").executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi <progression|grant|revoke> ...");
});

CommandAPICommand grant = new CommandAPICommand("grant").withPermission(PERMISSION_GRANT).executes((sender, args) -> {
Expand Down Expand Up @@ -101,28 +90,28 @@ public void register() {
revoke.withSubcommand(new CommandAPICommand("one").withPermission(PERMISSION_REVOKE_ONE).withArguments(new AdvancementArgument_v5_12(main, "advancement")).executesPlayer((Player player, Object[] args) -> revokeOne(player, (Advancement) args[0], player)));
revoke.withSubcommand(new CommandAPICommand("one").withPermission(PERMISSION_REVOKE_ONE).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS)).executes((CommandSender sender, Object[] args) -> revokeOne(sender, (Advancement) args[0], (Collection<Player>) args[1])));

CommandAPICommand criteria = new CommandAPICommand("criteria").withPermission(PERMISSION_CRITERIA).executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi criteria <get|set> ...");
CommandAPICommand progression = new CommandAPICommand("progression").withPermission(PERMISSION_PROGRESSION).executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi progression <get|set> ...");
});

criteria.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_CRITERIA_GET).executesPlayer((player, args) -> {
player.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi criteria get <advancement> [player]");
progression.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_PROGRESSION_GET).executesPlayer((player, args) -> {
player.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi progression get <advancement> [player]");
}).executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi criteria get <advancement> <player>");
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi progression get <advancement> <player>");
}));
criteria.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_CRITERIA_GET).withArguments(new AdvancementArgument_v5_12(main, "advancement")).executesPlayer((Player player, Object[] args) -> getCriteria(player, (Advancement) args[0], player)));
criteria.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_CRITERIA_GET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS)).executes((CommandSender sender, Object[] args) -> getCriteria(sender, (Advancement) args[0], (Collection<Player>) args[1])));
progression.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_PROGRESSION_GET).withArguments(new AdvancementArgument_v5_12(main, "advancement")).executesPlayer((Player player, Object[] args) -> getProgression(player, (Advancement) args[0], player)));
progression.withSubcommand(new CommandAPICommand("get").withPermission(PERMISSION_PROGRESSION_GET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS)).executes((CommandSender sender, Object[] args) -> getProgression(sender, (Advancement) args[0], (Collection<Player>) args[1])));

criteria.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_CRITERIA_SET).executesPlayer((player, args) -> {
player.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi criteria set <advancement> <criteria> [player] [giveRewards]");
progression.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_PROGRESSION_SET).executesPlayer((player, args) -> {
player.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi progression set <advancement> <progression> [player] [giveRewards]");
}).executes((sender, args) -> {
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi criteria set <advancement> <criteria> <player> [giveRewards]");
sender.sendMessage(ChatColor.RED + "Usage: /ultimateadvancementapi progression set <advancement> <progression> <player> [giveRewards]");
}));
criteria.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_CRITERIA_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("criteria", 0)).executesPlayer((Player player, Object[] args) -> setCriteria(player, (Advancement) args[0], (int) args[1], player, true)));
criteria.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_CRITERIA_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("criteria", 0), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS)).executes((CommandSender sender, Object[] args) -> setCriteria(sender, (Advancement) args[0], (int) args[1], (Collection<Player>) args[2], true)));
criteria.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_CRITERIA_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("criteria", 0), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS), new BooleanArgument("giveRewards")).executes((CommandSender sender, Object[] args) -> setCriteria(sender, (Advancement) args[0], (int) args[1], (Collection<Player>) args[2], (boolean) args[3])));
progression.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_PROGRESSION_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("progression", 0)).executesPlayer((Player player, Object[] args) -> setProgression(player, (Advancement) args[0], (int) args[1], player, true)));
progression.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_PROGRESSION_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("progression", 0), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS)).executes((CommandSender sender, Object[] args) -> setProgression(sender, (Advancement) args[0], (int) args[1], (Collection<Player>) args[2], true)));
progression.withSubcommand(new CommandAPICommand("set").withPermission(PERMISSION_PROGRESSION_SET).withArguments(new AdvancementArgument_v5_12(main, "advancement"), new IntegerArgument("progression", 0), new EntitySelectorArgument("player", EntitySelector.MANY_PLAYERS), new BooleanArgument("giveRewards")).executes((CommandSender sender, Object[] args) -> setProgression(sender, (Advancement) args[0], (int) args[1], (Collection<Player>) args[2], (boolean) args[3])));

mainCommand.withSubcommand(criteria);
mainCommand.withSubcommand(progression);
mainCommand.withSubcommand(grant);
mainCommand.withSubcommand(revoke);
mainCommand.register();
Expand Down Expand Up @@ -228,30 +217,30 @@ private void revokeOne(CommandSender sender, Advancement advancement, Collection
}
}

private int getCriteria(CommandSender sender, Advancement advancement, Player player) throws WrapperCommandSyntaxException {
return getCriteria(sender, advancement, List.of(player));
private int getProgression(CommandSender sender, Advancement advancement, Player player) throws WrapperCommandSyntaxException {
return getProgression(sender, advancement, List.of(player));
}

private int getCriteria(CommandSender sender, Advancement advancement, Collection<Player> players) throws WrapperCommandSyntaxException {
private int getProgression(CommandSender sender, Advancement advancement, Collection<Player> players) throws WrapperCommandSyntaxException {
validatePlayerArgument(players);
int criteria = 0;
int progression = 0;
for (Player p : players) {
criteria = advancement.getCriteriaProgression(p);
sender.sendMessage(ChatColor.YELLOW + p.getName() + ChatColor.GREEN + " criteria is " + ChatColor.YELLOW + criteria + '/' + advancement.getMaxCriteria());
progression = advancement.getProgression(p);
sender.sendMessage(ChatColor.YELLOW + p.getName() + ChatColor.GREEN + " progression is " + ChatColor.YELLOW + progression + '/' + advancement.getMaxProgression());
}
return criteria;
return progression;
}

private void setCriteria(CommandSender sender, Advancement advancement, int criteria, Player player, boolean giveRewards) throws WrapperCommandSyntaxException {
setCriteria(sender, advancement, criteria, List.of(player), giveRewards);
private void setProgression(CommandSender sender, Advancement advancement, int progression, Player player, boolean giveRewards) throws WrapperCommandSyntaxException {
setProgression(sender, advancement, progression, List.of(player), giveRewards);
}

private void setCriteria(CommandSender sender, Advancement advancement, int criteria, Collection<Player> players, boolean giveRewards) throws WrapperCommandSyntaxException {
private void setProgression(CommandSender sender, Advancement advancement, int progression, Collection<Player> players, boolean giveRewards) throws WrapperCommandSyntaxException {
validatePlayerArgument(players);
for (Player p : players) {
criteria = Math.min(advancement.getMaxCriteria(), criteria);
advancement.setCriteriaProgression(p, criteria, giveRewards);
sender.sendMessage(ChatColor.GREEN + "Set criteria " + ChatColor.YELLOW + criteria + '/' + advancement.getMaxCriteria() + ChatColor.GREEN + " for " + ChatColor.YELLOW + p.getName());
progression = Math.min(advancement.getMaxProgression(), progression);
advancement.setProgression(p, progression, giveRewards);
sender.sendMessage(ChatColor.GREEN + "Set " + ChatColor.YELLOW + p.getName() + ChatColor.GREEN + " progression to " + ChatColor.YELLOW + progression + '/' + advancement.getMaxProgression());
}
}

Expand Down
Loading

0 comments on commit 598b60b

Please sign in to comment.