From 9ee5607fc3c7667c3a06f74a4f6937de431fe108 Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Thu, 1 Jun 2023 22:59:08 +0300 Subject: [PATCH] Minor changes --- .../com/willfp/ecoskills/actionbar/ActionBarHandler.kt | 2 +- .../src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt | 4 ++-- .../com/willfp/ecoskills/skills/display/GainXPDisplay.kt | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt index ec10740..aa1cb46 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt @@ -126,7 +126,7 @@ class ActionBarHandler( } } - private object PlayerHealthInjectable : PlaceholderInjectable { + object PlayerHealthInjectable : PlaceholderInjectable { private val injections = listOf( PlayerStaticPlaceholder( "health" 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 453fcca..ae56c68 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 @@ -84,10 +84,10 @@ class Skill( private val rewardMessages = mutableMapOf>() - val levelGUI = SkillLevelGUI(plugin, this) - val icon = SkillIcon(this, config.getSubsection("gui"), plugin) + val levelGUI = SkillLevelGUI(plugin, this) + init { if (xpFormula == null && requirements == null) { throw InvalidConfigurationException("Skill $id has no requirements or xp formula") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt index a5d22f0..f404c13 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt @@ -4,10 +4,12 @@ import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.core.data.profile +import com.willfp.eco.core.placeholder.context.placeholderContext import com.willfp.eco.core.sound.PlayableSound import com.willfp.eco.util.formatEco import com.willfp.eco.util.namespacedKeyOf import com.willfp.eco.util.toNiceString +import com.willfp.ecoskills.actionbar.ActionBarHandler import com.willfp.ecoskills.actionbar.sendCompatibleActionBarMessage import com.willfp.ecoskills.api.event.PlayerSkillXPGainEvent import com.willfp.ecoskills.api.getFormattedRequiredXP @@ -113,5 +115,8 @@ class GainXPDisplay( .replace("%current_xp%", event.player.getSkillXP(event.skill).toNiceString()) .replace("%required_xp%", event.player.getFormattedRequiredXP(event.skill)) .replace("%gained_xp%", event.gainedXP.toNiceString()) - .formatEco(event.player, true) + .formatEco(placeholderContext( + event.player, + injectable = ActionBarHandler.PlayerHealthInjectable + )) }