ability activation and utils

Author: mrsterner

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

@@ -19,8 +19,6 @@ enum class ItemAbility(private val equipmentSlot: EquipmentSlot?, private val cl
         return this.name.lowercase()
     }
 
-
-
     fun writeNbt(): CompoundTag {
         val tag = CompoundTag()
         tag.putString("Ability", name)

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

@@ -70,7 +70,7 @@ class ItemAbilityScreen(stack: ItemStack) : Screen(Component.literal("Ability Se
 
         val gray = VoidBound.id("textures/gui/ability_selection.png")
         RenderSystem.enableBlend()
-        RenderSystem.setShaderColor(1f, 1f, 1f, if (focus) 7 / 8f else 0f)
+        RenderSystem.setShaderColor(1f, 1f, 1f, if (focus) 7 / 8f else 0.2f)
 
         guiGraphics.blit(
             gray,
@@ -108,7 +108,7 @@ class ItemAbilityScreen(stack: ItemStack) : Screen(Component.literal("Ability Se
             if (index == selection) {
                 guiGraphics.drawCenteredString(
                     minecraft!!.font,
-                    ability.name.lowercase().replaceFirstChar { it.uppercase() }, // Access ability directly
+                    "voidbound.ability." + ability.name.lowercase(),
                     abilityX + 24,
                     y + 34,
                     0xDDCCFF

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

@@ -15,30 +15,46 @@ class ItemAbilityHandler {
     var selectionScreen: ItemAbilityScreen? = null
     var currentAbility: ItemAbility? = ItemAbility.NONE
     var active: Boolean = false
+    private var lastMainHandItem: ItemStack? = null // Track the previous main hand item
 
     init {
         currentAbility = ItemAbility.NONE
-
     }
 
     fun tick() {
         val mc = Minecraft.getInstance()
+
+        // Disable if the player is in spectator mode
         if (mc.gameMode != null && mc.gameMode!!.playerMode == GameType.SPECTATOR) {
             if (active) {
                 active = false
             }
             return
         }
-        val player = mc.player
-        if (player != null && selectionScreen == null) {
-            selectionScreen = ItemAbilityScreen(player.mainHandItem)
+
+        val player = mc.player ?: return // Return if player is null
+        val stack = player.mainHandItem
+
+        // If the current main hand item has changed, update the selection screen
+        if (stack != lastMainHandItem) {
+            lastMainHandItem = stack
+
+            // Only create a new screen if the item is not null
+            if (stack != null) {
+                selectionScreen = ItemAbilityScreen(stack)
+            } else {
+                selectionScreen = null
+            }
         }
-        val stack = player?.mainHandItem
+
+        // If no stack, deactivate the handler
         if (stack == null) {
             active = false
             return
         }
+
         init(player)
+
         if (!active) {
             return
         }
@@ -87,5 +103,4 @@ class ItemAbilityHandler {
         }
         return false
     }
-
 }

Diff for: src/main/kotlin/dev/sterner/common/ItemAbilityHandler.kt

@@ -30,6 +30,11 @@ class IchoriumPickaxeItem(material: Tier, damage: Int, speed: Float, magicDamage
         return 1
     }
 
+    override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
+        //VoidBoundComponentRegistry.VOID_BOUND_REVELATION_COMPONENT.get(player).addUnlockedItemAbility(ItemAbility.DISPERSED_STRIKE)
+        return super.use(level, player, usedHand)
+    }
+
     override fun appendHoverText(
         stack: ItemStack,
         level: Level?,

Diff for: src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumPickaxeItem.kt

@@ -23,6 +23,8 @@ class IchoriumSwordItem(
     properties
 ) {
 
+
+
     override fun appendHoverText(
         stack: ItemStack,
         level: Level?,

Diff for: src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumSwordItem.kt

@@ -59,6 +59,12 @@
   "block.voidbound.osmotic_enchanter": "Osmotic Enchanter",
   "itemGroup.voidbound": "Void Bound",
 
+  "voidbound.ability.vampirism": "Vampirism",
+  "voidbound.ability.dispersed_strike": "Dispersed Strike",
+  "voidbound.ability.autosmelt": "Autosmelt",
+  "voidbound.ability.quickdraw": "Quickdraw",
+  "voidbound.ability.slow_fall": "Slow fall",
+
   "entity.voidbound.particle_entity": "Particle",
   "entity.voidbound.soul_steel_golem": "Soul Steel Golem",
   "entity.voidbound.grimcult_knight": "Grimcult Knight",