rewrite pattern & fix a bug in craft

FIX: the crafting process could continue on another recipe.

Author: bousket

craft_all.lua

@@ -48,19 +48,6 @@ local function infer_width(list, expected)
 end
 
 
--- InvRef :room_for_item() does not check for multiple stacks need. That's the purpose of this function
-local function room_left_for_item(list, item)
-	local item_name = item:get_name()
-	local room_left = 0
-	for k,v in pairs(list) do
-		minetest.chat_send_all("")
-		if(v:get_name() == item_name) then room_left = room_left + v:get_free_space()
-		elseif v:is_empty() then room_left = room_left + item:get_stack_max() end
-	end
-	return room_left
-end
-
-
 -- Craft max possible items and put the result in the main inventory
 local function craft_craftall(player, formname, fields)	
 	local player_inv = player:get_inventory()
@@ -75,25 +62,17 @@ local function craft_craftall(player, formname, fields)
 	if room_left == 0 then return end
 
 	-- While there are ingredients & room, craft !
+	local expected_type_name = tmp_result.item:get_name()
 	local no_stack_limit = minetest.get_player_privs(player:get_player_name()).creative and not tmp_result.item:get_stack_max() == 1
-	local nb_res, result, decremented_input = 0, tmp_result, craft_list
-	while not tmp_result.item:is_empty() and (no_stack_limit or nb_res + tmp_result.item:get_count() <= room_left) do
+	local nb_res, result, decremented_input = 0, tmp_result, tmp_inv
+	while not tmp_result.item:is_empty() and tmp_result.item:get_name() == expected_type_name and (no_stack_limit or nb_res + tmp_result.item:get_count() <= room_left) do
 		nb_res = nb_res + tmp_result.item:get_count()
 		decremented_input = tmp_inv
-		tmp_result, tmp_inv = minetest.get_craft_result({ method = "normal", width = craft_width, items = decremented_input.items})
+		tmp_result, tmp_inv = minetest.get_craft_result(decremented_input)
 	end
 
 	-- Put a single stack for creative players and split the result for non creatives
-	if no_stack_limit then
-		player_inv:add_item("main", result.item:get_name().." "..nb_res)
-	else
-		local nb_stacks = math.floor(nb_res / result.item:get_stack_max())
-		local remaining = nb_res % result.item:get_stack_max()
-		for i=1,nb_stacks do
-			player_inv:add_item("main", result.item:get_name().." "..result.item:get_stack_max())
-		end
-		if remaining ~= 0 then player_inv:add_item("main", result.item:get_name().." "..remaining) end
-	end
+	place_item_in_stacks(player, "main", result.item:get_name(), nb_res)
 	player_inv:set_list("craft", decremented_input.items)
 end
 

craft_organize.lua

@@ -1,10 +1,21 @@
 -- Organize items in the craft inventory following a pattern:
--- 1 Compact stacks
--- 3 Fill the first line
--- 4 Fill a square
--- 6 Fill a 'stair pattern'
--- 8 Fill a circle
--- 9 Equal repartition in the grid
+
+
+
+-- Pattern struct: (Comment unwanted ones & organize on your wish. Buttons placed left to right then up)
+-- Inventory indexes to fill (then others for non creatives)
+local craft_patterns = {
+{ico="1.png" , pattern={1}},
+{ico="3.png" , pattern={1,2,3}},
+{ico="3b.png", pattern={1,4,7}},
+{ico="4.png" , pattern={1,2,4,5}},
+{ico="5.png" , pattern={1,3,5,7,9}},
+{ico="6.png" , pattern={1,4,5,7,8,9}},
+{ico="6b.png", pattern={1,2,3,4,5,6}},
+{ico="7.png" , pattern={1,2,3,4,5,6,8}},
+{ico="8.png" , pattern={1,2,3,4,6,7,8,9}},
+{ico="9.png" , pattern={1,2,3,4,5,6,7,8,9}}
+}
 
 
 local S = unified_inventory.gettext
@@ -18,13 +29,9 @@ local function onload()
 	get_formspec = function(player, perplayer_formspec)
 		local formspecy = perplayer_formspec.formspec_y
 		local formspec = unified_inventory_plus.craft_organize(player, perplayer_formspec).formspec
-		--formspec = formspec.."label[3.0,"..(formspecy - 2.0)..";Organize:]"
-		formspec = formspec.."image_button[2.0,"..(formspecy - 0.5)..";0.5,0.5;1.png;craft_organize_1;]"
-		formspec = formspec.."image_button[2.5,"..(formspecy - 0.5)..";0.5,0.5;3.png;craft_organize_3;]"
-		formspec = formspec.."image_button[3.0,"..(formspecy - 0.5)..";0.5,0.5;4.png;craft_organize_4;]"
-		formspec = formspec.."image_button[3.5,"..(formspecy - 0.5)..";0.5,0.5;6.png;craft_organize_6;]"
-		formspec = formspec.."image_button[4.0,"..(formspecy - 0.5)..";0.5,0.5;8.png;craft_organize_8;]"
-		formspec = formspec.."image_button[4.5,"..(formspecy - 0.5)..";0.5,0.5;9.png;craft_organize_9;]"
+		for i,v in ipairs(craft_patterns) do
+			formspec = formspec.."image_button["..(2.0 + 0.5 * ((i-1)%6))..","..(formspecy - 0.5 * math.ceil(i/6))..";0.5,0.5;"..v.ico..";craft_organize_"..i..";]"
+		end
 		return {formspec=formspec}
 	end,
 }
