Almost entirely works except the output amount is incorrect

mods/armor/init.lua

@@ -6,7 +6,7 @@
 armor = {}
 
 armor.player_skin = "character.png"
-armor.update_time = 3
+armor.update_time = 1
 
 armor.materials = {
 --   material       craftitem                   %   description

mods/crafting/init.lua

@@ -7,13 +7,15 @@ crafting = {}
 
 crafting.registered_crafts = {}
 
+-- User table of last selected row etc.
+crafting.userdata = {}
+
 -- Crafting can only take 4 itemstacks as input for sanity/interface reasons
 crafting.max_inputs = 4
 
 -- Default crafting definition values
 crafting.default_craftdef = {
    output = nil,
-   description = "",
    items = {},
    groups = {},
 }
@@ -26,14 +28,11 @@ function crafting.register_craft(output, def)
 
    if crafting.registered_crafts[itemn] ~= nil then
       minetest.log("warning",
-                   "Tried to register an existing craft " .. itemn)
+                   "Tried to register an existing craft " .. itemn .. ", allowing")
-
-      return
    end
 
    local craftdef = {
       output = itemstack,
-      description = def.description or minetest.registered_items[itemn].description,
       items = def.items or crafting.default_craftdef.items,
       groups = def.groups or crafting.default_craftdef.groups,
    }
@@ -50,7 +49,36 @@ function crafting.register_craft(output, def)
 
    crafting.registered_crafts[itemn] = craftdef
 
-   minetest.log("info", "Registered recipe for " .. itemn .. ": " .. dump(crafting.registered_crafts[itemn]))
+   minetest.log("info", "Registered recipe for " .. itemn)
+end
+
+function crafting.get_crafts(filter)
+   local results = {}
+
+   local function get_filter()
+      for craftname, craftdef in pairs(crafting.registered_crafts) do
+         for filtername, filtervalue in ipairs(filter) do
+            if craftdef[filtername] ~= nil and craftdef[filtername] == filtervalue then
+               table.insert(results, craftname)
+               break
+            end
+         end
+      end
+   end
+
+   local function get_all()
+      for craftname, _ in pairs(crafting.registered_crafts) do
+         table.insert(results, craftname)
+      end
+   end
+
+   if filter == nil then
+      get_all()
+   else
+      get_filter()
+   end
+
+   return results
 end
 
 function crafting.craft(wanted, output, items)
@@ -101,7 +129,11 @@ function crafting.craft(wanted, output, items)
 
    -- Put stuff in output stack
 
-   craft_count = math.min(craft_count, math.floor(output:get_free_space() / craft_count))
+   print("Free space: " .. output:get_free_space())
+
+   if craft_count - output:get_free_space() > 0 then
+      craft_count = craft_count - (craft_count - output:get_free_space())
+   end
 
    if craft_count < 1 then
       minetest.log("warning",
@@ -110,7 +142,10 @@ function crafting.craft(wanted, output, items)
       return nil
    end
 
-   output:add_item(ItemStack({name = wanted:get_name(), count = wanted:get_count() * craft_count}))
+   output:add_item(ItemStack({
+                         name = craftdef.output:get_name(),
+                         count = craftdef.output:get_count() * craft_count
+   }))
 
    -- Iterate through second time to take items used for crafting
 
@@ -153,37 +188,72 @@ function crafting.craft(wanted, output, items)
    return {items = items, output = output}
 end
 
-local form_crafting = default.ui.get_page("default:2part")
+local form = default.ui.get_page("default:2part")
 
-form_crafting = form_crafting .. "list[current_player;main;0.25,4.75;8,4;]"
+form = form .. "field[-1,-1;0,0;crafting_tracker;;]"
-form_crafting = form_crafting .. "listring[current_player;main]"
-form_crafting = form_crafting .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1)
-form_crafting = form_crafting .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3)
 
-form_crafting = form_crafting .. "list[current_player;craft_in;0.25,0.25;1,4;]"
+form = form .. "list[current_player;main;0.25,4.75;8,4;]"
-form_crafting = form_crafting .. "listring[current_player;craft_in]"
+form = form .. "listring[current_player;main]"
+form = form .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1)
+form = form .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3)
 
-form_crafting = form_crafting .. "list[current_player;craft_out;7.25,0.25;1,1;]"
+form = form .. "list[current_player;craft_in;0.25,0.25;1,4;]"
+form = form .. "listring[current_player;craft_in]"
 
-form_crafting = form_crafting .. default.ui.get_itemslot_bg(0.25, 0.25, 1, 4)
+form = form .. "list[current_player;craft_out;7.25,0.25;1,1;]"
-form_crafting = form_crafting .. default.ui.get_itemslot_bg(7.25, 0.25, 1, 1)
 
-form_crafting = form_crafting .. "image[7.25,1.25;1,1;ui_arrow_bg.png]"
+form = form .. default.ui.get_itemslot_bg(0.25, 0.25, 1, 4)
+form = form .. default.ui.get_itemslot_bg(7.25, 0.25, 1, 1)
 
