From d8b4567f55b18b112ef33e0865255afab17f3bb9 Mon Sep 17 00:00:00 2001 From: LeonDev_ <134792244+LeonUwU1@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:11:43 +0200 Subject: [PATCH 1/3] Update MineBlocksPlaceholders.java --- .../integration/papi/MineBlocksPlaceholders.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java b/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java index 497f2e8..81d2eda 100644 --- a/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java +++ b/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.UUID; @RequiredArgsConstructor public class MineBlocksPlaceholders extends PlaceholderExpansion { @@ -72,8 +73,19 @@ private Optional getBlock(List params) { BlockCoolDown coolDown = block.getCoolDown(); if (!coolDown.isActive()) return ""; return block.getPlugin().getConfiguration().getLangConfig().getTimeoutFormatted(coolDown.getActive().getEnd()); + case "rank": + return getPlayerRank(block, player.getUniqueId()).map(String::valueOf).orElse("not_ranked"); default: return null; } } + private Optional getPlayerRank(MineBlock block, UUID playerUUID) { + List topPlayers = block.getTop().getTopPlayers(); + for (int i = 0; i < topPlayers.size(); i++) { + if (topPlayers.get(i).getUniqueId().equals(playerUUID)) { + return Optional.of(i + 1); // Rank is 1-based + } + } + return Optional.empty(); + } } From d2a620b0f6458f8161e856f249bfe88f64249865 Mon Sep 17 00:00:00 2001 From: LeonDev_ <134792244+LeonUwU1@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:20:17 +0200 Subject: [PATCH 2/3] Pridani %mb_id_rank% --- .../blocks/integration/papi/MineBlocksPlaceholders.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java b/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java index 81d2eda..6b9b502 100644 --- a/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java +++ b/src/main/java/cz/raixo/blocks/integration/papi/MineBlocksPlaceholders.java @@ -74,15 +74,15 @@ private Optional getBlock(List params) { if (!coolDown.isActive()) return ""; return block.getPlugin().getConfiguration().getLangConfig().getTimeoutFormatted(coolDown.getActive().getEnd()); case "rank": - return getPlayerRank(block, player.getUniqueId()).map(String::valueOf).orElse("not_ranked"); + return getPlayerRank(block, player.getUniqueId()).map(String::valueOf).orElse(getNotRankedMessage()); default: return null; } } private Optional getPlayerRank(MineBlock block, UUID playerUUID) { - List topPlayers = block.getTop().getTopPlayers(); + List topPlayers = block.getTop().getPlayers(); for (int i = 0; i < topPlayers.size(); i++) { - if (topPlayers.get(i).getUniqueId().equals(playerUUID)) { + if (topPlayers.get(i).getUuid().equals(playerUUID)) { return Optional.of(i + 1); // Rank is 1-based } } From a56ebf9a3448bb341d17ee3334afbf851e970fd3 Mon Sep 17 00:00:00 2001 From: LeonDev_ <134792244+LeonUwU1@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:32:35 +0200 Subject: [PATCH 3/3] Update config.yml --- src/main/resources/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 68f7b52..e9fb922 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,3 +1,5 @@ +messages: + not_ranked: "not ranked" # nebo jakákoli jiná zpráva, kterou chcete použít lang: top: nobody: "&cNobody" @@ -110,4 +112,4 @@ blocks: from: 10 to: 50 commands: - - "100;give %player% iron_nugget" \ No newline at end of file + - "100;give %player% iron_nugget"