Skip to content

Commit 6c03ab9

Browse files
UberiUberi
committedDec 12, 2013
Refine GUI.
·
supports_mt041.2
1 parent dbc2348 commit 6c03ab9

File tree

3 files changed

+140
-175
lines changed

3 files changed

+140
-175
lines changed
 

‎worldedit_commands/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ end
1919
--determines whether `nodename` is a valid node name, returning a boolean
2020
worldedit.normalize_nodename = function(nodename)
2121
local fullname = ItemStack({name=nodename}):get_name() --resolve aliases of node names to full names
22-
if minetest.registered_nodes[fullname] then --directly found node name or alias of nodename
22+
if minetest.registered_nodes[fullname] or fullname == "air" then --directly found node name or alias of nodename
2323
return fullname
2424
end
2525
for key, value in pairs(minetest.registered_nodes) do

‎worldedit_gui/functionality.lua

+125-157
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,65 @@
1-
worldedit.register_gui_function("worldedit_gui_about", {
2-
name = "About",
3-
privs = minetest.chatcommands["/about"].privs,
4-
on_select = function(name)
5-
minetest.chatcommands["/about"].func(name, "")
6-
end,
7-
})
8-
9-
worldedit.register_gui_function("worldedit_gui_inspect", {
10-
name = "Toggle Inspection",
11-
privs = minetest.chatcommands["/inspect"].privs,
12-
on_select = function(name)
13-
minetest.chatcommands["/inspect"].func(name, worldedit.inspect[name] and "disable" or "enable")
14-
end,
15-
})
16-
17-
worldedit.register_gui_function("worldedit_gui_reset", {
18-
name = "Reset Region",
19-
privs = minetest.chatcommands["/reset"].privs,
20-
on_select = function(name)
21-
minetest.chatcommands["/reset"].func(name, "")
22-
end,
23-
})
24-
25-
worldedit.register_gui_function("worldedit_gui_mark", {
26-
name = "Mark Region",
27-
privs = minetest.chatcommands["/mark"].privs,
28-
on_select = function(name)
29-
minetest.chatcommands["/mark"].func(name, "")
30-
end,
31-
})
32-
33-
worldedit.register_gui_function("worldedit_gui_unmark", {
34-
name = "Unmark Region",
35-
privs = minetest.chatcommands["/unmark"].privs,
36-
on_select = function(name)
37-
minetest.chatcommands["/unmark"].func(name, "")
38-
end,
39-
})
40-
41-
worldedit.register_gui_function("worldedit_gui_pos1", {
42-
name = "Position 1 Here",
43-
privs = minetest.chatcommands["/pos1"].privs,
44-
on_select = function(name)
45-
minetest.chatcommands["/pos1"].func(name, "")
46-
end,
47-
})
48-
49-
worldedit.register_gui_function("worldedit_gui_pos2", {
50-
name = "Position 2 Here",
51-
privs = minetest.chatcommands["/pos2"].privs,
52-
on_select = function(name)
53-
minetest.chatcommands["/pos2"].func(name, "")
54-
end,
55-
})
1+
--saved state per player
2+
local gui_nodename1 = {}
3+
local gui_nodename2 = {}
4+
local gui_radius = {}
5+
local gui_formspec = {}
6+
7+
local register_gui_chatcommand = function(identifier, name, command, callback)
8+
callback = callback or function(name, command) command(name, "") end
9+
worldedit.register_gui_function(identifier, {
10+
name = name,
11+
privs = minetest.chatcommands[command].privs,
12+
on_select = function(name)
13+
return callback(name, minetest.chatcommands[command].func)
14+
end,
15+
})
16+
end
17+
18+
register_gui_chatcommand("worldedit_gui_about", "About", "/about")
19+
register_gui_chatcommand("worldedit_gui_inspect", "Toggle Inspection", "/inspect", function(name, command)
20+
command(name, worldedit.inspect[name] and "disable" or "enable")
21+
end)
22+
register_gui_chatcommand("worldedit_gui_reset", "Reset Region", "/reset")
23+
register_gui_chatcommand("worldedit_gui_mark", "Mark Region", "/mark")
24+
register_gui_chatcommand("worldedit_gui_unmark", "Unmark Region", "/unmark")
5625

