Refactor canvas to be less dependent on itemstacks (#15)

* refactor: generify canvases

* clean up

* readd old drag for now

* make click independent of inventory & remove drag

* make LayoutNode internal again

Author: Dqu1J

.gitignore

@@ -11,3 +11,5 @@ out
 eclipse
 *.ipr
 *.iws
+
+.DS_Store

guiy-example/src/main/kotlin/com/mineinabyss/guiy/example/GuiyExamplePlugin.kt

@@ -1,7 +1,7 @@
 package com.mineinabyss.guiy.example
 
 import com.mineinabyss.guiy.example.gui.*
-import com.mineinabyss.guiy.inventory.guiy
+import com.mineinabyss.guiy.canvas.guiy
 import com.mineinabyss.idofront.commands.brigadier.commands
 import org.bukkit.plugin.java.JavaPlugin
 

src/main/kotlin/com/mineinabyss/guiy/GuiyPlugin.kt

@@ -1,14 +1,13 @@
 package com.mineinabyss.guiy
 
-import com.mineinabyss.guiy.inventory.GuiyEventListener
-import com.mineinabyss.guiy.inventory.GuiyInventoryHolder
-import com.mineinabyss.guiy.inventory.GuiyScopeManager
+import com.mineinabyss.guiy.canvas.inventory.GuiyEventListener
+import com.mineinabyss.guiy.canvas.inventory.GuiyInventoryHolder
+import com.mineinabyss.guiy.canvas.GuiyScopeManager
 import com.mineinabyss.idofront.nms.interceptServerbound
 import com.mineinabyss.idofront.plugin.listeners
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
-import net.minecraft.network.Connection
 import net.minecraft.network.protocol.game.ServerboundRenameItemPacket
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player

src/main/kotlin/com/mineinabyss/guiy/inventory/CompositionLocals.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/CompositionLocals.kt

@@ -1,4 +1,4 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ProvidableCompositionLocal

src/main/kotlin/com/mineinabyss/guiy/canvas/GuiyCanvas.kt

@@ -0,0 +1,33 @@
+package com.mineinabyss.guiy.canvas
+
+import com.mineinabyss.guiy.components.state.IntCoordinates
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap
+import org.bukkit.inventory.ItemStack
+
+interface GuiyCanvas {
+    fun subCanvas(x: Int, y: Int): GuiyCanvas
+}
+
+class InventoryCanvas private constructor(
+    private val contents: Long2ObjectOpenHashMap<ItemStack>,
+    private val offX: Int,
+    private val offY: Int,
+) : GuiyCanvas {
+    constructor(): this(Long2ObjectOpenHashMap(), 0, 0)
+
+    fun set(x: Int, y: Int, item: ItemStack?) {
+        if (item == null) contents.remove(IntCoordinates(x + offX, y + offY).pair)
+        else contents[IntCoordinates(x + offX, y + offY).pair] = item
+    }
+
+    fun clear() {
+        contents.clear()
+    }
+
+    fun contents(): Map<IntCoordinates, ItemStack> {
+        return contents.toMap().mapKeys { IntCoordinates(it.key) }
+    }
+
+    override fun subCanvas(x: Int, y: Int): GuiyCanvas =
+        InventoryCanvas(contents, offX + x, offY + y)
+}

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyOwner.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/GuiyOwner.kt

@@ -1,4 +1,4 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas
 
 import androidx.compose.runtime.*
 import androidx.compose.runtime.snapshots.Snapshot
@@ -8,7 +8,6 @@ import com.mineinabyss.guiy.guiyPlugin
 import com.mineinabyss.guiy.layout.LayoutNode
 import com.mineinabyss.guiy.modifiers.Constraints
 import com.mineinabyss.guiy.modifiers.click.ClickScope
-import com.mineinabyss.guiy.modifiers.drag.DragScope
 import com.mineinabyss.guiy.navigation.BackGestureDispatcher
 import com.mineinabyss.guiy.navigation.LocalBackGestureDispatcher
 import com.mineinabyss.guiy.nodes.GuiyNodeApplier
@@ -32,7 +31,6 @@ data class ClickResult(
 
 interface ClickHandler {
     fun processClick(scope: ClickScope): ClickResult
-    fun processDrag(scope: DragScope)
 }
 
 @GuiyUIScopeMarker
@@ -42,6 +40,7 @@ class GuiyOwner(
     var hasFrameWaiters = false
     val clock = BroadcastFrameClock { hasFrameWaiters = true }
     val composeScope = CoroutineScope(guiyPlugin.minecraftDispatcher + Dispatchers.Default) + clock
+
     private val _viewers: MutableStateFlow<Set<Player>> = MutableStateFlow(initialViewers)
     val viewers = _viewers.asStateFlow()
 
@@ -125,21 +124,12 @@ class GuiyOwner(
                 LocalBackGestureDispatcher provides BackGestureDispatcher(),
                 LocalClickHandler provides object : ClickHandler {
                     override fun processClick(scope: ClickScope): ClickResult {
-                        val slot = scope.slot
-                        val width = rootNode.width
                         return rootNode.children.fold(ClickResult()) { acc, node ->
-                            val w = node.width
-                            val x = if (w == 0) 0 else slot % width
-                            val y = if (w == 0) 0 else slot / width
-                            val processed = rootNode.processClick(scope, x, y)
+                            val processed = rootNode.processClick(scope)
                             if (processed.clickConsumed == true) return processed
                             acc.mergeWith(processed)
                         }
                     }
-
-                    override fun processDrag(scope: DragScope) {
-                        rootNode.processDrag(scope)
-                    }
                 }) {
                 // A default inventory holder for most usecases
                 InventoryHolder {

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyScopeManager.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/GuiyScopeManager.kt

@@ -1,4 +1,4 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas
 
 import kotlinx.coroutines.CoroutineScope
 

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyUIScopeMarker.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/GuiyUIScopeMarker.kt

@@ -1,4 +1,4 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas
 
 @DslMarker
 annotation class GuiyUIScopeMarker

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyEventListener.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/inventory/GuiyEventListener.kt

@@ -1,8 +1,7 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas.inventory
 
+import com.mineinabyss.guiy.components.state.IntCoordinates
 import com.mineinabyss.guiy.modifiers.click.ClickScope
-import com.mineinabyss.idofront.nms.aliases.NMSPlayer
-import com.mineinabyss.idofront.nms.aliases.toNMS
 import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
@@ -11,7 +10,6 @@ import org.bukkit.event.inventory.ClickType.*
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.event.inventory.InventoryDragEvent
-import org.bukkit.event.inventory.PrepareAnvilEvent
 
 class GuiyEventListener : Listener {
     @EventHandler
@@ -26,7 +24,7 @@ class GuiyEventListener : Listener {
         isCancelled = true
 
         val scope = ClickScope(
-            click, slot, cursor.takeIf { it.type != Material.AIR }, whoClicked
+            click, slot, whoClicked
         )
         guiyHolder.processClick(scope, this)
     }
@@ -52,7 +50,7 @@ class GuiyEventListener : Listener {
         if (newItems.size == 1 && inGuiy.size == 1) {
             isCancelled = true
             val clicked = inGuiy.entries.first()
-            val scope = ClickScope(LEFT, clicked.key, cursor?.takeIf { it.type != Material.AIR }, whoClicked)
+            val scope = ClickScope(LEFT, clicked.key, whoClicked)
             guiyHolder.processClick(scope, this)
         } else if (inGuiy.isNotEmpty()) {
             isCancelled = true

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyInventory.kt renamed to src/main/kotlin/com/mineinabyss/guiy/canvas/inventory/GuiyInventory.kt

@@ -1,4 +1,4 @@
-package com.mineinabyss.guiy.inventory
+package com.mineinabyss.guiy.canvas.inventory
 
 import androidx.compose.runtime.Immutable
 import org.bukkit.inventory.Inventory