added harvest ability

mrsterner · mrsterner · commit a5b9698b61e1 · 2024-09-11T18:40:12.000+02:00
diff --git a/src/main/java/dev/sterner/mixin/HoeItemTillablesAccessor.java b/src/main/java/dev/sterner/mixin/HoeItemTillablesAccessor.java
@@ -0,0 +1,22 @@
+package dev.sterner.mixin;
+
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.item.HoeItem;
+import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.world.level.block.Block;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+@Mixin(HoeItem.class)
+public interface HoeItemTillablesAccessor {
+
+    @Accessor("TILLABLES")
+    public static Map<Block, Pair<Predicate<UseOnContext>, Consumer<UseOnContext>>> getTILLABLES() {
+        throw new AssertionError();
+    }
+
+}
diff --git a/src/main/kotlin/dev/sterner/api/item/ItemAbility.kt b/src/main/kotlin/dev/sterner/api/item/ItemAbility.kt
@@ -1,6 +1,7 @@
 package dev.sterner.api.item
 
 import dev.sterner.common.item.tool.ichor.IchoriumTerraformer
+import dev.sterner.common.item.tool.ichor.IchoriumVorpal
 import dev.sterner.registry.VoidBoundTags
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.tags.TagKey
@@ -16,7 +17,7 @@ enum class ItemAbility: StringRepresentable {
     MINING_3X3,//Fully implemented
     MINING_5X5,//Fully implemented
     VAMPIRISM,//TODO implement
-    HARVEST,
+    HARVEST,//TODO implement
     OPENER;//TODO implement
 
     override fun getSerializedName(): String {
@@ -42,7 +43,7 @@ enum class ItemAbility: StringRepresentable {
                 list.add(MINING_3X3)
                 list.add(MINING_5X5)
             }
-            if (item is IchoriumTerraformer) {
+            if (item is IchoriumVorpal) {
                 list.add(VAMPIRISM)
                 list.add(OPENER)
                 list.add(HARVEST)
diff --git a/src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumVorpal.kt b/src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumVorpal.kt
@@ -1,14 +1,33 @@
 package dev.sterner.common.item.tool.ichor
 
+import com.mojang.datafixers.util.Pair
+import dev.sterner.api.VoidBoundApi
+import dev.sterner.api.item.ItemAbility
 import dev.sterner.common.item.tool.GalesEdgeItem.Companion.ascend
+import dev.sterner.mixin.HoeItemTillablesAccessor
+import net.minecraft.core.BlockPos
+import net.minecraft.core.NonNullList
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.sounds.SoundSource
+import net.minecraft.tags.BlockTags
+import net.minecraft.world.Containers
 import net.minecraft.world.InteractionHand
+import net.minecraft.world.InteractionResult
 import net.minecraft.world.InteractionResultHolder
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.HoeItem
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Tier
+import net.minecraft.world.item.context.UseOnContext
 import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.phys.BlockHitResult
 import team.lodestar.lodestone.systems.item.tools.magic.MagicSwordItem
+import java.util.function.Consumer
+import java.util.function.Predicate
 
 class IchoriumVorpal(tier: Tier, attackDamageModifier: Int, attackSpeedModifier: Float, magicDamage: Float, properties: Properties) : MagicSwordItem(tier, attackDamageModifier,
     attackSpeedModifier,
@@ -21,12 +40,93 @@ class IchoriumVorpal(tier: Tier, attackDamageModifier: Int, attackSpeedModifier:
     }
 
     override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
-        player.startUsingItem(usedHand)
+        if (VoidBoundApi.getActiveAbility(player.mainHandItem) != ItemAbility.HARVEST) {
+            player.startUsingItem(usedHand)
+        }
+
         return super.use(level, player, usedHand)
     }
 
+    override fun useOn(context: UseOnContext): InteractionResult {
+        val player = context.player
+
+        if (player!!.isShiftKeyDown) {
+            return super.useOn(context)
+        }
+        if (VoidBoundApi.getActiveAbility(player.mainHandItem) == ItemAbility.HARVEST) {
+            for (xx in -1..1) {
+                for (zz in -1..1) {
+                    useHoeOn(
+                        UseOnContext(
+                            player, player.usedItemHand,
+                            BlockHitResult(
+                                context.clickLocation,
+                                context.horizontalDirection,
+                                context.clickedPos.offset(xx, 0, zz),
+                                context.isInside
+                            )
+                        )
+                    )
+                }
+            }
+        }
+
+        return InteractionResult.SUCCESS
+    }
+
+
+    fun useHoeOn(context: UseOnContext): InteractionResult {
+        val level = context.level
+        val blockPos = context.clickedPos
+        val pair = HoeItemTillablesAccessor.getTILLABLES()[level.getBlockState(blockPos).block] as Pair<Predicate<UseOnContext>, Consumer<UseOnContext>>?
+        if (pair == null) {
+            return InteractionResult.PASS
+        } else {
+            val predicate = pair.first
+            val consumer = pair.second
+            if (predicate.test(context)) {
+                val player = context.player
+                level.playSound(player, blockPos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0f, 1.0f)
+                if (!level.isClientSide) {
+                    consumer.accept(context)
+                    if (player != null) {
+                        context.itemInHand.hurtAndBreak(
+                            1, player
+                        ) { playerx: Player ->
+                            playerx.broadcastBreakEvent(
+                                context.hand
+                            )
+                        }
+                    }
+                }
+
+                return InteractionResult.sidedSuccess(level.isClientSide)
+            } else {
+                return InteractionResult.PASS
+            }
+        }
+    }
+
+    override fun mineBlock(
+        stack: ItemStack,
+        level: Level,
+        state: BlockState,
+        pos: BlockPos,
+        miningEntity: LivingEntity
+    ): Boolean {
+        if (level is ServerLevel && state.`is`(BlockTags.CROPS)) {
+            val list = NonNullList.create<ItemStack>()
+            list.addAll(Block.getDrops(state, level, pos, null, miningEntity, stack))
+            Containers.dropContents(level, pos, list)
+        }
+        return super.mineBlock(stack, level, state, pos, miningEntity)
+    }
+
     override fun onUseTick(level: Level, player: LivingEntity, stack: ItemStack, remainingUseDuration: Int) {
-        ascend(player, stack, this.getUseDuration(stack) - remainingUseDuration)
+        if (VoidBoundApi.getActiveAbility(player.mainHandItem) != ItemAbility.HARVEST) {
+            ascend(player, stack, this.getUseDuration(stack) - remainingUseDuration)
+        }
+
         super.onUseTick(level, player, stack, remainingUseDuration)
     }
 
diff --git a/src/main/kotlin/dev/sterner/networking/AbilityUpdatePacket.kt b/src/main/kotlin/dev/sterner/networking/AbilityUpdatePacket.kt
@@ -30,6 +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 --git a/src/main/resources/assets/voidbound/lang/en_us.json b/src/main/resources/assets/voidbound/lang/en_us.json
@@ -59,6 +59,7 @@
   "voidbound.ability.vampirism": "Vampirism",
   "voidbound.ability.opener": "Opener",
   "voidbound.ability.none": "None",
+  "voidbound.ability.harvest": "Harvest",
   "voidbound.ability.autosmelt": "Autosmelt",
   "voidbound.ability.mining_3x3": "3x3 Mining",
   "voidbound.ability.mining_5x5": "5x5 Mining",
diff --git a/src/main/resources/voidbound.mixins.json b/src/main/resources/voidbound.mixins.json
@@ -3,6 +3,7 @@
   "package": "dev.sterner.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "HoeItemTillablesAccessor",
     "ItemEntityMixin",
     "LodestoneBlockEntityRegistryMixin",
     "ReboundEnchantmentMixin",

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ class AbilityUpdatePacket(val uuid: UUID, val itemAbility: ItemAbility) : Lodest`
`30`	`30`	`server?.execute {`
`31`	`31`	`if (player?.uuid == uuid) {`
`32`	`32`	`val item = player.mainHandItem`
	`33`	`+ VoidBoundApi.addItemAbility(item, itemAbility, true)`
`33`	`34`	`VoidBoundApi.setActiveAbility(item, itemAbility)`
`34`	`35`	`}`
`35`	`36`	`}`