From 7dbe904ce7a5846ea353758220b1337c75e0a275 Mon Sep 17 00:00:00 2001 From: ceikry Date: Sat, 11 Mar 2023 22:56:24 -0600 Subject: [PATCH] Fixed a coordinate issue with new item spawns --- src/main/kotlin/ui/ItemSpawnPanel.kt | 9 +++++++++ src/main/kotlin/ui/MapCell.kt | 7 ++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ui/ItemSpawnPanel.kt b/src/main/kotlin/ui/ItemSpawnPanel.kt index 743c49c..80d1db6 100644 --- a/src/main/kotlin/ui/ItemSpawnPanel.kt +++ b/src/main/kotlin/ui/ItemSpawnPanel.kt @@ -73,6 +73,15 @@ class ItemSpawnPanel : JPanel() { preferredSize = Dimension(300, 68) maximumSize = Dimension(300, 68) + Rs2MapEditor.itemIdInput.addMouseListener (object : MouseAdapter() { + override fun mouseClicked (e: MouseEvent) { + ItemMenu.caller = {id, name -> + Rs2MapEditor.itemIdInput.text = id.toString() + } + ItemMenu.open() + } + }) + layout = BorderLayout() topPanel.add(Rs2MapEditor.itemIdInput) topPanel.add(addButton) diff --git a/src/main/kotlin/ui/MapCell.kt b/src/main/kotlin/ui/MapCell.kt index 6da59d3..f054e79 100644 --- a/src/main/kotlin/ui/MapCell.kt +++ b/src/main/kotlin/ui/MapCell.kt @@ -119,13 +119,10 @@ class MapCell : JPanel() { return } + val absolute = Util.getAbsoluteCoordinates(Rs2MapEditor.region, Rs2MapEditor.selectedPointX, Rs2MapEditor.selectedPointY, Rs2MapEditor.plane) val item = TableData.ItemSpawn( id, - TableData.Location( - Rs2MapEditor.selectedPointX, - Rs2MapEditor.selectedPointY, - Rs2MapEditor.plane - ), + absolute, amount, respawnTime )