Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2026-01-03 06:12:21 +00:00
Code Issues Releases 1 Activity

Minor changes

Browse Source
This commit is contained in:
_OfTeN_
2023-06-01 22:59:08 +03:00
parent e4511ca4d3
commit 9ee5607fc3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt
View File

@@ -126,7 +126,7 @@ class ActionBarHandler(
}
}
private object PlayerHealthInjectable : PlaceholderInjectable {
object PlayerHealthInjectable : PlaceholderInjectable {
private val injections = listOf(
PlayerStaticPlaceholder(
"health"

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
View File

@@ -84,10 +84,10 @@ class Skill(
private val rewardMessages = mutableMapOf<Int, List<String>>()
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")

7
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt
View File

@@ -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
))
}