From fa285777575b80c8d726e0ad51be7418ebd31975 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Fri, 27 Jan 2023 11:39:48 +0000
Subject: [PATCH] Cleaned up PR

---
 .../placeholders/EcoSkillsTopExpansion.kt     | 28 +++++++++++--------
 .../core-plugin/src/main/resources/lang.yml   |  2 --
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/placeholders/EcoSkillsTopExpansion.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/placeholders/EcoSkillsTopExpansion.kt
index 148d956..73a5da0 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/placeholders/EcoSkillsTopExpansion.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/placeholders/EcoSkillsTopExpansion.kt
@@ -14,7 +14,7 @@ class EcoSkillsTopExpansion(val plugin: EcoSkillsPlugin): PlaceholderExpansion()
      * @return placeholder identifier that is associated with this expansion
      */
     override fun getIdentifier(): String {
-        return "ecoskillstop"
+        return "ecoskills"
     }
 
     /**
@@ -23,7 +23,7 @@ class EcoSkillsTopExpansion(val plugin: EcoSkillsPlugin): PlaceholderExpansion()
      * @return name of the author for this expansion
      */
     override fun getAuthor(): String {
-        return "_OfTeN_"
+        return "Auxilor"
     }
 
     /**
@@ -37,17 +37,23 @@ class EcoSkillsTopExpansion(val plugin: EcoSkillsPlugin): PlaceholderExpansion()
 
     override fun onRequest(player: OfflinePlayer?, params: String): String? {
         val args = params.split("_")
-        val skill = Skills.getByID(args.firstOrNull()?.lowercase() ?: return "Invalid skill")
-        val place = args.getOrNull(1)?.toIntOrNull() ?: return "Invalid place (must be an integer)"
+
+        if (args.size < 3) {
+            return ""
+        }
+
+        if (args[0] != "top") {
+            return ""
+        }
+
+        val skill = Skills.getByID(args[1]) ?: return ""
+
+        val place = args[2].toIntOrNull() ?: return ""
 
         return when (args.lastOrNull() ?: return "Invalid type: ${args.lastOrNull()}. Must be name/amount") {
-            "name" -> skill?.getTop(place)?.player?.savedDisplayName ?: plugin.langYml.getFormattedString(
-                "top.name-empty"
-            )
-            "amount" -> skill?.getTop(place)?.amount?.toString() ?: plugin.langYml.getFormattedString(
-                "top.amount-empty"
-            )
+            "name" -> skill.getTop(place)?.player?.savedDisplayName ?: ""
+            "amount" -> skill.getTop(place)?.amount?.toString() ?: ""
             else -> null
         }
     }
-}
\ No newline at end of file
+}
diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml
index 847011a..65fd355 100644
--- a/eco-core/core-plugin/src/main/resources/lang.yml
+++ b/eco-core/core-plugin/src/main/resources/lang.yml
@@ -45,8 +45,6 @@ top:
   format:
     - "---- Skills Leaderboard ----"
     - "%lines%"
-  name-empty: "&cEmpty"
-  amount-empty: "&0"
 
 menu:
   title: "Your Skills"