Skip to content

Point system #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Diamondback88 merged 4 commits into from
Dec 20, 2024
Merged

Point system #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
012450d
Fix some msgs
Diamondback88 Dec 19, 2024
d495b45
Get rid of root and recipe advancements spamming console
Diamondback88 Dec 19, 2024
c5a791b
Make not equals checks not stupidly formatted
Diamondback88 Dec 19, 2024
0ec2ba3
Merge branch 'staging' into point-system
Diamondback88 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/src/main/java/parallelmc/parallelutils/modules/points/commands/ViewPoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public class ViewPoints implements CommandExecutor {
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (commandSender instanceof Player player) {
int points = Points.get().getPlayerPoints(player);
ParallelChat.sendParallelMessageTo(player, "You currently have " + points + " advancement points!");
ParallelChat.sendParallelMessageTo(player,
"You currently have " + points + " advancement " + ((points == 1) ? "point!" : "points!"));
}
return true;
}
Expand Down
16 changes: 10 additions & 6 deletions modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@ public class OnAdvancementDone implements Listener {
public void onAdvancementDone(PlayerAdvancementDoneEvent event) {
Advancement advancement = event.getAdvancement();
Player player = event.getPlayer();

int points = Points.get().getPointsForAdvancement(advancement);
if (points == -1) {
ParallelUtils.log(Level.WARNING, "Advancement " + advancement.getKey().asString() + " has no associated point value! Skipping...");
// If the advancement is a root advancement or recipes advancement, don't print an error message.
// We can assume that advancements without displays are recipe advancements
// ParallelUtils.log(Level.WARNING, advancementTitle.toString());
if (advancement.getRoot() != advancement && advancement.getDisplay() != null) {
ParallelUtils.log(Level.WARNING, "Advancement " + advancement.getKey().asString() + " has no associated point value! Skipping...");
}
return;
}

Points.get().awardPoints(player, points);
// wait 1 tick to send the message so it shows after the advancement
if (points == 1) {
ParallelChat.sendDelayedParallelMessageTo(player, 1, "You've received " + points + " advancement point!");
} else {
ParallelChat.sendDelayedParallelMessageTo(player, 1, "You've received " + points + " advancement points!");
}
ParallelChat.sendDelayedParallelMessageTo(player, 1,
"You've received " + points + " advancement " + ((points == 1) ? "point!" : "points!"));
}
}
Loading