diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/events')
4 files changed, 19 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt index 0ca9fb78c..2822c28a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt @@ -4,8 +4,11 @@ import at.hannibal2.skyhanni.data.ClickType import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt import at.hannibal2.skyhanni.utils.LorenzVec import net.minecraft.item.ItemStack +import net.minecraftforge.fml.common.eventhandler.Cancelable -class BlockClickEvent(val clickType: ClickType, val position: LorenzVec, val itemInHand: ItemStack?) : LorenzEvent() { +@Cancelable +class BlockClickEvent(clickType: ClickType, val position: LorenzVec, itemInHand: ItemStack?) : + WorldClickEvent(itemInHand, clickType) { val getBlockState by lazy { position.getBlockStateAt() } } diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt index d5d7fe573..ec9785fce 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt @@ -2,5 +2,8 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.data.ClickType import net.minecraft.entity.Entity +import net.minecraft.item.ItemStack +import net.minecraftforge.fml.common.eventhandler.Cancelable -class EntityClickEvent(val clickType: ClickType, val clickedEntity: Entity?) : LorenzEvent()
\ No newline at end of file +@Cancelable +class EntityClickEvent(clickType: ClickType, val clickedEntity: Entity?, itemInHand: ItemStack?) : WorldClickEvent(itemInHand, clickType) diff --git a/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt index 5bf89558a..a34cb43f1 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt @@ -2,5 +2,7 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.data.ClickType import net.minecraft.item.ItemStack +import net.minecraftforge.fml.common.eventhandler.Cancelable -class ItemClickEvent(val itemInHand: ItemStack?, val clickType: ClickType) : LorenzEvent() +@Cancelable +class ItemClickEvent(itemInHand: ItemStack?, clickType: ClickType) : WorldClickEvent(itemInHand, clickType) diff --git a/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt new file mode 100644 index 000000000..4597041a1 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt @@ -0,0 +1,8 @@ +package at.hannibal2.skyhanni.events + +import at.hannibal2.skyhanni.data.ClickType +import net.minecraft.item.ItemStack +import net.minecraftforge.fml.common.eventhandler.Cancelable + +@Cancelable +open class WorldClickEvent(val itemInHand: ItemStack?, val clickType: ClickType) : LorenzEvent() |