From 012450d3a5eb1de429b11d3815d1aa921bac503b Mon Sep 17 00:00:00 2001 From: Diamondback88 <23108617+Diamondback88@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:22:46 -0500 Subject: [PATCH 1/3] Fix some msgs --- .../parallelutils/modules/points/commands/ViewPoints.java | 3 ++- .../modules/points/events/OnAdvancementDone.java | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/src/main/java/parallelmc/parallelutils/modules/points/commands/ViewPoints.java b/modules/src/main/java/parallelmc/parallelutils/modules/points/commands/ViewPoints.java index 898c4157..58c050b8 100644 --- a/modules/src/main/java/parallelmc/parallelutils/modules/points/commands/ViewPoints.java +++ b/modules/src/main/java/parallelmc/parallelutils/modules/points/commands/ViewPoints.java @@ -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; } diff --git a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java index 19e369ec..43f95cfd 100644 --- a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java +++ b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java @@ -23,10 +23,7 @@ public void onAdvancementDone(PlayerAdvancementDoneEvent event) { } 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 currently have " + points + " advancement " + ((points == 1) ? "point!" : "points!")); } } From d495b45bd4bcaf0113a0e31bf4bbb36e295ef864 Mon Sep 17 00:00:00 2001 From: Diamondback88 <23108617+Diamondback88@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:26:26 -0500 Subject: [PATCH 2/3] Get rid of root and recipe advancements spamming console --- .../modules/points/events/OnAdvancementDone.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java index 43f95cfd..e22babb1 100644 --- a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java +++ b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java @@ -16,14 +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 ParallelChat.sendDelayedParallelMessageTo(player, 1, - "You currently have " + points + " advancement " + ((points == 1) ? "point!" : "points!")); + "You've received " + points + " advancement " + ((points == 1) ? "point!" : "points!")); } } From c5a791b56c361e2c2a04bbd81cf663ded5f01c5a Mon Sep 17 00:00:00 2001 From: Diamondback88 <23108617+Diamondback88@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:30:19 -0500 Subject: [PATCH 3/3] Make not equals checks not stupidly formatted --- .../parallelutils/modules/points/events/OnAdvancementDone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java index e22babb1..d309c22e 100644 --- a/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java +++ b/modules/src/main/java/parallelmc/parallelutils/modules/points/events/OnAdvancementDone.java @@ -22,7 +22,7 @@ public void onAdvancementDone(PlayerAdvancementDoneEvent event) { // 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)) { + if (advancement.getRoot() != advancement && advancement.getDisplay() != null) { ParallelUtils.log(Level.WARNING, "Advancement " + advancement.getKey().asString() + " has no associated point value! Skipping..."); } return;