itemability

Author: mrsterner

Diff for: src/main/kotlin/dev/sterner/api/item/ItemAbility.kt

@@ -20,9 +20,10 @@ enum class ItemAbility(private val equipmentSlot: EquipmentSlot?, private val cl
     fun getAbilityFromItem(item: Item): List<ItemAbility> {
         val list = mutableListOf<ItemAbility>()
         for (ability in entries) {
-            if (ability.equipmentSlot == equipmentSlot) {
+            // Check if the item matches the clazz or the equipmentSlot
+            if (ability.equipmentSlot == null && ability.clazz?.isInstance(item) == true) {
                 list.add(ability)
-            } else if (ability.clazz?.isInstance(item) == true) {
+            } else if (ability.equipmentSlot != null && item is ArmorItem && item.equipmentSlot == ability.equipmentSlot) {
                 list.add(ability)
             }
         }

Diff for: src/main/kotlin/dev/sterner/api/item/ItemAbilityWithLevel.kt

@@ -6,15 +6,15 @@ data class ItemAbilityWithLevel(val itemAbility: ItemAbility, val level: Int) {
 
     fun writeNbt(): CompoundTag {
         val compoundTag = CompoundTag()
-        compoundTag.putString("itemAbility", itemAbility.name)
-        compoundTag.putInt("level", level)
+        compoundTag.putString("ItemAbility", itemAbility.name)
+        compoundTag.putInt("Level", level)
         return compoundTag
     }
 
     companion object {
         fun readNbt(nbt: CompoundTag): ItemAbilityWithLevel {
-            val ability = ItemAbility.valueOf(nbt.getString("itemAbility"))
-            val level = nbt.getInt("level")
+            val ability = ItemAbility.valueOf(nbt.getString("ItemAbility"))
+            val level = nbt.getInt("Level")
 
             return ItemAbilityWithLevel(ability, level)
         }

Diff for: src/main/kotlin/dev/sterner/api/item/UpgradableAbilityItem.kt

@@ -16,16 +16,20 @@ interface UpgradableAbilityItem {
             listTag.add(ab)
         }
         val tag = CompoundTag()
-        tag.put("abilities", listTag)
+        tag.put("Abilities", listTag)
         return tag
     }
 
     fun readNbt(tag: CompoundTag): List<ItemAbilityWithLevel> {
-        val tagList = tag.getList("abilities", 10)
+        val tagList = tag.getList("Abilities", 10)
         val list = mutableListOf<ItemAbilityWithLevel>()
-        for (ability in tagList) {
 
-            val a = ItemAbilityWithLevel.readNbt()
+        for (i in 0 until tagList.size) {
+            val abilityTag = tagList.getCompound(i)
+            val ability = ItemAbilityWithLevel.readNbt(abilityTag)
+            list.add(ability)
         }
+
+        return list
     }
 }