star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Made onClick nullable

Browse Source
This commit is contained in:
bluefireoly
2020-10-30 02:16:09 +01:00
parent 75dc9caa02
commit c287316e17
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/net/axay/kspigot/gui/GUIBuilder.kt
View File

@@ -185,7 +185,7 @@ class GUIPageBuilder<T : ForInventory>(
*/ */
fun <E> createCompound( fun <E> createCompound(
iconGenerator: (E) -> ItemStack, iconGenerator: (E) -> ItemStack,
onClick: (clickEvent: GUIClickEvent<T>, element: E) -> Unit onClick: ((clickEvent: GUIClickEvent<T>, element: E) -> Unit)? = null
) = GUISpaceCompound(type, iconGenerator, onClick) ) = GUISpaceCompound(type, iconGenerator, onClick)
/** /**
@@ -213,7 +213,7 @@ class GUIPageBuilder<T : ForInventory>(
fromSlot: SingleInventorySlot<out T>, fromSlot: SingleInventorySlot<out T>,
toSlot: SingleInventorySlot<out T>, toSlot: SingleInventorySlot<out T>,
iconGenerator: (E) -> ItemStack, iconGenerator: (E) -> ItemStack,
onClick: (clickEvent: GUIClickEvent<T>, element: E) -> Unit onClick: ((clickEvent: GUIClickEvent<T>, element: E) -> Unit)? = null
): GUIRectSpaceCompound<T, E> { ): GUIRectSpaceCompound<T, E> {
val rectSlotCompound = fromSlot rectTo toSlot val rectSlotCompound = fromSlot rectTo toSlot
return GUIRectSpaceCompound( return GUIRectSpaceCompound(

8
src/main/kotlin/net/axay/kspigot/gui/elements/GUISpaceCompound.kt
View File

@@ -25,7 +25,7 @@ class GUISpaceCompoundElement<T : ForInventory, E> internal constructor(
class GUIRectSpaceCompound<T : ForInventory, E>( class GUIRectSpaceCompound<T : ForInventory, E>(
invType: GUIType<T>, invType: GUIType<T>,
iconGenerator: (E) -> ItemStack, iconGenerator: (E) -> ItemStack,
onClick: (GUIClickEvent<T>, E) -> Unit, onClick: ((GUIClickEvent<T>, E) -> Unit)?,
internal val compoundWidth: Int internal val compoundWidth: Int
) : AbstractGUISpaceCompound<T, E>(invType, iconGenerator, onClick) { ) : AbstractGUISpaceCompound<T, E>(invType, iconGenerator, onClick) {
@@ -37,7 +37,7 @@ class GUIRectSpaceCompound<T : ForInventory, E>(
class GUISpaceCompound<T : ForInventory, E>( class GUISpaceCompound<T : ForInventory, E>(
invType: GUIType<T>, invType: GUIType<T>,
iconGenerator: (E) -> ItemStack, iconGenerator: (E) -> ItemStack,
onClick: (GUIClickEvent<T>, E) -> Unit onClick: ((GUIClickEvent<T>, E) -> Unit)?
) : AbstractGUISpaceCompound<T, E>(invType, iconGenerator, onClick) { ) : AbstractGUISpaceCompound<T, E>(invType, iconGenerator, onClick) {
override fun handleScrollEndReached(newProgress: Int, internalSlotsSize: Int, contentSize: Int) = false override fun handleScrollEndReached(newProgress: Int, internalSlotsSize: Int, contentSize: Int) = false
@@ -47,7 +47,7 @@ class GUISpaceCompound<T : ForInventory, E>(
abstract class AbstractGUISpaceCompound<T : ForInventory, E> internal constructor( abstract class AbstractGUISpaceCompound<T : ForInventory, E> internal constructor(
val guiType: GUIType<T>, val guiType: GUIType<T>,
private val iconGenerator: (E) -> ItemStack, private val iconGenerator: (E) -> ItemStack,
private val onClick: (GUIClickEvent<T>, E) -> Unit private val onClick: ((GUIClickEvent<T>, E) -> Unit)?
) { ) {
private val content = ArrayList<E>() private val content = ArrayList<E>()
@@ -112,7 +112,7 @@ abstract class AbstractGUISpaceCompound<T : ForInventory, E> internal constructo
clickEvent.bukkitEvent.isCancelled = true clickEvent.bukkitEvent.isCancelled = true
return return
} }
onClick.invoke(clickEvent, element) onClick?.invoke(clickEvent, element)
} }
internal fun addSlots(slots: InventorySlotCompound<T>) { internal fun addSlots(slots: InventorySlotCompound<T>) {