5726
worldedit.register_gui_function("worldedit_gui_p", {
58-
name = "Get/Set Positions",
59-
privs = minetest.chatcommands["/p"].privs,
27+
name = "Get/Set Positions", privs = minetest.chatcommands["/p"].privs,
6028
get_formspec = function(name)
61-
return "size[12,2]" ..
62-
"button[0,0;2,0.5;worldedit_gui;Back]" ..
63-
"label[2,0;WorldEdit GUI > Get/Set Positions]" ..
29+
return "size[9,2.5]" .. worldedit.get_formspec_header("worldedit_gui_p") ..
6430
"button_exit[0,1;3,0.8;worldedit_gui_p_get;Get Positions]" ..
65-
"button_exit[3,1;3,0.8;worldedit_gui_p_set;Set Positions]" ..
66-
"button_exit[6,1;3,0.8;worldedit_gui_p_set1;Set Position 1]" ..
67-
"button_exit[9,1;3,0.8;worldedit_gui_p_set2;Set Position 2]"
31+
"button_exit[3,1;3,0.8;worldedit_gui_p_set1;Set Position 1]" ..
32+
"button_exit[6,1;3,0.8;worldedit_gui_p_set2;Set Position 2]" ..
33+
"button_exit[0,2;3,0.8;worldedit_gui_pos1;Position 1 Here]" ..
34+
"button_exit[3,2;3,0.8;worldedit_gui_pos2;Position 2 Here]"
6835
end,
6936
})
7037

7138
worldedit.register_gui_handler("worldedit_gui_p", function(name, fields)
7239
if fields.worldedit_gui_p_get then
7340
minetest.chatcommands["/p"].func(name, "get")
7441
return true
75-
elseif fields.worldedit_gui_p_set then
76-
minetest.chatcommands["/p"].func(name, "set")
77-
return true
7842
elseif fields.worldedit_gui_p_set1 then
7943
minetest.chatcommands["/p"].func(name, "set1")
8044
return true
8145
elseif fields.worldedit_gui_p_set2 then
8246
minetest.chatcommands["/p"].func(name, "set2")
8347
return true
48+
elseif fields.worldedit_gui_pos1 then
49+
minetest.chatcommands["/pos1"].func(name, "")
50+
return true
51+
elseif fields.worldedit_gui_pos2 then
52+
minetest.chatcommands["/pos2"].func(name, "")
53+
return true
8454
end
8555
return false
8656
end)
8757

