From 48a2ada8e65d99e2ff0e49efc94dd19e3c5085a8 Mon Sep 17 00:00:00 2001 From: Gunging <48371009+Gunging@users.noreply.github.com> Date: Thu, 3 Mar 2022 13:01:16 -0600 Subject: [PATCH] Allows {mana_color} placeholder in class skill lore, to complement {mana_name} --- .../api/player/profess/resource/ManaDisplayOptions.java | 4 ++++ src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java index 970d329a..2e238aec 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java @@ -12,6 +12,10 @@ public class ManaDisplayOptions { private final String name, icon; private final char barCharacter; + public ChatColor getFull() { return full; } + public ChatColor getHalf() { return half; } + public ChatColor getEmpty() { return empty; } + public static final ManaDisplayOptions DEFAULT = new ManaDisplayOptions(ChatColor.AQUA, ChatColor.BLUE, ChatColor.WHITE, "Mana", AltChar.listSquare.charAt(0), ChatColor.BLUE + AltChar.star2); diff --git a/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java b/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java index 47934579..f87e6f44 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java +++ b/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java @@ -83,6 +83,7 @@ public class ClassSkill implements CooldownObject { Map placeholders = calculateModifiers(x); placeholders.put("mana_name", data.getProfess().getManaDisplay().getName()); + placeholders.put("mana_color", data.getProfess().getManaDisplay().getFull().toString()); skill.getLore().forEach(str -> list.add(applyPlaceholders(placeholders, str))); return list;