Merge remote-tracking branch 'upstream/master'

more consistent formspec size decision
2025-07-17 07:40:33 +02:00 · 2021-04-04 21:05:40 +02:00 · 2021-03-31 00:52:30 -04:00 · 2021-03-12 12:01:23 +01:00 · 2021-03-10 21:20:31 -05:00 · 2021-03-10 12:32:55 -05:00
7 changed files with 25 additions and 66 deletions
--- a/README.md
+++ b/README.md
@ -24,7 +24,7 @@ Unified Inventory replaces the default survival and creative inventory.

 ## Requirements

- * Minetest 5.0.0+
+ * Minetest 5.4.0+

 # Licenses

@ -96,4 +96,4 @@ Other files from Wikimedia Commons:

 RealBadAngel: (CC-BY-4.0)

-  * Everything else.
+  * Everything else.
--- a/api.lua
+++ b/api.lua
@ -316,8 +316,8 @@ end
 function ui.make_trash_slot(xpos, ypos)
 	return
 		ui.single_slot(xpos, ypos)..
-		"image["..xpos..","..ypos..";1.25,1.25;ui_trash_slot_icon.png^[opacity:95]"..
-		"list[detached:trash;main;"..xpos..","..ypos..";1,1;]"
+		"image["..xpos..","..ypos..";1.25,1.25;ui_trash_slot_icon.png]"..
+		"list[detached:trash;main;"..(xpos + ui.list_img_offset)..","..(ypos + ui.list_img_offset)..";1,1;]"
 end

 function ui.make_inv_img_grid(xpos, ypos, width, height, bright)
--- a/bags.lua
+++ b/bags.lua
@ -137,7 +137,7 @@ end
 local function load_bags_metadata(player, bags_inv)
 	local player_inv = player:get_inventory()
 	local meta = player:get_meta()
-	local bags_meta = meta:get_string("unified_inventory:bags")
+	local bags_meta = meta:get("unified_inventory:bags")
 	local bags = bags_meta and minetest.deserialize(bags_meta) or {}
 	local dirty_meta = false
 	if not bags_meta then