88-
worldedit.register_gui_function("worldedit_gui_fixedpos", {
89-
name = "Fixed Positions",
90-
privs = minetest.chatcommands["/fixedpos"].privs,
58+
worldedit.register_gui_function("worldedit_gui_fixedpos", { --wip: combine this with get/set positions
59+
name = "Fixed Positions", privs = minetest.chatcommands["/fixedpos"].privs,
9160
get_formspec = function(name)
9261
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
93-
return "size[6.5,4]" ..
94-
"button[0,0;2,0.5;worldedit_gui;Back]" ..
95-
"label[2,0;WorldEdit GUI > Fixed Positions]" ..
62+
return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_fixedpos") ..
9663
"label[0,1.2;Position 1]" ..
9764
string.format("field[2,1.5;1.5,0.8;worldedit_gui_fixedpos_pos1x;Axis X;%s]", pos1 and pos1.x or "") ..
9865
string.format("field[3.5,1.5;1.5,0.8;worldedit_gui_fixedpos_pos1y;Axis Y;%s]", pos1 and pos1.y or "") ..
@@ -101,147 +68,148 @@ worldedit.register_gui_function("worldedit_gui_fixedpos", {
10168
string.format("field[2,2.5;1.5,0.8;worldedit_gui_fixedpos_pos2x;Axis X;%s]", pos2 and pos2.x or "") ..
10269
string.format("field[3.5,2.5;1.5,0.8;worldedit_gui_fixedpos_pos2y;Axis Y;%s]", pos2 and pos2.y or "") ..
10370
string.format("field[5,2.5;1.5,0.8;worldedit_gui_fixedpos_pos2z;Axis Z;%s]", pos2 and pos2.z or "") ..
104-
"button_exit[0,3.5;4,0.8;worldedit_gui_fixedpos_submit;Set Fixed Positions]"
71+
"button_exit[0,3.5;3,0.8;worldedit_gui_fixedpos_submit;Set Positions]"
10572
end
10673
})
10774

10875
worldedit.register_gui_handler("worldedit_gui_fixedpos", function(name, fields)
10976
if fields.worldedit_gui_fixedpos_submit then
110-
if tonumber(fields.worldedit_gui_fixedpos_pos1x) and tonumber(fields.worldedit_gui_fixedpos_pos1y) and tonumber(fields.worldedit_gui_fixedpos_pos1z) then
111-
minetest.chatcommands["/fixedpos"].func(name, string.format("set1 %d %d %d",
112-
tonumber(fields.worldedit_gui_fixedpos_pos1x), tonumber(fields.worldedit_gui_fixedpos_pos1y), tonumber(fields.worldedit_gui_fixedpos_pos1z)))
77+
local x1, y1, z1 = tonumber(fields.worldedit_gui_fixedpos_pos1x), tonumber(fields.worldedit_gui_fixedpos_pos1y), tonumber(fields.worldedit_gui_fixedpos_pos1z)
78+
if x1 and y1 and z1 then
79+
minetest.chatcommands["/fixedpos"].func(name, string.format("set1 %d %d %d", x1, y1, z1))
11380
end
114-
if tonumber(fields.worldedit_gui_fixedpos_pos2x) and tonumber(fields.worldedit_gui_fixedpos_pos2y) and tonumber(fields.worldedit_gui_fixedpos_pos2z) then
115-
minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %d %d %d",
116-
tonumber(fields.worldedit_gui_fixedpos_pos2x), tonumber(fields.worldedit_gui_fixedpos_pos2y), tonumber(fields.worldedit_gui_fixedpos_pos2z)))
81+
local x2, y2, z2 = tonumber(fields.worldedit_gui_fixedpos_pos2x), tonumber(fields.worldedit_gui_fixedpos_pos2y), tonumber(fields.worldedit_gui_fixedpos_pos2z)
82+
if x2 and y2 and z2 then
83+
minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %d %d %d", x2, y2, z2))
11784
end
11885
return true
11986
end
12087
return false
12188
end)
12289

123-
worldedit.register_gui_function("worldedit_gui_volume", {
124-
name = "Region Volume",
125-
privs = minetest.chatcommands["/volume"].privs,
126-
on_select = function(name)
127-
minetest.chatcommands["/volume"].func(name, "")
128-
end,
129-
})
90+
register_gui_chatcommand("worldedit_gui_volume", "Region Volume", "/volume")
13091

131-
local gui_nodename_set = {}
13292
worldedit.register_gui_function("worldedit_gui_set", {
133-
name = "Set Nodes",
134-
privs = minetest.chatcommands["/set"].privs,
93+
name = "Set Nodes", privs = minetest.chatcommands["/set"].privs,
13594
get_formspec = function(name)
136-
local value = gui_nodename_set[name] or "Cobblestone"
95+
local value = gui_nodename1[name] or "Cobblestone"
13796
local nodename = worldedit.normalize_nodename(value)
138-
value = nodename or value
139-
return "size[6.5,3]" ..
140-
"button[0,0;2,0.5;worldedit_gui;Back]" ..
141-
"label[2,0;WorldEdit GUI > Set Nodes]" ..
97+
return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_set") ..
14298
string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", minetest.formspec_escape(value)) ..
14399
"button[4,1.18;1.5,0.8;worldedit_gui_set_search;Search]" ..
144-
(nodename and string.format("item_image[5.5,1.18;1,1;%s]", nodename)
145-
or "image[5.5,1.18;1,1;unknown_node.png]") ..
146-
"button_exit[0,2.5;4,0.8;worldedit_gui_set_submit;Set Nodes]"
100+
(nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)
101+
or "image[5.5,1.1;1,1;unknown_node.png]") ..
102+
"button_exit[0,2.5;3,0.8;worldedit_gui_set_submit;Set Nodes]"
147103
end,
148104
})
149105

150106
worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
151107
if fields.worldedit_gui_set_search then
152-
gui_nodename_set[name] = fields.worldedit_gui_set_node
108+
gui_nodename1[name] = fields.worldedit_gui_set_node
153109
worldedit.show_page(name, "worldedit_gui_set")
154110
return true
155111
elseif fields.worldedit_gui_set_submit then
156-
gui_nodename_set[name] = fields.worldedit_gui_set_node
157-
minetest.chatcommands["/set"].func(name, gui_nodename_set[name])
112+
gui_nodename1[name] = fields.worldedit_gui_set_node
113+
minetest.chatcommands["/set"].func(name, gui_nodename1[name])
158114
return true
159115
end
160116
return false
161117
end)
162118

