fix ability-specific mods

Author: Simplicitee

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>project</groupId>
   <artifactId>items</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <name>BendingItems</name>
 
   <repositories>

src/me/simplicitee/project/items/BendingItem.java

@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.bukkit.entity.Player;
@@ -26,9 +27,9 @@ public enum Usage {
 	private ItemStack item;
 	private Usage usage;
 	private Element element;
-	private Map<CoreAbility, List<BendingModifier>> mods;
+	private Map<String, List<BendingModifier>> mods;
 
-	public BendingItem(String name, ItemStack item, Usage usage, Element element, Map<CoreAbility, List<BendingModifier>> mods) {
+	public BendingItem(String name, ItemStack item, Usage usage, Element element, Map<String, List<BendingModifier>> mods) {
 		this.name = name;
 		this.item = item;
 		this.usage = usage;
@@ -73,9 +74,12 @@ public ItemStack newStack() {
 	public List<String> listMods() {
 		List<String> mods = new ArrayList<>();
 		mods.add("Stats:");
-		for (CoreAbility ability : this.mods.keySet()) {
-			for (BendingModifier mod : this.mods.get(ability)) {
-				mods.add("- " + (ability != null ? ability.getName() : "Base") + mod.toString());
+		
+		for (Entry<String, List<BendingModifier>> entry : this.mods.entrySet()) {
+		    String ability = entry.getKey();
+		    
+			for (BendingModifier mod : entry.getValue()) {
+				mods.add("- " + (ability != null ? ability : "Base") + "." + mod.toString());
 			}
 		}
 
@@ -91,7 +95,7 @@ public void applyMods(CoreAbility abil, ItemStack stack) {
 
 		List<BendingModifier> specific = new ArrayList<>();
 
-		specific.addAll(mods.getOrDefault(abil, Collections.emptyList()));
+		specific.addAll(mods.getOrDefault(abil.getName().toLowerCase(), Collections.emptyList()));
 		specific.addAll(mods.getOrDefault(null, Collections.emptyList()));
 
 		if (specific.isEmpty()) {

src/me/simplicitee/project/items/ItemManager.java

@@ -275,21 +275,13 @@ public static BendingItem register(File file) throws IllegalArgumentException {
 		meta.getPersistentDataContainer().set(ID_KEY, PersistentDataType.INTEGER, id);
 		item.setItemMeta(meta);
 
-		Map<CoreAbility, List<BendingModifier>> mods = null;
+		Map<String, List<BendingModifier>> mods = null;
 		if (config.contains("Mods")) {
 			mods = new HashMap<>();
 
-			if (config.contains("Mods.Base")) {
-				mods.put(null, loadMods(config.getConfigurationSection("Mods.Base")));
-			}
-			
 			for (String key : config.getConfigurationSection("Mods").getKeys(false)) {
-				CoreAbility ability = CoreAbility.getAbility(key);
-				
-				if (ability == null) {
-					continue;
-				}
-				
+			    String ability = key.equalsIgnoreCase("Base") ? null : key.toLowerCase(); 
+			    
 				mods.put(ability, loadMods(config.getConfigurationSection("Mods." + key)));
 			}
 		}

src/plugin.yml

@@ -1,7 +1,7 @@
 name: BendingItems
 author: Simplicitee
 api-version: 1.16
-version: 1.6.1
+version: 1.6.2
 main: me.simplicitee.project.items.ItemsPlugin
 depend: [ProjectKorra]
 permissions: