diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 15:16:47 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 15:16:47 +0100 |
| commit | 2b581ce23be9425f1a22255ea923b028042a0838 (patch) | |
| tree | 71ea57ef99d95ee0b1a50eb72458cc9853a439b2 | |
| parent | 40f8dd3b9c3727b03d8fbf1f2882d88bb9a19c6a (diff) | |
| download | skyhanni-2b581ce23be9425f1a22255ea923b028042a0838.tar.gz skyhanni-2b581ce23be9425f1a22255ea923b028042a0838.tar.bz2 skyhanni-2b581ce23be9425f1a22255ea923b028042a0838.zip | |
Fixed left click ability detection of Gyro Wand.
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt | 5 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt index 3ffc44719..0219634b4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt @@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.utils.toLorenzVec import net.minecraft.client.Minecraft import net.minecraft.network.play.client.C07PacketPlayerDigging import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement +import net.minecraft.network.play.client.C0APacketAnimation import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.InputEvent import org.lwjgl.input.Mouse @@ -30,6 +31,10 @@ class ItemClickData { if (packet is C07PacketPlayerDigging && packet.status == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK) { val position = packet.position.toLorenzVec() BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).postAndCatch() + ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.RIGHT_CLICK).postAndCatch() + } + if (packet is C0APacketAnimation) { + ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).postAndCatch() } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index 08e2b9820..3a4324853 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.ClickType import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background import at.hannibal2.skyhanni.events.ItemClickEvent import at.hannibal2.skyhanni.events.LorenzActionBarEvent @@ -160,9 +159,7 @@ class ItemAbilityCooldown { @SubscribeEvent fun onItemClick(event: ItemClickEvent) { - if (event.clickType == ClickType.RIGHT_CLICK) { - handleItemClick(event.itemInHand) - } + handleItemClick(event.itemInHand) } private fun handleItemClick(itemInHand: ItemStack?) { |