--- a/init.lua
+++ b/init.lua
@ -49,6 +49,8 @@ local ui = unified_inventory
 ui.style_full = {
 	formspec_x = 1,
 	formspec_y = 1,
+	formw = 17.75,
+	formh = 12.25,
 	pagecols = 8,
 	pagerows = 10,
 	page_x = 10.75,
@ -80,6 +82,8 @@ ui.style_full = {
 ui.style_lite = {
 	formspec_x =  0.6,
 	formspec_y =  0.6,
+	formw = 14,
+	formh = 9.75,
 	pagecols = 4,
 	pagerows = 6,
 	page_x = 10.5,
@ -113,7 +117,7 @@ dofile(modpath.."/api.lua")
 for _, style in ipairs({ui.style_full, ui.style_lite}) do
 	style.items_per_page =  style.pagecols * style.pagerows
 	style.standard_inv = string.format("list[current_player;main;%f,%f;8,4;]",
-							style.std_inv_x+0.13, style.std_inv_y+0.13)
+							style.std_inv_x + ui.list_img_offset, style.std_inv_y + ui.list_img_offset)

 	style.standard_inv_bg = ui.make_inv_img_grid(style.std_inv_x, style.std_inv_y, 8, 1, true)..
 							ui.make_inv_img_grid(style.std_inv_x, style.std_inv_y + ui.imgscale, 8, 3)
@ -159,3 +163,5 @@ dofile(modpath.."/item_names.lua")
 if minetest.get_modpath("datastorage") then
 	dofile(modpath.."/waypoints.lua")
 end
+
+minetest.log("action", "[unified_inventory] loaded.")
--- a/internal.lua
+++ b/internal.lua
@ -40,18 +40,15 @@ function ui.get_formspec(player, page)
 	if not pagedef then
 		return "" -- Invalid page name
 	end
-
+	
 	local formspec = {
-		"formspec_version[4]size[17.75,12.25]",
+		"formspec_version[4]",
+		"size["..ui_peruser.formw..","..ui_peruser.formh.."]",
 		pagedef.formspec_prepend and "" or "no_prepend[]",
-		ui.standard_background -- Background
+		ui.standard_background
 	}
-	local n = 4

-	if draw_lite_mode then
-		formspec[1] = "formspec_version[4]size[14,9.75]"
-		formspec[3] = ui.standard_background
-	end
+	local n = 5

 	local perplayer_formspec = ui.get_per_player_formspec(player_name)
 	local fsdata = pagedef.get_formspec(player, perplayer_formspec)
@ -72,17 +69,21 @@ function ui.get_formspec(player, page)
 		end
 	end

+	local j = 1 --Modif NALC (sys4 20/11/2018) 12 buttons max by row
 	for i, def in pairs(filtered_inv_buttons) do

 		if draw_lite_mode and i > 4 then
 			button_row = 1
 			button_col = 1
+		elseif not draw_lite_mode and j > 12 then
+			button_row = 1
+			j = 1
 		end

 		if def.type == "image" then
 			if (def.condition == nil or def.condition(player) == true) then
 				formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s;]",
-					ui_peruser.main_button_x + ui_peruser.btn_spc * (i - 1) - button_col * ui_peruser.btn_spc * 4,
+					ui_peruser.main_button_x + ui_peruser.btn_spc * (j - 1) - button_col * ui_peruser.btn_spc * 4, -- Modif NALC
 					ui_peruser.main_button_y + button_row * ui_peruser.btn_spc,
 					ui_peruser.btn_size,ui_peruser.btn_size,
 					F(def.image),
@ -91,12 +92,13 @@ function ui.get_formspec(player, page)
 				n = n+2
 			else
 				formspec[n] = string.format("image[%f,%f;%f,%f;%s^[colorize:#808080:alpha]",
-				ui_peruser.main_button_x + ui_peruser.btn_spc * (i - 1) - button_col * ui_peruser.btn_spc * 4,
+				ui_peruser.main_button_x + ui_peruser.btn_spc * (j - 1) - button_col * ui_peruser.btn_spc * 4, -- Modif NALC
 				ui_peruser.main_button_y + button_row * ui_peruser.btn_spc,
 				ui_peruser.btn_size,ui_peruser.btn_size,def.image)
 				n = n+1
 			end
 		end
+		j = j + 1 -- Modif NALC
 	end

 	if fsdata.draw_inventory ~= false then
--- a/register.lua
+++ b/register.lua
@ -41,55 +41,6 @@ ui.register_button("craftguide", {
 	tooltip = S("Crafting Guide")
 })

-ui.register_button("home_gui_set", {
-	type = "image",
-	image = "ui_sethome_icon.png",
-	tooltip = S("Set home position"),
-	hide_lite=true,
-	action = function(player)
-		local player_name = player:get_player_name()
-		if minetest.check_player_privs(player_name, {home=true}) then
-			ui.set_home(player, player:get_pos())
-			local home = ui.home_pos[player_name]
-			if home ~= nil then
-				minetest.sound_play("dingdong",
-						{to_player=player_name, gain = 1.0})
-				minetest.chat_send_player(player_name,
-					S("Home position set to: @1", minetest.pos_to_string(home)))
-			end
-		else
-			minetest.chat_send_player(player_name,
-				S("You don't have the \"home\" privilege!"))
-			ui.set_inventory_formspec(player, ui.current_page[player_name])
-		end
-	end,
-	condition = function(player)
-		return minetest.check_player_privs(player:get_player_name(), {home=true})
-	end,
-})
-
-ui.register_button("home_gui_go", {
-	type = "image",
-	image = "ui_gohome_icon.png",
-	tooltip = S("Go home"),
-	hide_lite=true,
-	action = function(player)
-		local player_name = player:get_player_name()
-		if minetest.check_player_privs(player_name, {home=true}) then
-			if ui.go_home(player) then
-				minetest.sound_play("teleport", {to_player = player_name})
-			end
-		else
-			minetest.chat_send_player(player_name,
-				S("You don't have the \"home\" privilege!"))
-			ui.set_inventory_formspec(player, ui.current_page[player_name])
-		end
-	end,
-	condition = function(player)
-		return minetest.check_player_privs(player:get_player_name(), {home=true})
-	end,
-})
-
 ui.register_button("misc_set_day", {
 	type = "image",
 	image = "ui_sun_icon.png",
@ -192,7 +143,7 @@ ui.register_page("craft", {
 			formspec[n] = ui.single_slot(craftx - 2.5, crafty + 2.5)
 			formspec[n+1] = string.format("label[%f,%f;%s]", craftx - 2.3, crafty + 2.4,F(S("Refill:")))
 			formspec[n+2] = string.format("list[detached:%srefill;main;%f,%f;1,1;]",
-				F(player_name), craftx - 2.2 - ui.list_img_offset, crafty + 2.5 + ui.list_img_offset)
+				F(player_name), craftx - 2.5 + ui.list_img_offset, crafty + 2.5 + ui.list_img_offset)
 		end
 		return {formspec=table.concat(formspec)}
 	end,
--- a/textures/ui_trash_slot_icon.png
+++ b/textures/ui_trash_slot_icon.png
Author	SHA1	Message	Date
sys4	829b38c6fc	Merge remote-tracking branch 'upstream/master'	2021-04-04 21:05:40 +02:00
Vanessa Dannenberg	860371ecf8	more consistent formspec size decision	2021-03-31 00:52:30 -04:00
sys4	70fdb8556b	Merge remote-tracking branch 'upstream/master'	2021-03-12 12:01:23 +01:00
Vanessa Dannenberg	c044f5e3b0	use the trash slot icon's alpha instead of [combine also it's supposed to be 128px, not 256px. fixed that.	2021-03-10 21:20:31 -05:00
Vanessa Dannenberg	608cdfb887	fix refill slot list[] offset also	2021-03-10 12:32:55 -05:00
Vanessa Dannenberg	afb295ec22	fix trash slot list[] offset (only noticable when listcolors[] allows slots to be visible, i.e. on mouseover)	2021-03-10 12:26:28 -05:00
Vanessa Dannenberg	a84ce24067	use the ui.list_img_offset variable for offsetting the std inv list[] so that it'll match every other list that uses it.	2021-03-09 18:31:16 -05:00
Vanessa Dannenberg	a7556c5044	update minimum MT version number	2021-03-09 15:09:46 -05:00
SmallJoker	3d58befe03	Document the API version	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	d0deba10c8	pngcrush+optipng the new slot textures and remove the slot image .xcf project file	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	97b882ad23	add a version number variable to the main table	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	44e32df00a	translate some strings inside their table	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	40d862298b	replace excessive spaces with tabs	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	0ebc9402ed	minor tweaks to the slot images to make them better-resemble their pre-9-sliced versions (going to that mode made them slightly bigger and the corners slightly less round since they aren't blurry anymore)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	2c16805ef9	Get rid of the image button left of the crafting guide It had the same function as clicking the craft result on the right (just inverted), making it redundant. Click either one more than once and UI would alternately show usages or recipes.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	dc61d2980a	Move craft guide a little to the right to make some room.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	21f122336f	make craft arrow 128px (same reason as the trash icon)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	8ee0eb9fce	swap the craft type icon with its word (makes it look like it used to)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	1210dbfe22	make trash slot icon 128px MT nearest-neighbor-scales images to about 75px if they're 1x1 slot in size (at least on my screen). Use the next power of 2 above that, so that MT can scale down instead of up.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	b8a568d7eb	remove unused var, excess whitespace	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	9ddea6eced	fix missing "XYZ" and "no" icon on waypoints show coordinates button	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	76c9bb9517	Use 9-slicing to build inventory-type backgrounds This way the slots are all nice and crisp regardless of GUI scale or image size, and we only need the single slot and its bright version. This also makes the standard crafting grid into a style table entry that can be referenced to insert the crafting grid at its proper style-specific position in any formspec. And it also makes the craft grid arrow, its X position, and the crafting grid's result slot X position into style table entries. Includes a few public helper functions to do most of the work: `ui.single_slot(xpos, ypos, bright)` Does just what it sounds like: it returns a single slot image. `xpos` and `ypos` are normal coordinates in slots, as you'd use in `image[]` element. `bright` is a flag that switches to the brighter version of the slot image. `ui.make_trash_slot(xpos, ypos)` Creates a single slot, with a one-item `list[]` and a trash can icon overlay. `ui.make_inv_img_grid(xpos, ypos, width, height, bright)` Generates a `width` by `height` grid of slot images, using the single_slot function above, starting at (`xpos`,`ypos`) for the top-left. Position is as in any `image[]` element, and dimensions are in integer numbers of slots (so 8,4 would be a standard inventory). `bright` is as above. All three return a string that can be directly inserted into a formspec.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	60d7a6d213	Draw the trash slot by overlaying the bare trash can icon over the single slot image instead of baking it in.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	8e94d86420	don't display the refill slot image if no creative priv/mode (leftover from when it was part of the craft grid image) Also fixed a typo in the corresponding list[] element that made it not work.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	6d892dda5b	use local ui=unified_inventory shorthand in init.lua as elsewhere	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	37546289bc	using a table.copy() to pass the style tables around requires setting-up items_per_page, standard_inv, and standard_inv_bg for both tables at init time.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	3e7f005366	always modify and return a table.copy() of the style table	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	382219c466	move S() calls into waypoints' button table instead of inside the loop	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	5ea0208ffe	Multiple related changes to string handling 1) Convert most formspec elements to use string.format(), when the result would be more readable, or less messy, or at least makes the line shorter, assuming it looked like it really needed it to begin with. 2) Convert all long `foo..","..bar..";"..baz..bleh..` types of excessive string concatenation into tables that then get concated only once, when their containing functions return the final formspec string. 3) In some places in the code, such tables were already being used, and were named "formspec", while others were named "fs". I settled on just one name, "formspec", as it's more readable, if longer. 4) There was a mix of styles of adding items to those tables: * Some places used line after line of `t[#t + 1] = foo/bar/baz`. * Others places used the form `t[1] = foo, t[2] = bar, ...`. * Still others used the form `t[n] = foo, t[n+1] = bar...`, with `n` being increased or reset every so often. Most of them should now be of the third form, with a few of the second.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	694553e68b	use local "ui" to reference "unified_inventory", where practical (makes code shorter, easier to read and write)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	2d200eb9ae	Ditto for bags.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	b3077898a7	make waypoints explicitly reference full-style vars (since it does not support lite mode)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	5a8a75f43b	put style-specific settings in their own tables and switch between them directly, instead of copy-and-modify.	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	0c05f06fa8	"Please continue to use string.format here to avoid messy code" Derp :-)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	c3679eaf7b	fix indent	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	23a089f174	remove a used-only-once variable	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	82bc2d3f95	use string.format() to create the standard_inv variables do it just once, after the lite mode settings are applied (if applicable)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	603b5d1d4e	get rid of `uninv` global make all uses of it back into `unified_inventory.`	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	eb4cf5bf47	increase spacing around the text above the items page ("Filter:" and its search key, and the page or "No matches) Adjust main and page flipping buttons' positions to compensate	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	97960c552b	increase size and tweak position of "give/to grid" buttons and make them vary in pos with lite vs full mode	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	81d6a1e796	shift the craft grid and guide down a bit to make more room for the result string (and shift the result string down a hair to follow)	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	de575a6513	9-slice the background image	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	7a0a44037a	remove a couple of unused variables	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	cc93288a6b	bump minimum version to 5.4.0	2021-03-09 15:04:11 -05:00
Vanessa Dannenberg	167dddaa84	Convert over to formspec version 4 I recreated the original layout as best as practical, but by necessity there are a few minor positioning changes, since the underlying hard-wired inventory slots are square now and image positioning is now scaled by exactly 1.250 in both dimensions (as opposed to roughly 1.25 by 1.16). Backstage, I also needed to fix the aspect ratios of the various inventory slot elements. That meant redesigning the single-slot image from scratch. It was already blurry/grainy and a little ugly, and trying to alter it would have only made it worse. The slot image is now exactly 56x56 pixels square, set on a 64x64 canvas, so there's a 4 pixel empty space around the edges. The full 256px .xcf workfile is included in the UI folder. I've re-tiled all slot/inv images from the new single slot. I also re-rendered the trash can icon from it since it was blurry and oddly-sized. I couldn't find the original upstream image, so since they're free, I used one of my Linux system's icons which happens to resemble it. I also removed a couple more improper uses of `background[]` where `image[]` is more appropriate. There are tons of minor tweaks throughout the code to re-align everything, and I had to rewrite a few sections to avoid code duplication and to allow for a little more flexibility (mainly to make "lite" mode look right).	2021-03-09 15:04:11 -05:00
SmallJoker	d1a4396fbe	Fix bags backwards compatibility breakage since `4403b69` (#167 )	2021-03-09 11:12:50 +01:00
sys4	497c632b24	Merge remote-tracking branch 'upstream/master'	2020-12-18 12:20:14 +01:00
sys4	46eeb36784	Merge remote-tracking branch 'upstream/master'	2020-07-18 11:28:21 +02:00
sys4	9a31609cfd	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-14 22:55:56 +02:00
sys4	8e6a3740ae	Merge branch 'master' of yunohost.local:minetest-mods/unified_inventory into nalc-1.2-dev	2019-12-22 15:57:28 +01:00
sys4	1fd87f5c51	Suppression des icônes set_home et home_go	2019-05-01 17:28:36 +02:00
sys4	e5dc9ed53a	Merge branch 'master' into nalc-1.1	2019-05-01 17:15:35 +02:00
sys4-fr	4bf5f22696	Merge branch 'master' into nalc	2019-01-19 19:43:32 +01:00
sys4-fr	4f666f93d0	Ajoute message de chargement du mod dans le journal "action"	2019-01-19 19:43:04 +01:00
sys4-fr	264833ed41	Place les boutons d'inventaires sur 2 lignes	2018-11-20 22:04:24 +01:00