3x3 5x5 ichor mining ability impl

Author: mrsterner

Diff for: src/main/java/dev/sterner/mixin/ServerPlayerGameModeMixin.java

@@ -1,6 +1,8 @@
 package dev.sterner.mixin;
 
+import dev.sterner.api.VoidBoundApi;
 import dev.sterner.api.item.HammerLikeItem;
+import dev.sterner.api.item.ItemAbility;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -33,8 +35,12 @@ public class ServerPlayerGameModeMixin {
     public void voidbound$beforeDestroyBlock(BlockPos blockPos, CallbackInfoReturnable<Boolean> cir) {
         ItemStack itemStack = this.player.getMainHandItem();
         if (itemStack.getItem() instanceof HammerLikeItem hammerLikeItem) {
-            BlockState blockState = this.level.getBlockState(blockPos);
-            hammerLikeItem.executeHammerAction(this.level, blockPos, blockState, itemStack, this.player);
+            var three = VoidBoundApi.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_3X3;
+            var five = VoidBoundApi.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_5X5;
+            if (three || five || !hammerLikeItem.isIchor()) {
+                BlockState blockState = this.level.getBlockState(blockPos);
+                hammerLikeItem.executeHammerAction(this.level, blockPos, blockState, itemStack, this.player, five);
+            }
         }
     }
 }

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

@@ -16,13 +16,13 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.levelgen.structure.BoundingBox
 import net.minecraft.world.phys.BlockHitResult
