From ef173a23360ef1928368eb109c139af7b5f503d6 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Thu, 9 Mar 2023 18:58:17 +0100 Subject: [PATCH] Added categories to registeredSkills --- .../Indyuce/mmocore/skill/RegisteredSkill.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java index f8ec05a2..1504d090 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java @@ -11,11 +11,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public class RegisteredSkill implements Unlockable { private final SkillHandler handler; @@ -23,7 +19,7 @@ public class RegisteredSkill implements Unlockable { private final Map defaultModifiers = new HashMap<>(); private final ItemStack icon; private final List lore; - + private final List categories; @NotNull private final TriggerType triggerType; @@ -33,7 +29,7 @@ public class RegisteredSkill implements Unlockable { name = Objects.requireNonNull(config.getString("name"), "Could not find skill name"); icon = MMOCoreUtils.readIcon(Objects.requireNonNull(config.getString("material"), "Could not find skill icon")); lore = Objects.requireNonNull(config.getStringList("lore"), "Could not find skill lore"); - + categories = config.getStringList("categories"); // Trigger type triggerType = getHandler().isTriggerable() ? (config.contains("passive-type") ? TriggerType.valueOf(UtilityMethods.enumName(config.getString("passive-type"))) : TriggerType.CAST) : TriggerType.API; @@ -54,6 +50,7 @@ public class RegisteredSkill implements Unlockable { this.icon = icon; this.lore = lore; this.triggerType = triggerType; + this.categories = new ArrayList<>(); } @Override @@ -73,6 +70,10 @@ public class RegisteredSkill implements Unlockable { return lore; } + public List getCategories() { + return categories; + } + public ItemStack getIcon() { return icon.clone(); } @@ -98,7 +99,7 @@ public class RegisteredSkill implements Unlockable { /** * @return Modifier formula. - * Not null as long as the modifier is well defined + * Not null as long as the modifier is well defined */ @NotNull public LinearValue getModifierInfo(String modifier) {