163-
local gui_nodename_replace = {}
164119
worldedit.register_gui_function("worldedit_gui_replace", {
165-
name = "Replace Nodes",
166-
privs = minetest.chatcommands["/replace"].privs,
120+
name = "Replace Nodes", privs = minetest.chatcommands["/replace"].privs,
167121
get_formspec = function(name)
168-
local search_value = gui_nodename_set[name] or "Cobblestone"
169-
local search_nodename = worldedit.normalize_nodename(search_value)
170-
search_value = search_nodename or search_value
171-
local replace_value, replace_nodename = gui_nodename_replace[name] or "Stone"
172-
local replace_nodename = worldedit.normalize_nodename(replace_value)
173-
replace_value = replace_nodename or replace_value
174-
return "size[6,4]" ..
175-
"button[0,0;2,0.5;worldedit_gui;Back]" ..
176-
"label[2,0;WorldEdit GUI > Replace Nodes]" ..
177-
string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search_value)) ..
122+
local search = gui_nodename1[name] or "Cobblestone"
123+
local search_nodename = worldedit.normalize_nodename(search)
124+
local replace = gui_nodename2[name] or "Stone"
125+
local replace_nodename = worldedit.normalize_nodename(replace)
126+
return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_replace") ..
127+
string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search)) ..
178128
"button[4,1.18;1.5,0.8;worldedit_gui_replace_search_search;Search]" ..
179-
(search_nodename and string.format("item_image[5.5,1.18;1,1;%s]", search_nodename)
180-
or "image[5.5,1.18;1,1;unknown_node.png]") ..
181-
string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace_value)) ..
129+
(search_nodename and string.format("item_image[5.5,1.1;1,1;%s]", search_nodename)
130+
or "image[5.5,1.1;1,1;unknown_node.png]") ..
131+
string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace)) ..
182132
"button[4,2.18;1.5,0.8;worldedit_gui_replace_replace_search;Search]" ..
183-
(replace_nodename and string.format("item_image[5.5,2.18;1,1;%s]", replace_nodename)
184-
or "image[5.5,2.18;1,1;unknown_node.png]") ..
185-
"button_exit[0,3.5;4,0.8;worldedit_gui_replace_submit;Replace Nodes]"
133+
(replace_nodename and string.format("item_image[5.5,2.1;1,1;%s]", replace_nodename)
134+
or "image[5.5,2.1;1,1;unknown_node.png]") ..
135+
"button_exit[0,3.5;3,0.8;worldedit_gui_replace_submit;Replace Nodes]" ..
136+
"button_exit[3.5,3.5;3,0.8;worldedit_gui_replace_submit_inverse;Replace Inverse]"
186137
end,
187138
})
188139

189140
worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
190141
if fields.worldedit_gui_replace_search_search then
191-
gui_nodename_set[name] = fields.worldedit_gui_replace_search
142+
gui_nodename1[name] = fields.worldedit_gui_replace_search
192143
worldedit.show_page(name, "worldedit_gui_replace")
193144
return true
194145
elseif fields.worldedit_gui_replace_replace_search then
195-
gui_nodename_replace[name] = fields.worldedit_gui_replace_replace
146+
gui_nodename2[name] = fields.worldedit_gui_replace_replace
196147
worldedit.show_page(name, "worldedit_gui_replace")
197148
return true
198-
elseif fields.worldedit_gui_replace_submit then
199-
gui_nodename_set[name] = fields.worldedit_gui_replace_search
200-
gui_nodename_replace[name] = fields.worldedit_gui_replace_replace
201-
minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename_set[name], gui_nodename_replace[name]))
149+
elseif fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then
150+
gui_nodename1[name] = fields.worldedit_gui_replace_search
151+
gui_nodename2[name] = fields.worldedit_gui_replace_replace
152+
if fields.worldedit_gui_replace_submit then
153+
minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))
154+
else
155+
minetest.chatcommands["/replaceinverse"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))
156+
end
202157
return true
203158
end
204159
return false
205160
end)
206161

