feat: experimental shift clicking

DebitCardz · Aug 18, 2024 · d664cc3 · d664cc3
1 parent b431038
commit d664cc3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ val githubActor = project.findProperty("gpr.user") as String? ?: System.getenv("
 val githubToken = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
 
 group = "me.tech"
-version = "1.5.0"
+version = "1.5.3"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/me/tech/mcchestui/GUI.kt b/src/main/kotlin/me/tech/mcchestui/GUI.kt
@@ -72,6 +72,12 @@ class GUI(
 	 */
 	var allowItemPlacement: Boolean = false
 
+	/**
+	 * Allow for [ItemStack] to be shift-clicked into the [GUI].
+	 * Requires [allowItemPlacement] to be true to work.
+	 */
+	var allowShiftClick: Boolean = false
+
 	/**
 	 * Allow for [ItemStack] to be dragged within the [GUI].
 	 */

diff --git a/src/main/kotlin/me/tech/mcchestui/listeners/item/GUIItemPlaceListener.kt b/src/main/kotlin/me/tech/mcchestui/listeners/item/GUIItemPlaceListener.kt
@@ -2,11 +2,11 @@ package me.tech.mcchestui.listeners.item
 
 import me.tech.mcchestui.GUI
 import me.tech.mcchestui.listeners.GUIEventListener
-import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.inventory.InventoryAction
 import org.bukkit.event.inventory.InventoryClickEvent
+import org.bukkit.event.inventory.InventoryMoveItemEvent
 
 internal class GUIItemPlaceListener(gui: GUI) : GUIEventListener(gui) {
     @EventHandler
@@ -26,7 +26,7 @@ internal class GUIItemPlaceListener(gui: GUI) : GUIEventListener(gui) {
             && isShiftClick
             && !gui.isBukkitInventory(clickedInventory) // make sure its incoming.
         ) {
-            if(!gui.allowItemPlacement) {
+            if(!gui.allowItemPlacement || !gui.allowShiftClick) {
                 isCancelled = true
                 return
             }
@@ -42,17 +42,20 @@ internal class GUIItemPlaceListener(gui: GUI) : GUIEventListener(gui) {
             return
         }
 
-        val guiSlot = gui.slots.getOrNull(slot)
-        if(guiSlot != null) {
-            if(!guiSlot.allowPickup) {
-                isCancelled = true
-                return
+        val originatesFromPlayerInventory = !gui.isBukkitInventory(clickedInventory)
+        if(!originatesFromPlayerInventory) {
+            val guiSlot = gui.slots.getOrNull(slot)
+            if(guiSlot != null) {
+                if(!guiSlot.allowPickup) {
+                    isCancelled = true
+                    return
+                }
             }
         }
 
-        val itemStack = cursor
+        val itemStack = (if(isShiftClick) currentItem else cursor)
             ?: return
-        if(itemStack.type == Material.AIR) {
+        if(itemStack.type.isEmpty) {
             return
         }