From c62d468991e0efe1cb6d0d76b646dbf227695535 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Mon, 23 Jan 2023 17:37:51 +0100 Subject: [PATCH] New placeholders when casting skills. --- .../main/java/net/Indyuce/mmocore/skill/CastableSkill.java | 5 +++-- MMOCore-Dist/src/main/resources/default/messages.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java index 7de8ee76..c9a31247 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java @@ -43,13 +43,14 @@ public class CastableSkill extends Skill { // Cooldown check if (skillMeta.getCaster().getData().getCooldownMap().isOnCooldown(this)) { - if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.on-cooldown").send(playerData.getPlayer()); + if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.on-cooldown", + "cooldown",MythicLib.plugin.getMMOConfig().decimal.format(skillMeta.getCaster().getData().getCooldownMap().getCooldown(this))).send(playerData.getPlayer()); return false; } // Mana cost if (playerData.getMana() < getModifier("mana")) { - if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.no-mana", "mana", playerData.getProfess().getManaDisplay().getName()).send(playerData.getPlayer()); + if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.no-mana", "mana-required",MythicLib.plugin.getMMOConfig().decimal.format((getModifier("mana")-playerData.getMana())),"mana", playerData.getProfess().getManaDisplay().getName()).send(playerData.getPlayer()); return false; } diff --git a/MMOCore-Dist/src/main/resources/default/messages.yml b/MMOCore-Dist/src/main/resources/default/messages.yml index bb41193d..ef1e2be6 100644 --- a/MMOCore-Dist/src/main/resources/default/messages.yml +++ b/MMOCore-Dist/src/main/resources/default/messages.yml @@ -57,9 +57,9 @@ casting: no-stamina: '&6[{index}] &9&l{skill}' split: '&7 &7 - &7 ' no-longer: '%&cYou cancelled skill casting.' - no-mana: '&cYou do not have enough {mana}!' + no-mana: '&cYou do not have enough {mana}, {mana-required} more required!' no-stamina: '&cYou do not have enough stamina!' - on-cooldown: '&cThis skill is on cooldown.' + on-cooldown: '&cThis skill is on a {cooldown} cooldown.' # Combat Log now-in-combat: '%&cYou are now in combat!'