ability activation and utils

Author: mrsterner

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

@@ -19,18 +19,7 @@ enum class ItemAbility(private val equipmentSlot: EquipmentSlot?, private val cl
         return this.name.lowercase()
     }
 
-    fun getAvailableAbilitiesFromItem(item: Item): List<ItemAbility> {
-        val list = mutableListOf<ItemAbility>()
-        for (ability in entries) {
-            // 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.equipmentSlot != null && item is ArmorItem && item.equipmentSlot == ability.equipmentSlot) {
-                list.add(ability)
-            }
-        }
-        return list
-    }
+
 
     fun writeNbt(): CompoundTag {
         val tag = CompoundTag()
@@ -42,5 +31,18 @@ enum class ItemAbility(private val equipmentSlot: EquipmentSlot?, private val cl
         fun readNbt(abilityTag: CompoundTag): ItemAbility {
             return valueOf(abilityTag.getString("Ability"))
         }
+
+        fun getAvailableAbilitiesFromItem(item: Item): Set<ItemAbility> {
+            val list = mutableSetOf<ItemAbility>()
+            for (ability in entries) {
+                // 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.equipmentSlot != null && item is ArmorItem && item.equipmentSlot == ability.equipmentSlot) {
+                    list.add(ability)
+                }
+            }
+            return list
+        }
     }
 }

Diff for: src/main/kotlin/dev/sterner/client/screen/ItemAbilityScreen.kt

@@ -34,7 +34,9 @@ class ItemAbilityScreen(stack: ItemStack) : Screen(Component.literal("Ability Se
 
         w = 180
         h = 41
-        abilities = VoidBoundComponentRegistry.VOID_BOUND_REVELATION_COMPONENT.get(minecraft!!.player!!).unlockedItemAbilities
+        val compatibleAbilities = ItemAbility.getAvailableAbilitiesFromItem(stack.item)
+        val unlockedAbilities = VoidBoundComponentRegistry.VOID_BOUND_REVELATION_COMPONENT.get(minecraft!!.player!!).unlockedItemAbilities
+        abilities = compatibleAbilities.intersect(unlockedAbilities)
     }
 
     fun cycle(direction: Int) {