207-
worldedit.register_gui_function("worldedit_gui_replaceinverse", {
208-
name = "Replace Inverse",
209-
privs = minetest.chatcommands["/replaceinverse"].privs,
162+
worldedit.register_gui_function("worldedit_gui_sphere", {
163+
name = "Sphere", privs = minetest.chatcommands["/sphere"].privs,
210164
get_formspec = function(name)
211-
local search_value = gui_nodename_set[name] or "Cobblestone"
212-
local search_nodename = worldedit.normalize_nodename(search_value)
213-
search_value = search_nodename or search_value
214-
local replace_value, replace_nodename = gui_nodename_replace[name] or "Stone"
215-
local replace_nodename = worldedit.normalize_nodename(replace_value)
216-
replace_value = replace_nodename or replace_value
217-
return "size[6,4]" ..
218-
"button[0,0;2,0.5;worldedit_gui;Back]" ..
219-
"label[2,0;WorldEdit GUI > Replace Inverse]" ..
220-
string.format("field[0.5,1.5;4,0.8;worldedit_gui_replaceinverse_search;Name;%s]", minetest.formspec_escape(search_value)) ..
221-
"button[4,1.18;1.5,0.8;worldedit_gui_replaceinverse_search_search;Search]" ..
222-
(search_nodename and string.format("item_image[5.5,1.18;1,1;%s]", search_nodename)
223-
or "image[5.5,1.18;1,1;unknown_node.png]") ..
224-
string.format("field[0.5,2.5;4,0.8;worldedit_gui_replaceinverse_replace;Name;%s]", minetest.formspec_escape(replace_value)) ..
225-
"button[4,2.18;1.5,0.8;worldedit_gui_replaceinverse_replace_search;Search]" ..
226-
(replace_nodename and string.format("item_image[5.5,2.18;1,1;%s]", replace_nodename)
227-
or "image[5.5,2.18;1,1;unknown_node.png]") ..
228-
"button_exit[0,3.5;4,0.8;worldedit_gui_replaceinverse_submit;Replace Inverse]"
165+
local value = gui_nodename1[name] or "Cobblestone"
166+
local radius = gui_radius[name] or "5"
167+
local nodename = worldedit.normalize_nodename(value)
168+
return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_sphere") ..
169+
string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_node;Name;%s]", minetest.formspec_escape(value)) ..
170+
"button[4,1.18;1.5,0.8;worldedit_gui_sphere_search;Search]" ..
171+
(nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)
172+
or "image[5.5,1.1;1,1;unknown_node.png]") ..
173+
string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_radius;Radius;%s]", minetest.formspec_escape(radius)) ..
174+
"button_exit[0,3.5;3,0.8;worldedit_gui_sphere_submit_hollow;Hollow Sphere]" ..
175+
"button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_submit_solid;Solid Sphere]"
229176
end,
230177
})
231178

