From a489c9aa3eafb7963631d1fe8becdaf67e128f28 Mon Sep 17 00:00:00 2001 From: UpInSmoke Date: Thu, 23 Feb 2023 11:24:15 -0500 Subject: [PATCH 1/2] add more placeholders --- .../elitemobs/thirdparty/placeholderapi/Placeholders.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java b/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java index b076026d2..87e9eedc0 100644 --- a/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java +++ b/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java @@ -142,6 +142,14 @@ public String onPlaceholderRequest(Player player, String identifier) { return "" + PlayerData.getKills(player.getUniqueId()); case "player_deaths": return "" + PlayerData.getDeaths(player.getUniqueId()); + case "player_highest_kill": + return "" + PlayerData.getHighestLevelKilled(player.getUniqueId()); + case "player_quests_active": + return "" + PlayerData.getQuests(player.getUniqueId()); + case "player_quests_completed": + return "" + PlayerData.getQuestsCompleted(player.getUniqueId()); + case "player_score": + return "" + PlayerData.getScore(player.getUniqueId()); } // We return null if an invalid placeholder (f.e. %someplugin_placeholder3%) From 7d69433f2fcbba446120500bd328a99e63f9bd17 Mon Sep 17 00:00:00 2001 From: UpInSmoke Date: Sun, 12 Mar 2023 19:03:49 -0400 Subject: [PATCH 2/2] add more placeholders --- .../thirdparty/placeholderapi/Placeholders.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java b/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java index 87e9eedc0..79e39d3f9 100644 --- a/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java +++ b/src/main/java/com/magmaguy/elitemobs/thirdparty/placeholderapi/Placeholders.java @@ -137,11 +137,13 @@ public String onPlaceholderRequest(Player player, String identifier) { } return highestGuildUser; case "player_shortened_guild_rank": - return AdventurersGuildConfig.getShortenedRankName(GuildRank.getGuildPrestigeRank(player, false), GuildRank.getActiveGuildRank(player, false)); + return AdventureMessage.rawString(AdventurersGuildConfig.getShortenedRankName(GuildRank.getGuildPrestigeRank(player, false), GuildRank.getActiveGuildRank(player, false))); case "player_kills": return "" + PlayerData.getKills(player.getUniqueId()); case "player_deaths": - return "" + PlayerData.getDeaths(player.getUniqueId()); + return "" + getDeaths(player.getUniqueId()); + case "player_kd_ratio": + return "" + Round.twoDecimalPlaces(PlayerData.getKills(player.getUniqueId()) / (double) PlayerData.getDeaths(player.getUniqueId())); case "player_highest_kill": return "" + PlayerData.getHighestLevelKilled(player.getUniqueId()); case "player_quests_active": @@ -150,6 +152,14 @@ public String onPlaceholderRequest(Player player, String identifier) { return "" + PlayerData.getQuestsCompleted(player.getUniqueId()); case "player_score": return "" + PlayerData.getScore(player.getUniqueId()); + case "player_next_rank_cost": + return "" + GuildRankMenuHandler.tierPriceCalculator(GuildRank.getMaxGuildRank(player) + 1, GuildRank.getGuildPrestigeRank(player)); + case "player_next_rank_needed": + double neededCoins = Round.twoDecimalPlaces(GuildRankMenuHandler.tierPriceCalculator(GuildRank.getMaxGuildRank(player) + 1, GuildRank.getGuildPrestigeRank(player)) - PlayerData.getCurrency(player.getUniqueId())); + return neededCoins > 0 ? "" + neededCoins : "§a0§r"; + case "player_next_prestige_cost": + return "" + GuildRankMenuHandler.tierPriceCalculator(GuildRank.getGuildPrestigeRank(player) + 12, GuildRank.getGuildPrestigeRank(player)); + } // We return null if an invalid placeholder (f.e. %someplugin_placeholder3%)