fixed a bug where storagechest would not show anything on the item slot; changed inventory UI so that it would sync with the Toolkit.Theme

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureInventory.kt

@@ -43,21 +43,21 @@ open class FixtureInventory() {
     }
     open fun add(item: GameItem, count: Int = 1) {
 
-        println("[ActorInventory] add-by-elem $item, $count")
+//        println("[ActorInventory] add-by-elem $item, $count")
 
         // other invalid values
         if (count == 0)
-            throw IllegalArgumentException("Item count is zero.")
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Item count is zero.")
         if (count < 0)
             throw IllegalArgumentException("Item count is negative number. If you intended removing items, use remove()\n" +
                                            "These commands are NOT INTERCHANGEABLE; they handle things differently according to the context.")
         if (item.originalID == "actor:${Terrarum.PLAYER_REF_ID}" || item.originalID == ("actor:${0x51621D}")) // do not delete this magic
-            throw IllegalArgumentException("Attempted to put human player into the inventory.")
-        if (((Terrarum.ingame as? TerrarumIngame)?.gameFullyLoaded ?: false) &&
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Attempted to put human player into the inventory.")
+        if (((Terrarum.ingame as? TerrarumIngame)?.gameFullyLoaded == true) &&
             (item.originalID == "actor:${(Terrarum.ingame as? TerrarumIngame)?.actorNowPlaying?.referenceID}"))
-            throw IllegalArgumentException("Attempted to put active player into the inventory.")
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Attempted to put active player into the inventory.")
         if ((!item.stackable || item.dynamicID.startsWith("dyn:")) && count > 1)
-            throw IllegalArgumentException("Attempting to adding stack of item but the item is not stackable; item: $item, count: $count")
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Attempted to adding stack of item but the item is not stackable; item: $item, count: $count")
 
 
 
@@ -89,9 +89,9 @@ open class FixtureInventory() {
         println("[ActorInventory] remove $item, $count")
 
         if (count == 0)
-            throw IllegalArgumentException("Item count is zero.")
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Item count is zero.")
         if (count < 0)
-            throw IllegalArgumentException("Item count is negative number. If you intended adding items, use add()" +
+            throw IllegalArgumentException("[${this.javaClass.canonicalName}] Item count is negative number. If you intended adding items, use add()" +
                                            "These commands are NOT INTERCHANGEABLE; they handle things differently according to the context.")
 
 
@@ -101,7 +101,7 @@ open class FixtureInventory() {
             val newCount = existingItem.qty - count
 
             if (newCount < 0) {
-                throw Error("Tried to remove $count of $item, but the inventory only contains ${existingItem.qty} of them.")
+                throw Error("[${this.javaClass.canonicalName}] Tried to remove $count of $item, but the inventory only contains ${existingItem.qty} of them.")
             }
             else if (newCount > 0) {
                 // decrement count
@@ -115,7 +115,7 @@ open class FixtureInventory() {
             }
         }
         else {
-            throw Error("Tried to remove $item, but the inventory does not have it.")
+            throw Error("[${this.javaClass.canonicalName}] Tried to remove $item, but the inventory does not have it.")
         }
     }
     

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt

@@ -103,7 +103,73 @@ internal class UIStorageChest : UICanvas(
 
     private var halfSlotOffset = (UIItemInventoryElemSimple.height + listGap) / 2
 
-    private var initialised = false
+    init {
+        catBar = UIItemInventoryCatBar(
+                this,
+                (App.scr.width - catBarWidth) / 2,
+                42 + (App.scr.height - internalHeight) / 2,
+                internalWidth,
+                catBarWidth,
+                false
+        )
+        catBar.selectionChangeListener = { old, new -> itemListUpdate() }
+        itemListChest = UIItemInventoryItemGrid(
+                this,
+                catBar,
+                { getFixtureInventory() },
+                INVENTORY_CELLS_OFFSET_X() - halfSlotOffset,
+                INVENTORY_CELLS_OFFSET_Y(),
+                6, CELLS_VRT,
+                drawScrollOnRightside = false,
+                drawWallet = false,
+                keyDownFun = { _, _, _ -> Unit },
+                touchDownFun = { gameItem, amount, _ ->
+                    if (gameItem != null) {
+                        negotiator.reject(getFixtureInventory(), getPlayerInventory(), gameItem, amount)
+                    }
+                    itemListUpdate()
+                }
+        )
+        // make grid mode buttons work together
+        itemListChest.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
+        itemListChest.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
+
+        itemListPlayer = UIItemInventoryItemGrid(
+                this,
+                catBar,
+                { INGAME.actorNowPlaying!!.inventory }, // literally a player's inventory
+                INVENTORY_CELLS_OFFSET_X() - halfSlotOffset + (listGap + UIItemInventoryElemWide.height) * 7,
+                INVENTORY_CELLS_OFFSET_Y(),
+                6, CELLS_VRT,
+                drawScrollOnRightside = true,
+                drawWallet = false,
+                keyDownFun = { _, _, _ -> Unit },
+                touchDownFun = { gameItem, amount, _ ->
+                    if (gameItem != null) {
+                        negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount)
+                    }
+                    itemListUpdate()
+                }
+        )
+        itemListPlayer.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
+        itemListPlayer.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
+
+        handler.allowESCtoClose = true
+
+        addUIitem(catBar)
+        addUIitem(itemListChest)
+        addUIitem(itemListPlayer)
+    }
+
+    private var openingClickLatched = false
+
+    override fun show() {
+        itemListPlayer.getInventory = { INGAME.actorNowPlaying!!.inventory }
+
+        itemListUpdate()
+
+        openingClickLatched = Terrarum.mouseDown
+    }
 
     private fun itemListUpdate() {
         itemListChest.rebuild(catBar.catIconsMeaning[catBar.selectedIcon])
@@ -129,72 +195,19 @@ internal class UIStorageChest : UICanvas(
         itemListUpdate()
     }
 
-    override fun updateUI(delta: Float) {
-        if (!initialised) {
-            initialised = true
-
-            catBar = UIItemInventoryCatBar(
-                    this,
-                    (App.scr.width - catBarWidth) / 2,
-                    42 + (App.scr.height - internalHeight) / 2,
-                    internalWidth,
-                    catBarWidth,
-                    false
-            )
-            catBar.selectionChangeListener = { old, new -> itemListUpdate() }
-            itemListChest = UIItemInventoryItemGrid(
-                    this,
-                    catBar,
-                    { getFixtureInventory() },
-                    INVENTORY_CELLS_OFFSET_X() - halfSlotOffset,
-                    INVENTORY_CELLS_OFFSET_Y(),
-                    6, CELLS_VRT,
-                    drawScrollOnRightside = false,
-                    drawWallet = false,
-                    keyDownFun = { _, _, _ -> Unit },
-                    touchDownFun = { gameItem, amount, _ ->
-                        if (gameItem != null) {
-                            negotiator.reject(getFixtureInventory(), getPlayerInventory(), gameItem, amount)
-                        }
-                        itemListUpdate()
-                    }
-            )
-            itemListPlayer = UIItemInventoryItemGrid(
-                    this,
-                    catBar,
-                    { INGAME.actorNowPlaying!!.inventory }, // literally a player's inventory
-                    INVENTORY_CELLS_OFFSET_X() - halfSlotOffset + (listGap + UIItemInventoryElemWide.height) * 7,
-                    INVENTORY_CELLS_OFFSET_Y(),
-                    6, CELLS_VRT,
-                    drawScrollOnRightside = true,
-                    drawWallet = false,
-                    keyDownFun = { _, _, _ -> Unit },
-                    touchDownFun = { gameItem, amount, _ ->
-                        if (gameItem != null) {
-                            negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount)
-                        }
-                        itemListUpdate()
-                    }
-            )
-
-            handler.allowESCtoClose = true
-
-            // make grid mode buttons work together
-            itemListChest.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
-            itemListChest.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
-            itemListPlayer.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
-            itemListPlayer.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
-
-            addUIitem(catBar)
-            addUIitem(itemListChest)
-            addUIitem(itemListPlayer)
+    override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
+        if (!openingClickLatched) {
+            return super.touchDown(screenX, screenY, pointer, button)
         }
+        return false
+    }
 
-
-
+    override fun updateUI(delta: Float) {
         catBar.update(delta)
         itemListChest.update(delta)
         itemListPlayer.update(delta)
+
+        if (openingClickLatched && !Terrarum.mouseDown) openingClickLatched = false
     }
 
     override fun renderUI(batch: SpriteBatch, camera: Camera) {