232-
worldedit.register_gui_handler("worldedit_gui_replaceinverse", function(name, fields)
233-
if fields.worldedit_gui_replaceinverse_search_search then
234-
gui_nodename_set[name] = fields.worldedit_gui_replaceinverse_search
235-
worldedit.show_page(name, "worldedit_gui_replaceinverse")
179+
worldedit.register_gui_handler("worldedit_gui_sphere", function(name, fields)
180+
if fields.worldedit_gui_sphere_search then
181+
gui_nodename1[name] = fields.worldedit_gui_sphere_node
182+
worldedit.show_page(name, "worldedit_gui_sphere")
236183
return true
237-
elseif fields.worldedit_gui_replaceinverse_replace_search then
238-
gui_nodename_replace[name] = fields.worldedit_gui_replaceinverse_replace
239-
worldedit.show_page(name, "worldedit_gui_replaceinverse")
184+
elseif fields.worldedit_gui_sphere_submit_hollow or fields.worldedit_gui_sphere_submit_solid then
185+
gui_nodename1[name] = fields.worldedit_gui_sphere_node
186+
gui_radius[name] = fields.worldedit_gui_sphere_radius
187+
print(minetest.serialize(fields))
188+
if fields.worldedit_gui_sphere_submit_hollow then
189+
minetest.chatcommands["/hollowsphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
190+
else
191+
minetest.chatcommands["/sphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
192+
end
240193
return true
241-
elseif fields.worldedit_gui_replaceinverse_submit then
242-
gui_nodename_set[name] = fields.worldedit_gui_replaceinverse_search
243-
gui_nodename_replace[name] = fields.worldedit_gui_replaceinverse_replace
244-
minetest.chatcommands["/replaceinverse"].func(name, string.format("%s %s", gui_nodename_set[name], gui_nodename_replace[name]))
194+
end
195+
return false
196+
end)
197+
198+
worldedit.register_gui_function("worldedit_gui_formspec_tester", {
199+
name = "Formspec Tester",
200+
get_formspec = function(name)
201+
local value = gui_formspec[name] or ""
202+
return "size[8,6.5]" .. worldedit.get_formspec_header("worldedit_gui_formspec_tester") ..
203+
string.format("textarea[0.5,1;7.5,5.5;worldedit_gui_formspec_tester_value;Formspec Code;%s]", minetest.formspec_escape(value)) ..
204+
"button_exit[0,6;3,0.8;worldedit_gui_formspec_tester_show;Show Formspec]"
205+
end,
206+
})
207+
208+
worldedit.register_gui_handler("worldedit_gui_formspec_tester", function(name, fields)
209+
if fields.worldedit_gui_formspec_tester_show then
210+
gui_formspec[name] = fields.worldedit_gui_formspec_tester_value or ""
211+
worldedit.show_page(name, "worldedit_gui_formspec_tester")
212+
minetest.show_formspec(name, "worldedit:formspec_tester", gui_formspec[name])
245213
return true
246214
end
247215
return false

‎worldedit_gui/init.lua

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
--wip: make back buttons images in all screens
22
--wip: support unified_inventory, it even seems to have some sort of API now
3+
--wip: make it look good with image buttons and stuff
34

45
worldedit = worldedit or {}
56

@@ -55,11 +56,17 @@ worldedit.register_gui_handler = function(identifier, handler)
5556
end)
5657
end
5758

59+
worldedit.get_formspec_header = function(identifier)
60+
local entry = worldedit.pages[identifier] or {}
61+
return "button[0,0;2,0.5;worldedit_gui;Back]" ..
62+
string.format("label[2,0;WorldEdit GUI > %s]", entry.name or "")
63+
end
64+
5865
local get_formspec = function(name, identifier)
5966
if worldedit.pages[identifier] then
6067
return worldedit.pages[identifier].get_formspec(name)
6168
end
62-
return worldedit.pages["worldedit_gui"].get_formspec(name)
69+
return worldedit.pages["worldedit_gui"].get_formspec(name) --default to showing main page if an unknown page is given
6370
end
6471

6572
worldedit.show_page = function(name, page)
@@ -70,25 +77,13 @@ end
7077
--add button to inventory_plus if it is installed
7178
if inventory_plus then
7279
minetest.register_on_joinplayer(function(player)
73-
--ensure player has permission to perform action
74-
if minetest.check_player_privs(player:get_player_name(), {worldedit=true}) then
75-
inventory_plus.register_button(player, "worldedit_gui", "WorldEdit")
76-
end
80+
inventory_plus.register_button(player, "worldedit_gui", "WorldEdit")
7781
end)
7882

7983
--show the form when the button is pressed
8084
minetest.register_on_player_receive_fields(function(player, formname, fields)
81-
local name = player:get_player_name()
82-
83-
--ensure player has permission to perform action
84-
if not minetest.check_player_privs(name, {worldedit=true}) then
85-
return false
86-
end
87-
88-
--check for showing of main GUI
89-
local next_page = nil
9085
if fields.worldedit_gui then --main page
91-
worldedit.show_page(name, "worldedit_gui")
86+
worldedit.show_page(player:get_player_name(), "worldedit_gui")
9287
return true
9388
end
9489
return false
@@ -119,7 +114,7 @@ worldedit.register_gui_function("worldedit_gui", {
119114
end
120115
end
121116
end
122-
return string.format("size[%g,%g]", columns * width, y + 0.5) ..
117+
return string.format("size[%g,%g]", math.max(columns * width, 5), math.max(y + 0.5, 3)) ..
123118
(inventory_plus and "button[0,0;2,0.5;main;Back]" or "button_exit[0,0;2,0.5;main;Exit]") ..
124119
"label[2,0;WorldEdit GUI]" ..
125120
table.concat(buttons)
@@ -131,7 +126,9 @@ worldedit.register_gui_handler("worldedit_gui", function(name, fields)
131126
for identifier, entry in pairs(worldedit.pages) do
132127
if fields[identifier] then
133128
--ensure player has permission to perform action
134-
if not minetest.check_player_privs(name, entry.privs or {}) then
129+
local has_privs, missing_privs = minetest.check_player_privs(name, entry.privs or {})
130+
if not has_privs then
131+
worldedit.player_notify(name, "you are not allowed to use this function (missing privileges: " .. table.concat(missing_privs, ", ") .. ")")
135132
return false
136133
end
137134
if entry.on_select then

0 commit comments

Comments
 (0)
Please sign in to comment.