@@ -33,32 +40,23 @@ end
 onload()
 
 
--- inventory indexes to fill (then others for non creatives)
-local craft_patterns = {
-["1"]={1},
-["3"]={1,2,3},
-["4"]={1,2,4,5},
-["6"]={1,4,5,7,8,9},
-["8"]={1,2,3,4,6,7,8,9},
-["9"]={1,2,3,4,5,6,7,8,9}
-}
-
 
--- Return if there is only one type and the item type name in the StackItems list.
+-- Return if there is only one type and the item type name in the StackItems list (nil if none)
 local function get_type_infos(craft_list)
 	local item = nil
 	for j=0,2 do
 		for i=1,3 do
 			if not craft_list[3*j+i]:is_empty() then
 				if item == nil then item = craft_list[3*j+i]
-				elseif item:get_name() ~= craft_list[3*j+i]:get_name() then return false, item:get_name()
+				elseif item:get_name() ~= craft_list[3*j+i]:get_name() then return false, ""
 				end
 			end
 		end
 	end
 	return true, (item ~= nil) and item:get_name() or nil
 end
 
+-- Sum the craft_list items
 local function get_total_amount(craft_list)
 	local nb = 0
 	for j=0,2 do
@@ -90,24 +88,26 @@ local function craft_organize(player, formname, fields)
 	if not type_name then return end -- craft is empty
 	if not only_one_type then minetest.chat_send_player(player_name, "You can only organize one type of item.") return end
 
-	-- Don't exceed 9*99 for non creative players (it shouldn't but who knows ...)
+	-- Don't exceed 9*99 for non creative players. It shouldn't happen but avoids potential losses then
 	local total_amount = get_total_amount(craft_list)
 	if not is_creative and total_amount > 891 then minetest.chat_send_player(player_name, "There are too many items to organize ! Have less than 9 x 99 items.") return end
 
 	local res = {ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name),ItemStack(type_name)}
-	for i=1,9 do res[i]:set_count(0) end -- doing this cause empty ItemStack constructor in list crashes the game :S
+	for i=1,9 do res[i]:set_count(0) end -- Doing this because using empty ItemStack in list constructor crashes the game :S
 
-	local nb_stacks = tonumber(pattern_id)
+	local pattern = craft_patterns[tonumber(pattern_id)].pattern
+	local nb_stacks = 0
+	for i in pairs(pattern) do nb_stacks = nb_stacks + 1 end
 	local stack_size = math.floor(total_amount / nb_stacks)
 	if not is_creative then stack_size = math.min(stack_size, ItemStack(type_name):get_stack_max()) end -- limit stacks to get_stack_max() for non creatives
-	local remaining = total_amount - nb_stacks * stack_size -- no % nb_stacks if limit
+	local remaining = total_amount - nb_stacks * stack_size -- no % nb_stacks if limit: remaining could be greater than a stack
 
 	for i=1,nb_stacks do
-		res[craft_patterns[pattern_id][i]]:add_item(type_name.." "..stack_size)
+		res[pattern[i]]:add_item(type_name.." "..stack_size)
 	end
 
 	player_inv:set_list("craft", res)
-	player_inv:add_item("craft", type_name.." "..remaining)
+	place_item_in_stacks(player, "craft", type_name, remaining)
 end
 
 

functions.lua

@@ -0,0 +1,35 @@
+
+
+-- InvRef :room_for_item() does not check for multiple stacks need. That's the purpose of this function
+function room_left_for_item(list, item)
+	local item_name = item:get_name()
+	local room_left = 0
+	for k,v in pairs(list) do
+		minetest.chat_send_all("")
+		if(v:get_name() == item_name) then room_left = room_left + v:get_free_space()
+		elseif v:is_empty() then room_left = room_left + item:get_stack_max() end
+	end
+	return room_left
+end
+
+
+
+-- Add items to the inventory, splitting in stacks if necessary
+-- Have to separate item_name & nb_items instead of using an Itemstack in the case you want to add many not stackable ItemStack (keys, filled buckets...)
+function place_item_in_stacks(player, inv_name, item_name, nb_items)
+	local player_inv = player:get_inventory()
+	assert(player_inv)
+	local stack_max = ItemStack(item_name):get_stack_max()
+
+	-- Put a single stack for creative players and split the result for non creatives
+	if minetest.get_player_privs(player:get_player_name()).creative and not stack_max == 1 then
+		player_inv:add_item(inv_name, ItemStack(item_name.." "..nb_items))
+	else
+		local nb_stacks = math.floor(nb_items / stack_max)
+		local remaining = nb_items % stack_max
+		for i=1,nb_stacks do
+			player_inv:add_item(inv_name, item_name.." "..stack_max)
+		end
+		if remaining ~= 0 then player_inv:add_item(inv_name, item_name.." "..remaining) end
+	end
+end

init.lua

@@ -6,6 +6,8 @@ local worldpath = minetest.get_worldpath()
 unified_inventory_plus = {}
 
 
+dofile(modpath.."/functions.lua")
+
 -- Functionalities are independants.
 -- Comment the following lines to disable those you don't want
 dofile(modpath.."/craft_all.lua")