seemingly working crafting window

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

@@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.terrarum.*
-import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.UIItemInventoryCatBar.Companion.CAT_ALL
 import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarum.itemproperties.CraftingCodex
@@ -142,13 +141,12 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(), HasInventory {
         )
         buttonCraft = UIItemTextButton(this, "GAME_ACTION_CRAFT", thisOffsetX + 3 + buttonWidth + listGap, craftButtonsY, buttonWidth, true, alignment = UIItemTextButton.Companion.Alignment.CENTRE, hasBorder = true)
         spinnerCraftCount = UIItemSpinner(this, thisOffsetX + 1, craftButtonsY, 1, 1, 100, 1, buttonWidth, numberToTextFunction = {"×\u200A${it.toInt()}"})
-
+        spinnerCraftCount.selectionChangeListener = {
-        buttonCraft.touchDownListener = { _,_,_,_ ->
+            itemListIngredients.numberMultiplier = it.toLong()
-            printdbg(this, "Recipe to go: ${recipeClicked}")
+            itemListIngredients.rebuild(catAll)
+            itemListCraftable.numberMultiplier = it.toLong()
+            itemListCraftable.rebuild(catAll)
         }
-        // make grid mode buttons work together
-//        itemListCraftable.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
-//        itemListCraftable.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
 
         // player inventory to the right
         itemListPlayer = UIItemInventoryItemGrid(
@@ -172,6 +170,22 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(), HasInventory {
 //        itemListPlayer.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
 //        itemListPlayer.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
 
+        buttonCraft.touchDownListener = { _,_,_,_ ->
+            getPlayerInventory().let { player -> recipeClicked?.let { recipe ->
+                val mult = spinnerCraftCount.value.toLong()
+                itemListIngredients.getInventory().itemList.forEach { (itm, qty) ->
+                    player.remove(itm, qty * mult)
+                }
+                player.add(recipe.product, recipe.moq * mult)
+                itemListPlayer.rebuild(catAll)
+                itemListIngredients.rebuild(catAll)
+                itemListCraftable.rebuild(catAll)
+            } }
+        }
+        // make grid mode buttons work together
+//        itemListCraftable.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
+//        itemListCraftable.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
+
         handler.allowESCtoClose = true
 
         addUIitem(itemListCraftable)
@@ -190,6 +204,8 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(), HasInventory {
         // reset spinner
         spinnerCraftCount.value = 1
         spinnerCraftCount.fboUpdateLatch = true
+        itemListIngredients.numberMultiplier = 1L
+        itemListCraftable.numberMultiplier = 1L
         // reset selected recipe status
         recipeClicked = null
         highlightCraftingCandidateButton(null)
@@ -205,15 +221,6 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(), HasInventory {
 
         openingClickLatched = Terrarum.mouseDown
 
-        // reset spinner
-        /*spinnerCraftCount.value = 1
-        spinnerCraftCount.fboUpdateLatch = true
-        // reset selected recipe status
-        recipeClicked = null
-        highlightCraftingCandidateButton(null)
-        ingredients.clear()
-        itemListIngredients.rebuild(catAll)*/
-
         UIItemInventoryItemGrid.tooltipShowing.clear()
         INGAME.setTooltipMessage(null)
     }

src/net/torvald/terrarum/modulebasegame/ui/UIItemCraftingCandidateGrid.kt

@@ -32,8 +32,6 @@ class UIItemCraftingCandidateGrid(
 
     val craftingRecipes = ArrayList<CraftingCodex.CraftingRecipe>()
 
-    init {
-    }
 
     internal val recipesSortList = ArrayList<CraftingCodex.CraftingRecipe>() // a dual to the [inventorySortList] which contains the actual recipes instead of crafting recipes
 
@@ -61,7 +59,7 @@ class UIItemCraftingCandidateGrid(
             try {
                 val sortListItem = recipesSortList[k + itemPage * items.size]
                 items[k].item = ItemCodex[sortListItem.product]
-                items[k].amount = sortListItem.moq
+                items[k].amount = sortListItem.moq * numberMultiplier
                 items[k].itemImage = ItemCodex.getItemImage(sortListItem.product)
                 items[k].extraInfo = sortListItem
 

src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt

@@ -50,6 +50,8 @@ open class UIItemInventoryItemGrid(
     //override var oldPosX = posX
     //override var oldPosY = posY
 
+    var numberMultiplier = 1L
+
     private val hash = System.nanoTime()
 
     override val width  = horizontalCells * UIItemInventoryElemSimple.height + (horizontalCells - 1) * listGap
@@ -425,7 +427,7 @@ open class UIItemInventoryItemGrid(
             try {
                 val sortListItem = inventorySortList[k + itemPage * items.size]
                 items[k].item = ItemCodex[sortListItem.itm]
-                items[k].amount = sortListItem.qty
+                items[k].amount = sortListItem.qty * numberMultiplier
                 items[k].itemImage = ItemCodex.getItemImage(sortListItem.itm)
 
                 // set quickslot number