TRIPLE_REBOUND

Author: mrsterner

src/main/java/dev/sterner/mixin/ReboundEnchantmentMixin.java

@@ -18,7 +18,7 @@ enum class ItemAbility : StringRepresentable {
     HARVEST,
     OPENER,//TODO re-implement. First hit on a mob deals increased damage and grants a stack of Wrath, lasting a minute, up to 10 stacks. Transforms into Finale when you reach 10 stacks, or sneak right click
     FINALE,//TODO implement. Consumes All stacks of Opening Strike, multiplying damage dealt by the amount of stacks total.
-    TRIPLE_REBOUND,//TODO implement
+    TRIPLE_REBOUND,
     VENGEANCE,//TODO implement. Rebound now actively seeks the target who most recently attacked you, damage taken by the owner of the scythe extends it's flight time. Initial flight time greatly increased
     PROPAGATION,//TODO implement, Rebound causes a sweeping attack. Scythe Sweeping now propagates, spreading itself through hordes of enemies like a chain
     SPIRIT_VISION; //TODO implement, hallowed goggles ability

src/main/kotlin/dev/sterner/api/item/ItemAbility.kt

@@ -1,16 +1,24 @@
 package dev.sterner.common.components
 
+import com.sammy.malum.common.entity.boomerang.ScytheBoomerangEntity
+import com.sammy.malum.registry.common.AttributeRegistry
 import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent
 import dev.onyxstudios.cca.api.v3.component.tick.CommonTickingComponent
 import dev.sterner.api.item.ItemAbility
 import dev.sterner.api.util.VoidBoundItemUtils
-import dev.sterner.api.util.VoidBoundPlayerUtils
 import dev.sterner.api.util.VoidBoundUtils
+import dev.sterner.mixin_logic.ReboundEnchantmentMixinLogic.logic
 import dev.sterner.registry.VoidBoundComponentRegistry
 import net.minecraft.nbt.CompoundTag
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundEvents
+import net.minecraft.stats.Stats
+import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.ItemStack
+import team.lodestar.lodestone.registry.common.LodestoneAttributeRegistry
 
 class VoidBoundPlayerItemAbilityComponent(private val player: Player) : AutoSyncedComponent, CommonTickingComponent {
 
@@ -65,4 +73,39 @@ class VoidBoundPlayerItemAbilityComponent(private val player: Player) : AutoSync
     private fun sync(){
         VoidBoundComponentRegistry.VOID_BOUND_PLAYER_ITEM_ABILITY_COMPONENT.sync(player)
     }
+
+    companion object {
+       fun onRightClickItem(player: ServerPlayer, interactionHand: InteractionHand?, stack: ItemStack): Boolean {
+           if (VoidBoundItemUtils.getActiveAbility(stack) == ItemAbility.TRIPLE_REBOUND) {
+               val level = player.level()
+               if (!level.isClientSide) {
+
+                   player.setItemInHand(interactionHand, ItemStack.EMPTY)
+                   val baseDamage = player.attributes.getValue(Attributes.ATTACK_DAMAGE).toFloat()
+                   val magicDamage = player.attributes.getValue(LodestoneAttributeRegistry.MAGIC_DAMAGE.get()).toFloat()
+                   val slot =
+                       if (interactionHand == InteractionHand.OFF_HAND) player.inventory.containerSize - 1 else player.inventory.selected
+                   val entity = ScytheBoomerangEntity(
+                       level,
+                       player.position().x,
+                       player.position().y + (player.bbHeight / 2.0f).toDouble(),
+                       player.position().z
+                   )
+                   entity.setData(player, baseDamage, magicDamage, slot)
+                   entity.item = stack
+                   entity.shootFromRotation(
+                       player, player.xRot, player.yRot, 0.0f,
+                       (1.5 + player.getAttributeValue(AttributeRegistry.SCYTHE_PROFICIENCY.get()) * 0.125).toFloat(), 0.0f
+                   )
+                   level.addFreshEntity(entity)
+
+                   logic(player, stack, baseDamage, magicDamage)
+               }
+
+               player.awardStat(Stats.ITEM_USED[stack.item])
+           }
+
+           return false
+       }
+    }
 }

src/main/kotlin/dev/sterner/common/components/VoidBoundPlayerItemAbilityComponent.kt

@@ -27,7 +27,8 @@ class VoidBoundRevelationComponent(private val player: Player) : AutoSyncedCompo
             ItemAbility.EARTH_RUMMAGER,
             ItemAbility.HARVEST,
             ItemAbility.SCORCHING_HEAT,
-            ItemAbility.SPIRIT_VISION
+            ItemAbility.SPIRIT_VISION,
+            ItemAbility.TRIPLE_REBOUND
         )
     }
 
@@ -143,10 +144,10 @@ class VoidBoundRevelationComponent(private val player: Player) : AutoSyncedCompo
         knowledgeDataSet = KnowledgeData.readFromNbt(tag)
 
         unlockedItemAbilities.clear()
+        unlockedItemAbilities = ItemAbility.readNbt(tag)
         defaultAbilities().forEach {
             unlockedItemAbilities.add(it)
         }
-        unlockedItemAbilities = ItemAbility.readNbt(tag)
     }
 
     override fun writeToNbt(tag: CompoundTag) {

src/main/kotlin/dev/sterner/common/components/VoidBoundRevelationComponent.kt

@@ -8,6 +8,7 @@ import dev.sterner.api.item.ItemAbility
 import dev.sterner.api.util.VoidBoundItemUtils
 import dev.sterner.client.event.*
 import dev.sterner.common.components.VoidBoundPlayerComponent
+import dev.sterner.common.components.VoidBoundPlayerItemAbilityComponent
 import dev.sterner.common.components.VoidBoundWorldComponent
 import dev.sterner.common.item.equipment.TidecutterItem
 import dev.sterner.common.item.equipment.UpgradableTool
@@ -29,6 +30,7 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier
 import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
+import team.lodestar.lodestone.events.LodestoneInteractionEvent
 import java.util.*
 
 
@@ -39,7 +41,7 @@ object VoidBoundEvents {
         UseEntityCallback.EVENT.register(VoidBoundPlayerComponent.Companion::useEntity)
         BlockEvents.BLOCK_BREAK.register(VoidBoundWorldComponent.Companion::removeWard)
         BlockEvents.BLOCK_BREAK.register(TidecutterItem.Companion::breakBlock)
-
+        LodestoneInteractionEvent.RIGHT_CLICK_ITEM.register(VoidBoundPlayerItemAbilityComponent::onRightClickItem)
         LivingHurtEvent.HURT.register {
             val attacker = it.source.entity
             if (attacker is Player) {

src/main/kotlin/dev/sterner/registry/VoidBoundEvents.kt

@@ -8,10 +8,7 @@
     "voidbound:earthsong_hoe",
 
     "voidbound:ichorium_scythe",
-    "voidbound:ichorium_axe",
-    "voidbound:ichorium_pickaxe",
-    "voidbound:ichorium_shovel",
-    "voidbound:ichorium_sword",
-    "voidbound:ichorium_hoe"
+    "voidbound:ichorium_terraformer",
+    "voidbound:ichorium_vorpal"
   ]
 }

src/main/resources/data/malum/tags/items/soul_hunter_weapon.json

@@ -6,7 +6,6 @@
     "HoeItemTillablesAccessor",
     "ItemEntityMixin",
     "LodestoneBlockEntityRegistryMixin",
-    "ReboundEnchantmentMixin",
     "ScytheBoomerangEntityMixin",
     "ServerPlayerGameModeMixin",
     "ServerPlayerMixin",