From bfd75b05ba8b777e76bbfa8130f63b719dd472d8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 20 Jan 2022 09:53:30 +0000 Subject: [PATCH] Fixed placeholder bugs --- .../main/kotlin/com/willfp/ecoskills/skills/Skill.kt | 7 +++++++ .../src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt index 0c19989..57185f7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt @@ -99,6 +99,13 @@ abstract class Skill( true ).register() + PlaceholderEntry( + plugin, + "${id}_name", + { this.name }, + false + ).register() + PlaceholderEntry( plugin, "average_skill_level", diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt index 4d7f9c4..e17b5f1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt @@ -6,11 +6,15 @@ import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry import com.willfp.eco.util.NumberUtils -import com.willfp.ecoskills.* +import com.willfp.ecoskills.EcoSkillsPlugin +import com.willfp.ecoskills.SkillObject +import com.willfp.ecoskills.getBaseStatLevel +import com.willfp.ecoskills.getBonusStatLevel +import com.willfp.ecoskills.getStatLevel import org.bukkit.NamespacedKey import org.bukkit.entity.Player import org.bukkit.event.Listener -import java.util.* +import java.util.UUID abstract class Stat( id: String @@ -44,7 +48,7 @@ abstract class Stat( } fun update() { - name = config.getString("name") + name = config.getFormattedString("name") PlaceholderEntry( plugin,