Skip to content

feature: Add ClickContext#interact to allow determining if the click is from an interact event #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2024
Merged

feature: Add ClickContext#interact to allow determining if the click is from an interact event #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions interfaces/src/main/kotlin/com/noxcrew/interfaces/InterfacesListeners.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
val isPlayerInventory = (event.clickedInventory ?: event.inventory).holder is Player

// Run base click handling
if (handleClick(view, clickedPoint, event.click, event.hotbarButton, isPlayerInventory)) {
if (handleClick(view, clickedPoint, event.click, event.hotbarButton, isPlayerInventory, false)) {
event.isCancelled = true
}

Expand Down Expand Up @@ -415,7 +415,7 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
return
}

if (handleClick(view, clickedPoint, click, -1, true)) {
if (handleClick(view, clickedPoint, click, -1, isPlayerInventory = true, interact = true)) {
// Support modern behavior where we don't interfere with block interactions
if (view.builder.onlyCancelItemInteraction) {
event.setUseItemInHand(Event.Result.DENY)
Expand Down Expand Up @@ -557,7 +557,8 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
clickedPoint: GridPoint,
click: ClickType,
slot: Int,
isPlayerInventory: Boolean
isPlayerInventory: Boolean,
interact: Boolean
): Boolean {
// Determine the type of click, if nothing was clicked we allow it
val raw = view.pane.getRaw(clickedPoint)
Expand All @@ -581,7 +582,7 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
view.isProcessingClick = true

// Forward this click to all pre-processors
val clickContext = ClickContext(view.player, view, click, slot)
val clickContext = ClickContext(view.player, view, click, slot, interact)
view.builder.clickPreprocessors
.forEach { handler -> ClickHandler.process(handler, clickContext) }

Expand Down
4 changes: 3 additions & 1 deletion interfaces/src/main/kotlin/com/noxcrew/interfaces/click/ClickContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ public data class ClickContext(
/** The type of click that was performed. */
public val type: ClickType,
/** The hot bar slot pressed between 0-8 if [type] is [ClickType.NUMBER_KEY], or `-1` otherwise. */
public val slot: Int
public val slot: Int,
/** Whether the click was fired from an interact event (not from an open inventory). */
public val interact: Boolean
)