-import java.util.function.Consumer
 
 /**
  * Implement to add a classic hammer behaviour to an item, this means an item which should break multiple blocks on one break
  */
 interface HammerLikeItem {
 
+    fun isIchor(): Boolean
     fun getRadius(): Int
     fun getDepth(): Int
     fun getHammerTier(): Tier
@@ -36,7 +36,8 @@ interface HammerLikeItem {
         blockPos: BlockPos,
         blockState: BlockState,
         itemStack: ItemStack,
-        player: ServerPlayer
+        player: ServerPlayer,
+        five: Boolean
     ) {
         // Only proceed if not on the client side and the block can be broken
         if (level.isClientSide || blockState.getDestroySpeed(level, blockPos) == 0.0f) return
@@ -48,13 +49,17 @@ interface HammerLikeItem {
         val hitResult = player.pick(20.0, 0.0f, false) as? BlockHitResult ?: return
 
         // Perform the AOE block break
-        breakNearbyBlocks(hitResult, blockPos, itemStack, level, player)
+        breakNearbyBlocks(hitResult, blockPos, itemStack, level, player, five)
     }
 
     /**
      * Determines if the hammer can break the block based on its tier.
      */
     fun isToolEffective(state: BlockState): Boolean {
+        if (isIchor()) {
+            return true
+        }
+
         val tierLevel = getHammerTier().level
         return when {
             tierLevel < 3 && state.`is`(BlockTags.NEEDS_DIAMOND_TOOL) -> false
@@ -79,12 +84,13 @@ interface HammerLikeItem {
         blockPos: BlockPos,
         hammerStack: ItemStack,
         level: Level,
-        entity: LivingEntity
+        entity: LivingEntity,
+        five: Boolean
     ) {
         if (entity !is ServerPlayer) return
 
         val direction = hitResult.direction
-        val areaOfEffect = calculateAoeBoundingBox(blockPos, direction, getRadius(), getDepth())
+        val areaOfEffect = calculateAoeBoundingBox(blockPos, direction, if (five) 5 else getRadius(), getDepth())
 
         if (!entity.isCreative && hammerStack.damageValue >= hammerStack.maxDamage - 1) return
 

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

@@ -35,6 +35,10 @@ open class CragbreakerItem(
         return super.getDestroySpeed(stack, state) + getExtraMiningSpeed(stack)
     }
 
+    override fun isIchor(): Boolean {
+        return false
+    }
+
     override fun getRadius(): Int {
         return 3
     }

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

@@ -32,6 +32,10 @@ open class EarthsplitterItem(
         return super.getDestroySpeed(stack, state) + getExtraMiningSpeed(stack)
     }
 
+    override fun isIchor(): Boolean {
+        return false
+    }
+
     override fun getRadius(): Int {
         return 3
     }

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

@@ -2,19 +2,31 @@ package dev.sterner.common.item.tool.ichor
 
 import com.google.common.collect.ImmutableMultimap
 import com.google.common.collect.Multimap
+import dev.sterner.api.VoidBoundApi
+import dev.sterner.api.item.HammerLikeItem
+import dev.sterner.api.item.ItemAbility
+import dev.sterner.registry.VoidBoundComponentRegistry
+import dev.sterner.registry.VoidBoundTiers
+import net.minecraft.tags.BlockTags
+import net.minecraft.tags.TagKey
+import net.minecraft.world.InteractionHand
+import net.minecraft.world.InteractionResultHolder
 import net.minecraft.world.entity.EquipmentSlot
 import net.minecraft.world.entity.ai.attributes.Attribute
 import net.minecraft.world.entity.ai.attributes.AttributeModifier
+import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.AxeItem
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Tier
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import team.lodestar.lodestone.registry.common.LodestoneAttributeRegistry
 
 class IchoriumTerraformer(tier: Tier, attackDamageModifier: Float, attackSpeedModifier: Float,
                           properties: Properties
 ) : AxeItem(tier, attackDamageModifier, attackSpeedModifier, properties
-) {
+), HammerLikeItem {
 
     override fun getDestroySpeed(stack: ItemStack, state: BlockState): Float {
         return this.speed
@@ -24,6 +36,11 @@ class IchoriumTerraformer(tier: Tier, attackDamageModifier: Float, attackSpeedMo
         return true
     }
 
+    override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
+        println(VoidBoundApi.getActiveAbility(player.mainHandItem))
+        return super.use(level, player, usedHand)
+    }
+
     override fun getDefaultAttributeModifiers(equipmentSlot: EquipmentSlot): Multimap<Attribute, AttributeModifier> {
 
         val attributeBuilder = ImmutableMultimap.Builder<Attribute, AttributeModifier>()
@@ -44,4 +61,24 @@ class IchoriumTerraformer(tier: Tier, attackDamageModifier: Float, attackSpeedMo
             equipmentSlot
         )
     }
+
+    override fun isIchor(): Boolean {
+        return true
+    }
+
+    override fun getRadius(): Int {
+        return 3
+    }
+
+    override fun getDepth(): Int {
+        return 2
+    }
+
+    override fun getHammerTier(): Tier {
+        return VoidBoundTiers.ICHORIUM
+    }
+
+    override fun getBlockTags(): TagKey<Block> {
+        return BlockTags.MINEABLE_WITH_PICKAXE //Doesnt matter
+    }
 }

Diff for: src/main/kotlin/dev/sterner/networking/AbilityUpdatePacket.kt

@@ -20,7 +20,6 @@ class AbilityUpdatePacket(val uuid: UUID, val itemAbility: ItemAbility) : Lodest
 
     constructor(buf: FriendlyByteBuf) : this(buf.readUUID(), ItemAbility.valueOf(buf.readUtf()))
 
-
     override fun executeServer(
         server: MinecraftServer?,
         player: ServerPlayer?,
@@ -31,7 +30,7 @@ class AbilityUpdatePacket(val uuid: UUID, val itemAbility: ItemAbility) : Lodest
         server?.execute {
             if (player?.uuid == uuid) {
                 val item = player.mainHandItem
-                VoidBoundApi.addItemAbility(item, itemAbility, true)
+                VoidBoundApi.setActiveAbility(item, itemAbility)
             }
         }
     }

Diff for: src/main/resources/assets/voidbound/lang/en_us.json

@@ -61,6 +61,8 @@
   "voidbound.ability.autosmelt": "Autosmelt",
   "voidbound.ability.quickdraw": "Quickdraw",
   "voidbound.ability.slow_fall": "Slow fall",
+  "voidbound.ability.mining_3x3": "3x3 Mining",
+  "voidbound.ability.mining_5x5": "5x5 Mining",
 
   "entity.voidbound.particle_entity": "Particle",
   "entity.voidbound.soul_steel_golem": "Soul Steel Golem",