Use raw slot for click slot logic

Author: Aeltumn

build.gradle.kts

@@ -15,7 +15,7 @@ val javaVersion: Int = 21
 
 allprojects {
     group = "com.noxcrew.interfaces"
-    version = "1.1.5-SNAPSHOT"
+    version = "1.1.6-SNAPSHOT"
 
     tasks.withType<JavaCompile> {
         sourceCompatibility = javaVersion.toString()

interfaces/src/main/kotlin/com/noxcrew/interfaces/InterfacesListeners.kt

@@ -197,7 +197,7 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
         val holder = event.inventory.holder
         val view = convertHolderToInterfaceView(holder) ?: return
         for (slot in event.rawSlots) {
-            val clickedPoint = GridPoint.fromCombinedSlot(event.view.topInventory.size / 9, slot) ?: continue
+            val clickedPoint = GridPoint.fromBukkitChestSlot(slot) ?: continue
             if (!canFreelyMove(view, clickedPoint)) {
                 event.isCancelled = true
                 return
@@ -325,7 +325,7 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
         if (event.inventory.holder is Player) {
             return GridPoint.fromBukkitPlayerSlot(event.slot)
         }
-        return GridPoint.fromBukkitChestSlot(event.slot)
+        return GridPoint.fromBukkitChestSlot(event.rawSlot)
     }
 
     /**

interfaces/src/main/kotlin/com/noxcrew/interfaces/grid/GridPoint.kt

@@ -1,6 +1,5 @@
 package com.noxcrew.interfaces.grid
 
-import com.noxcrew.interfaces.pane.CombinedPane
 import com.noxcrew.interfaces.pane.PlayerPane
 
 /** A 2-dimensional vector storing integer components. */
@@ -13,15 +12,6 @@ public data class GridPoint(val x: Int, val y: Int) {
         /** The slot index used to indicate a click was outside the UI. */
         public const val OUTSIDE_CHEST_INDEX: Int = -999
 
-        /** Returns the grid point for a [slot] in a player inventory. */
-        public fun fromCombinedSlot(rows: Int, slot: Int): GridPoint? {
-            if (slot !in PLAYER_INVENTORY_RANGE) return null
-            val x = slot / 9
-            val mappings = CombinedPane.createMappings(rows)
-            val adjustedX = mappings.indexOf(x)
-            return GridPoint(adjustedX, slot % 9)
-        }
-
         /** Returns the grid point for a [slot] in a player inventory. */
         public fun fromBukkitPlayerSlot(slot: Int): GridPoint? {
             if (slot !in PLAYER_INVENTORY_RANGE) return null