Tweak quick crafting

README.md

@@ -53,4 +53,4 @@ Report bugs on the [**Bug Tracker**](https://github.com/minetest-mods/i3/issues)
 
 **Video review on YouTube:** https://www.youtube.com/watch?v=Xd14BCdEZ3o
 
-![Preview](https://user-images.githubusercontent.com/7883281/144105848-535b5e4f-a6fc-44d6-add1-e62a45d36f63.png)
+![Preview](https://content.minetest.net/uploads/3abf3755de.png)

src/callbacks.lua

@@ -5,7 +5,7 @@ local init_detached = i3.files.detached()
 local init_hud = i3.files.hud()
 local set_fs = i3.set_fs
 
-IMPORT("slz", "min", "copy", "ItemStack")
+IMPORT("slz", "min", "insert", "copy", "ItemStack")
 IMPORT("spawn_item", "reset_data", "get_detached_inv")
 
 core.register_on_player_hpchange(function(player, hpchange)
@@ -134,6 +134,7 @@ local function init_data(player, info)
 	data.player_name     = name
 	data.filter          = ""
 	data.pagenum         = 1
+	data.skin_pagenum    = 1
 	data.items           = i3.init_items
 	data.items_raw       = i3.init_items
 	data.favs            = {}
@@ -175,7 +176,7 @@ local function save_data(player_name)
 	storage:set_string("data", slz(_data))
 end
 
-core.register_on_joinplayer(function(player)
+insert(core.registered_on_joinplayers, 1, function(player)
 	local name = player:get_player_name()
 	local info = core.get_player_information and core.get_player_information(name)
 

src/common.lua

@@ -514,14 +514,17 @@ local function compress_items(list, start_i)
 	return new_inv
 end
 
-local function drop_items(player, inv, list, start_i, rej)
+local function drop_items(player, inv, list, start_i, rej, remove)
 	for i = start_i, #list do
 		local stack = list[i]
 		local name = stack:get_name()
 
 		for _, it in ipairs(rej) do
 			if name == it then
-				spawn_item(player, stack)
+				if not remove then
+					spawn_item(player, stack)
+				end
+
 				inv:set_stack("main", i, ItemStack(""))
 			end
 		end
@@ -537,7 +540,7 @@ local function sort_inventory(player, data)
 	local start_i = data.ignore_hotbar and (i3.settings.hotbar_len + 1) or 1
 
 	if true_table(data.drop_items) then
-		list = drop_items(player, inv, list, start_i, data.drop_items)
+		list = drop_items(player, inv, list, start_i, data.drop_items, true)
 	end
 
 	if data.inv_compress then

src/fields.lua

@@ -14,10 +14,9 @@ local function inv_fields(player, data, fields)
 	local inv = player:get_inventory()
 	local sb_inv = fields.scrbar_inv
 
-	if fields.skins then
-		local id = tonumber(fields.skins)
-		local _skins = skins.get_skinlist_for_player(name)
-		skins.set_player_skin(player, _skins[id])
+	if sb_inv and sub(sb_inv, 1, 3) == "CHG" then
+		data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
+		return
 	end
 
 	if fields.drop_items then
@@ -41,6 +40,11 @@ local function inv_fields(player, data, fields)
 		elseif sub(field, 1, 8) == "setting_" then
 			data.show_setting = match(field, "_(%w+)$")
 
+		elseif sub(field, 1, 9) == "skin_btn_" then
+			local id = tonumber(field:match("%d+"))
+			local _skins = skins.get_skinlist_for_player(name)
+			skins.set_player_skin(player, _skins[id])
+
 		elseif find(field, "waypoint_%d+") then
 			local id, action = match(field, "_(%d+)_(%w+)$")
 			      id = tonumber(id)
@@ -169,10 +173,6 @@ local function inv_fields(player, data, fields)
 		data.bag = bagstack:to_string()
 		data.bag_rename = nil
 
-	elseif sb_inv and sub(sb_inv, 1, 3) == "CHG" then
-		data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
-		return
-
 	elseif fields.waypoint_add then
 		local max_waypoints = i3.settings.max_waypoints
 
@@ -343,6 +343,16 @@ local function rcp_fields(player, data, fields)
 			data.pagenum = data.pagemax
 		end
 
+	elseif fields.prev_skin or fields.next_skin then
+		if data.skin_pagemax == 1 then return end
+		data.skin_pagenum -= (fields.prev_skin and 1 or -1)
+
+		if data.skin_pagenum > data.skin_pagemax then
+			data.skin_pagenum = 1
+		elseif data.skin_pagenum == 0 then
+			data.skin_pagenum = data.skin_pagemax
+		end
+
 	elseif fields.prev_recipe or fields.next_recipe then
 		local num = data.rnum + (fields.prev_recipe and -1 or 1)
 		data.rnum = data.recipes[num] and num or (fields.prev_recipe and #data.recipes or 1)

src/gui.lua

@@ -494,20 +494,41 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 
 		local _skins = skins.get_skinlist_for_player(name)
 		local skin_name = skins.get_player_skin(player).name
-		local sks, id = {}, 1
+		local btn_y = yextra + 0.75
+		local spp = 24
 
-		for i, skin in ipairs(_skins) do
-			if skin.name == skin_name then
-				id = i
-			end
+		data.skin_pagemax = max(1, ceil(#_skins / spp))
 
-			insert(sks, skin.name)
+		fs("image_button", 1.5, btn_y, 0.35, 0.35, "", "prev_skin", "")
+		fs("image_button", 3.85, btn_y, 0.35, 0.35, "", "next_skin", "")
+
+		fs"style[skin_page;font=bold;font_size=18]"
+		fs("button", 1.85, btn_y - 0.23, 2, 0.8, "skin_page",
+			fmt("%s / %u", clr(colors.yellow, data.skin_pagenum), data.skin_pagemax))
+
+		local first = (data.skin_pagenum - 1) * spp
+		local last = first + spp - 1
+
+		for i = first, last do
+			local skin = _skins[i + 1]
+			if not skin then break end
+			local btn_name = fmt("skin_btn_%u", i + 1)
+
+			fs(fmt([[ style[%s;padding=10;
+					fgimg=%s;bgimg=%s;bgimg_hovered=i3_btn9_hovered.png;
+					bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6] ]],
+				btn_name, skin:get_preview(),
+				skin.name == skin_name and "i3_btn9_hovered.png" or "i3_btn9.png"))
+
+			local X = (i % 3) * 1.93
+
+			local Y = ceil((i % spp - X) / 3 + 1)
+			      Y += (Y * 2.45) + yextra - 2.15
+
+			fs("image_button", X, Y, 1.86, 3.4, "", btn_name, "")
+			fs(fmt("tooltip[%s;%s]", btn_name, ESC(skin.name)))
 		end
 
-		sks = concat(sks, ","):gsub(";", "")
-		fs("label", 0, yextra + 0.85, fmt("%s:", ES"Select a skin"))
-		fs(fmt("dropdown[0,%f;4,0.6;skins;%s;%u;true]", yextra + 1.1, sks, id))
-
 	elseif data.subcat == 4 then
 		if not i3.modules.awards then
 			return not_installed "awards"
@@ -579,9 +600,6 @@ local function show_popup(fs, data)
 		elseif show_sorting then
 			fs("button", 2.1, 9.7, 6, 0.8, "select_sorting", ES"Select the inventory sorting method:")
 
-			fs(fmt("style[prev_sort;fgimg=%s;fgimg_hovered=%s]", PNG.prev, PNG.prev_hover),
-			   fmt("style[next_sort;fgimg=%s;fgimg_hovered=%s]", PNG.next, PNG.next_hover))
-
 			fs("image_button", 2.2, 10.6, 0.35, 0.35, "",  "prev_sort", "")
 			fs("image_button", 7.65, 10.6, 0.35, 0.35, "", "next_sort", "")
 
@@ -606,7 +624,7 @@ local function show_popup(fs, data)
 			end
 
 			fs("style[drop_items;font_size=15;font=mono;textcolor=#dbeeff]",
-			   fmt("field[5.4,10.68;2.4,0.45;drop_items;Drop items:;%s]",
+			   fmt("field[5.4,10.68;2.4,0.45;drop_items;Remove items:;%s]",
 				ESC(concat(data.drop_items or {}, ","))),
 			   "field_close_on_enter[drop_items;false]")
 
@@ -619,7 +637,7 @@ local function show_popup(fs, data)
 			   fmt("tooltip[cb_auto_sorting;%s;#707070;#fff]",
 				ES"Enable this option to sort your inventory automatically"),
 			   fmt("tooltip[drop_items;%s;#707070;#fff]",
-				"Add a comma-separated list of items to drop on inventory sorting.\n" ..
+				"Add a comma-separated list of items to remove on inventory sorting.\n" ..
 				"Format: " .. ("mod:item,mod:item, ..."):gsub("(%a+:%a+)", clr("#bddeff", "%1"))))
 		end
 	end
@@ -667,6 +685,13 @@ local function get_inventory_fs(player, data, fs)
 
 		max_val += 10
 
+	elseif i3.modules.skins and data.subcat == 3 then
+		local spp = 24
+		local _skins = skins.get_skinlist_for_player(data.player_name)
+		local num = max(1, min(spp, #_skins - ((data.skin_pagenum - 1) * spp)))
+
+		max_val += ceil(num / 3) * 34
+
 	elseif i3.modules.awards and data.subcat == 4 then
 		award_list = awards.get_award_states(data.player_name)
 		award_list_nb = #award_list
@@ -1196,9 +1221,10 @@ local function get_export_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, max_
 
 	fs(fmt("style[scrbar_%s;noclip=true]", name),
 	   fmt("scrollbaroptions[min=1;max=%u;smallstep=1]", craft_max))
-	fs("scrollbar", data.inv_width + 8.1, data.yoffset, 3, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
-	fs("button", data.inv_width + 8.1, data.yoffset + 0.4, 3, 0.7,
-		fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
+
+	local x = data.inv_width + 8.1
+	fs("scrollbar", x, data.yoffset, 2.5, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
+	fs("button", x, data.yoffset + 0.4, 2.5, 0.7, fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
 end
 
 local function get_rcp_extra(fs, data, player, panel, is_recipe, is_usage)

src/styles.lua

@@ -79,12 +79,8 @@ local styles = string.format([[
 	style[exit;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[cancel;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[search;fgimg=%s;fgimg_hovered=%s;content_offset=0]
-	style[prev_page;fgimg=%s;fgimg_hovered=%s]
-	style[next_page;fgimg=%s;fgimg_hovered=%s]
-	style[prev_recipe;fgimg=%s;fgimg_hovered=%s]
-	style[next_recipe;fgimg=%s;fgimg_hovered=%s]
-	style[prev_usage;fgimg=%s;fgimg_hovered=%s]
-	style[next_usage;fgimg=%s;fgimg_hovered=%s]
+	style[prev_page,prev_recipe,prev_usage,prev_sort,prev_skin;fgimg=%s;fgimg_hovered=%s]
+	style[next_page,next_recipe,next_usage,next_sort,next_skin;fgimg=%s;fgimg_hovered=%s]
 	style[waypoint_add;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[bag_rename;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[btn_bag,btn_armor,btn_skins;font=bold;font_size=18;content_offset=0;sound=i3_click]
@@ -102,10 +98,6 @@ PNG.cancel,   PNG.cancel_hover,
 PNG.search,   PNG.search_hover,
 PNG.prev,     PNG.prev_hover,
 PNG.next,     PNG.next_hover,
-PNG.prev,     PNG.prev_hover,
-PNG.next,     PNG.next_hover,
-PNG.prev,     PNG.prev_hover,
-PNG.next,     PNG.next_hover,
 PNG.add,      PNG.add_hover,
 PNG.edit,     PNG.edit_hover)