From b422751b0a30e7de9927561f2dfe4d8ba7203ada Mon Sep 17 00:00:00 2001
From: Opal <58598304+Opalinium@users.noreply.github.com>
Date: Mon, 22 May 2023 14:56:25 -0700
Subject: [PATCH] Refactored 'N/A' placeholder to use configurable lang config
 string and ensured its refresh on plugin reload

---
 .../willfp/ecoskills/skills/EcoSkillsTopPlaceholder.kt | 10 ++++++----
 eco-core/core-plugin/src/main/resources/lang.yml       |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/EcoSkillsTopPlaceholder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/EcoSkillsTopPlaceholder.kt
index 732f9bc..c06e032 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/EcoSkillsTopPlaceholder.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/EcoSkillsTopPlaceholder.kt
@@ -15,6 +15,7 @@ class EcoSkillsSkillTopPlaceholder(
     override fun getPlugin(): EcoPlugin = plugin
 
     override fun getValue(params: String, ctx: PlaceholderContext): String? {
+        val emptyposition: String = plugin.langYml.getString("top.empty-position")
         val args = params.split("_")
 
         if (args.size < 3) {
@@ -30,8 +31,8 @@ class EcoSkillsSkillTopPlaceholder(
         val place = args[2].toIntOrNull() ?: return null
 
         return when (args.last()) {
-            "name" -> skill.getTop(place)?.player?.savedDisplayName ?: "N/A"
-            "level", "amount" -> skill.getTop(place)?.level?.toString() ?: "N/A"
+            "name" -> skill.getTop(place)?.player?.savedDisplayName ?: emptyposition
+            "level", "amount" -> skill.getTop(place)?.level?.toString() ?: emptyposition
             else -> null
         }
     }
@@ -46,6 +47,7 @@ class EcoSkillsTopPlaceholder(
     override fun getPlugin(): EcoPlugin = plugin
 
     override fun getValue(params: String, ctx: PlaceholderContext): String? {
+        val emptyposition: String = plugin.langYml.getString("top.empty-position")
         val args = params.split("_")
 
         if (args.size < 2) {
@@ -59,8 +61,8 @@ class EcoSkillsTopPlaceholder(
         val place = args[1].toIntOrNull() ?: return null
 
         return when (args.last()) {
-            "name" -> Skills.getTop(place)?.player?.savedDisplayName ?: "N/A"
-            "level", "amount" -> Skills.getTop(place)?.level?.toString() ?: "N/A"
+            "name" -> Skills.getTop(place)?.player?.savedDisplayName ?: emptyposition
+            "level", "amount" -> Skills.getTop(place)?.level?.toString() ?: emptyposition
             else -> null
         }
     }
diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml
index e4d4c9b..a6e666e 100644
--- a/eco-core/core-plugin/src/main/resources/lang.yml
+++ b/eco-core/core-plugin/src/main/resources/lang.yml
@@ -29,6 +29,7 @@ line-wrap-color: "&8"
 
 top-line-format: "%rank%. %player% - %level%"
 top:
+  empty-position: "&cN/A"
   format:
     - "---- Skills Leaderboard ----"
     - "%lines%"