Change item click handler type (#161)

Author: DevNatan

bukkit-api/src/main/java/me/saiintbrisson/minecraft/ItemClickInterceptor.java

@@ -25,7 +25,7 @@ public void intercept(
         subject.setCancelled(item.isCancelOnClick());
 
         if (item.getClickHandler() != null)
-            subject.getRoot().runCatching(subject, () -> item.getClickHandler().handle(subject));
+            subject.getRoot().runCatching(subject, () -> item.getClickHandler().accept(subject));
 
         event.setCancelled(subject.isCancelled());
     }

kotlin-dsl/src/main/kotlin/me/saiintbrisson/minecraft/Builders.kt

@@ -3,6 +3,8 @@
 
 package me.saiintbrisson.minecraft
 
+import java.util.function.Consumer
+
 @ViewDsl
 public class ViewBuilder {
 
@@ -19,7 +21,7 @@ public class ViewBuilder {
     internal var open: (OpenViewContext.() -> Unit)? = null
     internal var render: ContextBlock? = null
     internal var update: ContextBlock? = null
-    internal var click: SlotContextBlock? = null
+    internal var click: SlotClickContextBlock? = null
     internal var close: (CloseViewContext.() -> Unit)? = null
     internal var hotbarInteract: HotbarInteractBlock? = null
     internal var itemHold: SlotContextBlock? = null
@@ -36,15 +38,18 @@ public class ViewSlotBuilder(@PublishedApi internal val slot: Int) {
 
     internal var render: SlotContextBlock? = null
     internal var update: SlotContextBlock? = null
-    internal var click: SlotContextBlock? = null
+    internal var click: SlotClickContextBlock? = null
     internal var itemHold: SlotContextBlock? = null
     internal var itemRelease: ItemReleaseBlock? = null
     internal var moveOut: SlotMoveContextBlock? = null
     internal var moveIn: SlotMoveContextBlock? = null
 
     public fun toItem(): ViewItem {
         return ViewItem(slot).apply {
-            setHandler(click) { clickHandler = it }
+            click?.let {
+                clickHandler = Consumer { context -> it.invoke(context) }
+            }
+
             setHandler(render) { renderHandler = it }
             setHandler(update) { updateHandler = it }
         }

kotlin-dsl/src/main/kotlin/me/saiintbrisson/minecraft/Types.kt

@@ -4,6 +4,7 @@ package me.saiintbrisson.minecraft
 
 internal typealias ContextBlock = @ViewDsl ViewContext.() -> Unit
 internal typealias SlotContextBlock = @ViewDsl ViewSlotContext.() -> Unit
+internal typealias SlotClickContextBlock = @ViewDsl ViewSlotClickContext.() -> Unit
 internal typealias SlotMoveContextBlock = @ViewDsl ViewSlotMoveContext.() -> Unit
 internal typealias ItemReleaseBlock = @ViewDsl ViewSlotContext.(to: ViewSlotContext) -> Unit
 internal typealias HotbarInteractBlock = @ViewDsl ViewSlotContext.(hotbarButton: Int) -> Unit

shared/src/main/java/me/saiintbrisson/minecraft/ViewItem.java

@@ -41,7 +41,8 @@ enum State {
 
     @Setter(AccessLevel.PUBLIC)
     private boolean closeOnClick, cancelOnClick, cancelOnShiftClick;
-    private ViewItemHandler renderHandler, updateHandler, clickHandler;
+    private ViewItemHandler renderHandler, updateHandler;
+    private Consumer<ViewSlotClickContext> clickHandler;
     private Consumer<ViewSlotMoveContext> moveInHandler, moveOutHandler;
     private Consumer<ViewSlotContext> itemHoldHandler;
     private BiConsumer<ViewSlotContext, ViewSlotContext> itemReleaseHandler;
@@ -341,7 +342,7 @@ public ViewItem onUpdate(@Nullable ViewItemHandler handler) {
      * @return This item.
      */
     @Contract(value = "_ -> this", mutates = "this")
-    public ViewItem onClick(@Nullable ViewItemHandler handler) {
+    public ViewItem onClick(@Nullable Consumer<ViewSlotClickContext> handler) {
         setClickHandler(handler);
         return this;
     }