-form_crafting = form_crafting .. default.ui.button(7.25, 2.25, 1, 1, "do_craft_1", "1")
+form = form .. "image[7.25,1.25;1,1;ui_arrow_bg.png]"
-form_crafting = form_crafting .. default.ui.button(7.25, 3.25, 1, 1, "do_craft_10", "10")
 
-default.ui.register_page("crafting:crafting", form_crafting)
+form = form .. default.ui.button(7.25, 2.25, 1, 1, "do_craft_1", "1")
+form = form .. default.ui.button(7.25, 3.25, 1, 1, "do_craft_10", "10")
+
+form = form .. "tableoptions[background=#DDDDDD30]"
+form = form .. "tablecolumns[text,align=left,width=1]"
+
+default.ui.register_page("crafting:crafting", form)
 
 function crafting.get_formspec(name)
+   local row = 1
+
+   if crafting.userdata[name] ~= nil then
+      row = crafting.userdata[name].row
+   end
+
+   local craft_list = ""
+
+   local craftitems = crafting.get_crafts(nil)
+
+   for _, itemn in ipairs(craftitems) do
+      if craft_list ~= "" then
+         craft_list = craft_list .. ","
+      end
+
+      local itemdef = minetest.registered_items[itemn]
+
+      if itemdef ~= nil then
+         craft_list = craft_list .. minetest.formspec_escape(itemdef.description)
+      end
+   end
+
    local form = default.ui.get_page("crafting:crafting")
 
+   form = form .. "table[1.25,0.25;5.75,2.75;craft_list;" .. craft_list .. ";" .. row .. "]"
+
    return form
 end
 
 local function on_joinplayer(player)
+   local name = player:get_player_name()
+
    local inv = player:get_inventory()
 
+   if crafting.userdata[name] == nil then
+      crafting.userdata[name] = {row = 1}
+   end
+
    if inv:get_size("craft_in") ~= 4 then
       inv:set_size("craft_in", 4)
    end
@@ -194,23 +264,31 @@ local function on_joinplayer(player)
 end
 
 local function on_player_receive_fields(player, form_name, fields)
-   if form_name ~= "crafting:crafting" then
+   if fields.crafting_tracker == nil then
       return
    end
 
+   local name = player:get_player_name()
+
    local inv = player:get_inventory()
 
-   local wanted_itemstack = ItemStack("default:stone 2")
+   if fields.do_craft_1 or fields.do_craft_10 then
+      local craftitems = crafting.get_crafts(nil)
+
+      local wanted_itemstack = ItemStack(craftitems[crafting.userdata[name].row])
       local output_itemstack = inv:get_stack("craft_out", 1)
 
-   if output_itemstack:get_name() ~= wanted_itemstack:get_name() and output_itemstack:get_count() ~= 0 then
+      if output_itemstack:get_name() ~= wanted_itemstack:get_name()
-      minetest.log("warning", "Trying to craft " .. wanted_itemstack:to_string() .. " but output has too many/different items")
+      and output_itemstack:get_count() ~= 0 then
+         minetest.log("warning",
+                      "Trying to craft " .. wanted_itemstack:to_string() ..
+                         " but output has too many/different items")
       end
 
       if fields.do_craft_1 then
          wanted_itemstack:set_count(1)
       elseif fields.do_craft_10 then
-      wanted_itemstack:set_count(2)
+         wanted_itemstack:set_count(10)
       else
          return
       end
@@ -218,22 +296,47 @@ local function on_player_receive_fields(player, form_name, fields)
       local crafted = crafting.craft(wanted_itemstack, output_itemstack, inv:get_list("craft_in"))
 
       if crafted and inv:room_for_item("craft_out", crafted.output) then
-      inv:add_item("craft_out", crafted.output)
+         inv:set_stack("craft_out", 1, crafted.output)
 
          inv:set_list("craft_in", crafted.items)
       end
+   elseif fields.craft_list then
+      local selection = minetest.explode_table_event(fields.craft_list)
+
+      if selection.type == "CHG" or selection.type == "DCL" then
+         crafting.userdata[name].row = selection.row
+
+         minetest.show_formspec(name, "crafting:crafting", crafting.get_formspec(name, crafting.userdata[name].row))
+      end
+   end
 end
 
 minetest.register_on_joinplayer(on_joinplayer)
 minetest.register_on_player_receive_fields(on_player_receive_fields)
 
 crafting.register_craft(
-   "default:stone 4",
+   "default:stone",
    {
       items = {
-         {name = "default:stick", count = 3},
+         {name = "default:stick", count = 1},
-         {name = "default:fiber", count = 2},
+         {name = "default:fiber", count = 1},
-         {name = "group:stone", count = 2},
+      },
+})
+
+crafting.register_craft(
+   "default:apple",
+   {
+      items = {
+         {name = "default:fiber", count = 5},
+      },
+})
+
+crafting.register_craft(
+   "default:stick",
+   {
+      items = {
+         {name = "default:stone", count = 2},
+         {name = "default:tree", count = 2},
       },
 })
 

mods/default/formspec.lua

@@ -237,5 +237,5 @@ end)
 
 minetest.register_on_joinplayer(
    function(player)
-      player:set_inventory_formspec(default.ui.get_page("crafting:crafting"))
+      player:set_inventory_formspec(crafting.get_formspec(player:get_player_name()))
 end)