Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Added messages for on cooldown and no mana in spell casting

Browse Source
This commit is contained in:
Aria 2019-10-18 00:00:09 +02:00
parent 795a878110
commit 11c4c05bc1
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/Indyuce/mmocore/listener/SpellCast.java
View File

@ -48,7 +48,9 @@ public class SpellCast implements Listener {
public class SkillCasting extends BukkitRunnable implements Listener { public class SkillCasting extends BukkitRunnable implements Listener {
private final PlayerData playerData; private final PlayerData playerData;
private final String format = MMOCore.plugin.configManager.getSimpleMessage("casting.action-bar"); private final String ready = MMOCore.plugin.configManager.getSimpleMessage("casting.action-bar.ready");
private final String onCooldown = MMOCore.plugin.configManager.getSimpleMessage("casting.action-bar.on-cooldown");
private final String noMana = MMOCore.plugin.configManager.getSimpleMessage("casting.action-bar.no-mana");
private final String split = MMOCore.plugin.configManager.getSimpleMessage("casting.split"); private final String split = MMOCore.plugin.configManager.getSimpleMessage("casting.split");
private int j; private int j;
@ -105,11 +107,20 @@ public class SpellCast implements Listener {
private String getFormat(PlayerData data) { private String getFormat(PlayerData data) {
String str = ""; String str = "";
for (int j = 0; j < data.getBoundSkills().size(); j++) for (int j = 0; j < data.getBoundSkills().size(); j++)
str += (str.isEmpty() ? "" : split) + format.replace("{index}", "" + (j + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= j ? 1 : 0))).replace("{skill}", data.getBoundSkill(j).getSkill().getName()); str += (str.isEmpty() ? "" : split) + (onCooldown(data, j) && data.getBoundSkill(j).getSkill().hasModifier("cooldown") ? onCooldown.replace("{cooldown}", "" + ((int) data.getSkillData().getCooldown(data.getBoundSkill(j)) / 100) / 5) :
noMana(data, j) ? noMana : ready).replace("{index}", "" + (j + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= j ? 1 : 0))).replace("{skill}", data.getBoundSkill(j).getSkill().getName());
return str; return str;
} }
private boolean onCooldown(PlayerData data, int index) {
return data.getBoundSkill(index).getSkill().hasModifier("cooldown") && data.getSkillData().getCooldown(data.getBoundSkill(index)) > 0;
}
private boolean noMana(PlayerData data, int index) {
return data.getBoundSkill(index).getSkill().hasModifier("mana") && data.getBoundSkill(index).getModifier("mana", data.getSkillLevel(data.getBoundSkill(index).getSkill())) > data.getMana();
}
@Override @Override
public void run() { public void run() {
if (!playerData.isOnline() || playerData.getPlayer().isDead()) if (!playerData.isOnline() || playerData.getPlayer().isDead())

5
src/main/resources/default/messages.yml
View File

@ -43,7 +43,10 @@ player-input:
# Spell Casting # Spell Casting
casting: casting:
action-bar: '&6[{index}] &a&l{skill}' action-bar:
ready:'&6[{index}] &a&l{skill}'
on-cooldown: '&6[{index}] &c&l{skill} &6(&c{cooldown}&6)'
no-mana: '&6[{index}] &9&l{skill}'
split: '&7 &7 - &7 ' split: '&7 &7 - &7 '
no-longer: '&cYou cancelled skill casting.' no-longer: '&cYou cancelled skill casting.'
no-mana: '&cYou do not have enough mana!' no-mana: '&cYou do not have enough mana!'