--saved state for each player\r
-local gui_nodename1 = {} --mapping of player names to node names (arbitrary strings may also appear as values)\r
-local gui_nodename2 = {} --mapping of player names to node names (arbitrary strings may also appear as values)\r
+local gui_nodename1 = {} --mapping of player names to node names\r
+local gui_nodename2 = {} --mapping of player names to node names\r
local gui_axis1 = {} --mapping of player names to axes (one of 1, 2, 3, or 4, representing the axes in the `axis_indices` table below)\r
local gui_axis2 = {} --mapping of player names to axes (one of 1, 2, 3, or 4, representing the axes in the `axis_indices` table below)\r
local gui_distance1 = {} --mapping of player names to a distance (arbitrary strings may also appear as values)\r
local gui_count2 = {} --mapping of player names to a quantity (arbitrary strings may also appear as values)\r
local gui_count3 = {} --mapping of player names to a quantity (arbitrary strings may also appear as values)\r
local gui_angle = {} --mapping of player names to an angle (one of 90, 180, 270, representing the angle in degrees clockwise)\r
-local gui_filename = {} --mapping of player names to file names (arbitrary strings may also appear as values)\r
-local gui_formspec = {} --mapping of player names to formspecs\r
-local gui_code = {} --mapping of player names to formspecs\r
+local gui_filename = {} --mapping of player names to file names\r
\r
--set default values\r
setmetatable(gui_nodename1, {__index = function() return "Cobblestone" end})\r
setmetatable(gui_count3, {__index = function() return "4" end})\r
setmetatable(gui_angle, {__index = function() return 90 end})\r
setmetatable(gui_filename, {__index = function() return "building" end})\r
-setmetatable(gui_formspec, {__index = function() return "size[5,5]\nlabel[0,0;Hello, world!]" end})\r
-setmetatable(gui_code, {__index = function() return "minetest.chat_send_player(\"singleplayer\", \"Hello, world!\")" end})\r
\r
local axis_indices = {["X axis"]=1, ["Y axis"]=2, ["Z axis"]=3, ["Look direction"]=4}\r
local axis_values = {"x", "y", "z", "?"}\r
setmetatable(angle_indices, {__index = function () return 1 end})\r
setmetatable(angle_values, {__index = function () return 90 end})\r
\r
---given multiple sets of privileges, produces a single set of privs that would have the same effect as requiring all of them at the same time\r
+-- given multiple sets of privileges, produces a single set of privs that would have the same effect as requiring all of them at the same time\r
local combine_privs = function(...)\r
local result = {}\r
for i, privs in ipairs({...}) do\r
for name, value in pairs(privs) do\r
if result[name] ~= nil and result[name] ~= value then --the priv must be both true and false, which can never happen\r
- return {__fake_priv_that_nobody_has__=true} --priviledge table that can never be satisfied\r
+ return {__fake_priv_that_nobody_has__=true} --privilege table that can never be satisfied\r
end\r
result[name] = value\r
end\r
return result\r
end\r
\r
+-- display node (or unknown_node image otherwise) at specified pos in formspec\r
+local formspec_node = function(pos, nodename)\r
+ return nodename and string.format("item_image[%s;1,1;%s]", pos, nodename)\r
+ or string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos)\r
+end\r
+\r
+-- two further priv helpers\r
+local function we_privs(command)\r
+ return minetest.chatcommands["/" .. command].privs\r
+end\r
+\r
+local function combine_we_privs(list)\r
+ local args = {}\r
+ for _, t in ipairs(list) do\r
+ table.insert(args, we_privs(t))\r
+ end\r
+ return combine_privs(unpack(args))\r
+end\r
+\r
worldedit.register_gui_function("worldedit_gui_about", {\r
- name = "About", privs = minetest.chatcommands["/about"].privs,\r
+ name = "About",\r
+ privs = {interact=true},\r
on_select = function(name)\r
minetest.chatcommands["/about"].func(name, "")\r
end,\r
})\r
\r
worldedit.register_gui_function("worldedit_gui_inspect", {\r
- name = "Toggle Inspect", privs = minetest.chatcommands["/inspect"].privs,\r
+ name = "Toggle Inspect",\r
+ privs = we_privs("inspect"),\r
on_select = function(name)\r
minetest.chatcommands["/inspect"].func(name, worldedit.inspect[name] and "disable" or "enable")\r
end,\r
})\r
\r
worldedit.register_gui_function("worldedit_gui_region", {\r
- name = "Get/Set Region", privs = combine_privs(minetest.chatcommands["/p"].privs, minetest.chatcommands["/pos1"].privs, minetest.chatcommands["/pos2"].privs, minetest.chatcommands["/reset"].privs, minetest.chatcommands["/mark"].privs, minetest.chatcommands["/unmark"].privs, minetest.chatcommands["/volume"].privs, minetest.chatcommands["/fixedpos"].privs),\r
+ name = "Get/Set Region",\r
+ privs = combine_we_privs({"p", "pos1", "pos2", "reset", "mark", "unmark", "volume", "fixedpos"}),\r
get_formspec = function(name)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
return "size[9,7]" .. worldedit.get_formspec_header("worldedit_gui_region") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_set", {\r
- name = "Set Nodes", privs = minetest.chatcommands["/set"].privs,\r
+ name = "Set Nodes",\r
+ privs = we_privs("set"),\r
get_formspec = function(name)\r
local node = gui_nodename1[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_set") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_set_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
"button_exit[0,2.5;3,0.8;worldedit_gui_set_submit;Set Nodes]"\r
end,\r
})\r
gui_nodename1[name] = tostring(fields.worldedit_gui_set_node)\r
worldedit.show_page(name, "worldedit_gui_set")\r
if fields.worldedit_gui_set_submit then\r
- minetest.chatcommands["/set"].func(name, gui_nodename1[name])\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/set"].func(name, n)\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_replace", {\r
- name = "Replace Nodes", privs = combine_privs(minetest.chatcommands["/replace"].privs, minetest.chatcommands["/replaceinverse"].privs),\r
+ name = "Replace Nodes",\r
+ privs = combine_we_privs({"replace", "replaceinverse"}),\r
get_formspec = function(name)\r
local search, replace = gui_nodename1[name], gui_nodename2[name]\r
local search_nodename, replace_nodename = worldedit.normalize_nodename(search), worldedit.normalize_nodename(replace)\r
return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_replace") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_replace_search_search;Search]" ..\r
- (search_nodename and string.format("item_image[5.5,1.1;1,1;%s]", search_nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", search_nodename) ..\r
string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace)) ..\r
"button[4,2.18;1.5,0.8;worldedit_gui_replace_replace_search;Search]" ..\r
- (replace_nodename and string.format("item_image[5.5,2.1;1,1;%s]", replace_nodename)\r
- or "image[5.5,2.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,2.1", replace_nodename) ..\r
"button_exit[0,3.5;3,0.8;worldedit_gui_replace_submit;Replace Nodes]" ..\r
"button_exit[3.5,3.5;3,0.8;worldedit_gui_replace_submit_inverse;Replace Inverse]"\r
end,\r
gui_nodename1[name] = tostring(fields.worldedit_gui_replace_search)\r
gui_nodename2[name] = tostring(fields.worldedit_gui_replace_replace)\r
worldedit.show_page(name, "worldedit_gui_replace")\r
+\r
+ local submit = nil\r
if fields.worldedit_gui_replace_submit then\r
- minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))\r
+ submit = "replace"\r
elseif fields.worldedit_gui_replace_submit_inverse then\r
- minetest.chatcommands["/replaceinverse"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))\r
+ submit = "replaceinverse"\r
+ end\r
+ if submit then\r
+ local n1 = worldedit.normalize_nodename(gui_nodename1[name])\r
+ local n2 = worldedit.normalize_nodename(gui_nodename2[name])\r
+ if n1 and n2 then\r
+ minetest.chatcommands["/"..submit].func(name, string.format("%s %s", n1, n2))\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_sphere_dome", {\r
- name = "Sphere/Dome", privs = combine_privs(minetest.chatcommands["/hollowsphere"].privs, minetest.chatcommands["/sphere"].privs, minetest.chatcommands["/hollowdome"].privs, minetest.chatcommands["/dome"].privs),\r
+ name = "Sphere/Dome",\r
+ privs = combine_we_privs({"hollowsphere", "sphere", "hollowdome", "dome"}),\r
get_formspec = function(name)\r
local node, radius = gui_nodename1[name], gui_distance2[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,5]" .. worldedit.get_formspec_header("worldedit_gui_sphere_dome") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_dome_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_sphere_dome_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_dome_radius;Radius;%s]", minetest.formspec_escape(radius)) ..\r
"button_exit[0,3.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow;Hollow Sphere]" ..\r
"button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_dome_submit_solid;Solid Sphere]" ..\r
gui_nodename1[name] = tostring(fields.worldedit_gui_sphere_dome_node)\r
gui_distance2[name] = tostring(fields.worldedit_gui_sphere_dome_radius)\r
worldedit.show_page(name, "worldedit_gui_sphere_dome")\r
+\r
+ local submit = nil\r
if fields.worldedit_gui_sphere_dome_submit_hollow then\r
- minetest.chatcommands["/hollowsphere"].func(name, string.format("%s %s", gui_distance2[name], gui_nodename1[name]))\r
+ submit = "hollowsphere"\r
elseif fields.worldedit_gui_sphere_dome_submit_solid then\r
- minetest.chatcommands["/sphere"].func(name, string.format("%s %s", gui_distance2[name], gui_nodename1[name]))\r
+ submit = "sphere"\r
elseif fields.worldedit_gui_sphere_dome_submit_hollow_dome then\r
- minetest.chatcommands["/hollowdome"].func(name, string.format("%s %s", gui_distance2[name], gui_nodename1[name]))\r
+ submit = "hollowdome"\r
elseif fields.worldedit_gui_sphere_dome_submit_solid_dome then\r
- minetest.chatcommands["/dome"].func(name, string.format("%s %s", gui_distance2[name], gui_nodename1[name]))\r
+ submit = "dome"\r
+ end\r
+ if submit then\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/"..submit].func(name, string.format("%s %s", gui_distance2[name], n))\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_cylinder", {\r
- name = "Cylinder", privs = combine_privs(minetest.chatcommands["/hollowcylinder"].privs, minetest.chatcommands["/cylinder"].privs),\r
+ name = "Cylinder",\r
+ privs = combine_we_privs({"hollowcylinder", "cylinder"}),\r
get_formspec = function(name)\r
- local node, axis, length, radius = gui_nodename1[name], gui_axis1[name], gui_distance1[name], gui_distance2[name]\r
+ local node, axis, length = gui_nodename1[name], gui_axis1[name], gui_distance1[name]\r
+ local radius1, radius2 = gui_distance2[name], gui_distance3[name]\r
local nodename = worldedit.normalize_nodename(node)\r
- return "size[6.5,5]" .. worldedit.get_formspec_header("worldedit_gui_cylinder") ..\r
+ return "size[6.5,6]" .. worldedit.get_formspec_header("worldedit_gui_cylinder") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_cylinder_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_cylinder_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
string.format("field[0.5,2.5;4,0.8;worldedit_gui_cylinder_length;Length;%s]", minetest.formspec_escape(length)) ..\r
string.format("dropdown[4,2.18;2.5;worldedit_gui_cylinder_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..\r
- string.format("field[0.5,3.5;4,0.8;worldedit_gui_cylinder_radius;Radius;%s]", minetest.formspec_escape(radius)) ..\r
- "button_exit[0,4.5;3,0.8;worldedit_gui_cylinder_submit_hollow;Hollow Cylinder]" ..\r
- "button_exit[3.5,4.5;3,0.8;worldedit_gui_cylinder_submit_solid;Solid Cylinder]"\r
+ string.format("field[0.5,3.5;2,0.8;worldedit_gui_cylinder_radius1;Base Radius;%s]", minetest.formspec_escape(radius1)) ..\r
+ string.format("field[2.5,3.5;2,0.8;worldedit_gui_cylinder_radius2;Top Radius;%s]", minetest.formspec_escape(radius2)) ..\r
+ "label[0.25,4;Equal base and top radius creates a cylinder,\n"..\r
+ "zero top radius creates a cone.\nConsult documentation for more information.]"..\r
+ "button_exit[0,5.5;3,0.8;worldedit_gui_cylinder_submit_hollow;Hollow Cylinder]" ..\r
+ "button_exit[3.5,5.5;3,0.8;worldedit_gui_cylinder_submit_solid;Solid Cylinder]"\r
end,\r
})\r
\r
gui_nodename1[name] = tostring(fields.worldedit_gui_cylinder_node)\r
gui_axis1[name] = axis_indices[fields.worldedit_gui_cylinder_axis]\r
gui_distance1[name] = tostring(fields.worldedit_gui_cylinder_length)\r
- gui_distance2[name] = tostring(fields.worldedit_gui_cylinder_radius)\r
+ gui_distance2[name] = tostring(fields.worldedit_gui_cylinder_radius1)\r
+ gui_distance3[name] = tostring(fields.worldedit_gui_cylinder_radius2)\r
worldedit.show_page(name, "worldedit_gui_cylinder")\r
+\r
+ local submit = nil\r
if fields.worldedit_gui_cylinder_submit_hollow then\r
- minetest.chatcommands["/hollowcylinder"].func(name, string.format("%s %s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], gui_distance2[name], gui_nodename1[name]))\r
+ submit = "hollowcylinder"\r
elseif fields.worldedit_gui_cylinder_submit_solid then\r
- minetest.chatcommands["/cylinder"].func(name, string.format("%s %s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], gui_distance2[name], gui_nodename1[name]))\r
+ submit = "cylinder"\r
+ end\r
+ if submit then\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ local args = string.format("%s %s %s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], gui_distance2[name], gui_distance3[name], n)\r
+ minetest.chatcommands["/"..submit].func(name, args)\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_pyramid", {\r
- name = "Pyramid", privs = minetest.chatcommands["/pyramid"].privs,\r
+ name = "Pyramid",\r
+ privs = we_privs("pyramid"),\r
get_formspec = function(name)\r
local node, axis, length = gui_nodename1[name], gui_axis1[name], gui_distance1[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_pyramid") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_pyramid_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_pyramid_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
string.format("field[0.5,2.5;4,0.8;worldedit_gui_pyramid_length;Length;%s]", minetest.formspec_escape(length)) ..\r
string.format("dropdown[4,2.18;2.5;worldedit_gui_pyramid_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..\r
- "button_exit[0,3.5;3,0.8;worldedit_gui_pyramid_submit;Pyramid]"\r
+ "button_exit[0,3.5;3,0.8;worldedit_gui_pyramid_submit_hollow;Hollow Pyramid]" ..\r
+ "button_exit[3.5,3.5;3,0.8;worldedit_gui_pyramid_submit_solid;Solid Pyramid]"\r
end,\r
})\r
\r
worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields)\r
- if fields.worldedit_gui_pyramid_search or fields.worldedit_gui_pyramid_submit then\r
+ if fields.worldedit_gui_pyramid_search or fields.worldedit_gui_pyramid_submit_solid or fields.worldedit_gui_pyramid_submit_hollow or fields.worldedit_gui_pyramid_axis then\r
gui_nodename1[name] = tostring(fields.worldedit_gui_pyramid_node)\r
gui_axis1[name] = axis_indices[fields.worldedit_gui_pyramid_axis]\r
gui_distance1[name] = tostring(fields.worldedit_gui_pyramid_length)\r
worldedit.show_page(name, "worldedit_gui_pyramid")\r
- if fields.worldedit_gui_pyramid_submit then\r
- minetest.chatcommands["/pyramid"].func(name, string.format("%s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], gui_nodename1[name]))\r
+\r
+ local submit = nil\r
+ if fields.worldedit_gui_pyramid_submit_solid then\r
+ submit = "pyramid"\r
+ elseif fields.worldedit_gui_pyramid_submit_hollow then\r
+ submit = "hollowpyramid"\r
+ end\r
+ if submit then\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/"..submit].func(name, string.format("%s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], n))\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_spiral", {\r
- name = "Spiral", privs = minetest.chatcommands["/spiral"].privs,\r
+ name = "Spiral",\r
+ privs = we_privs("spiral"),\r
get_formspec = function(name)\r
local node, length, height, space = gui_nodename1[name], gui_distance1[name], gui_distance2[name], gui_distance3[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,6]" .. worldedit.get_formspec_header("worldedit_gui_spiral") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_spiral_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_spiral_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
string.format("field[0.5,2.5;4,0.8;worldedit_gui_spiral_length;Side Length;%s]", minetest.formspec_escape(length)) ..\r
string.format("field[0.5,3.5;4,0.8;worldedit_gui_spiral_height;Height;%s]", minetest.formspec_escape(height)) ..\r
string.format("field[0.5,4.5;4,0.8;worldedit_gui_spiral_space;Wall Spacing;%s]", minetest.formspec_escape(space)) ..\r
gui_distance3[name] = tostring(fields.worldedit_gui_spiral_space)\r
worldedit.show_page(name, "worldedit_gui_spiral")\r
if fields.worldedit_gui_spiral_submit then\r
- minetest.chatcommands["/spiral"].func(name, string.format("%s %s %s %s", gui_distance1[name], gui_distance2[name], gui_distance3[name], gui_nodename1[name]))\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/spiral"].func(name, string.format("%s %s %s %s", gui_distance1[name], gui_distance2[name], gui_distance3[name], n))\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_copy_move", {\r
- name = "Copy/Move", privs = combine_privs(minetest.chatcommands["/copy"].privs, minetest.chatcommands["/move"].privs),\r
+ name = "Copy/Move",\r
+ privs = combine_we_privs({"copy", "move"}),\r
get_formspec = function(name)\r
local axis = gui_axis1[name] or 4\r
local amount = gui_distance1[name] or "10"\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_stack", {\r
- name = "Stack", privs = minetest.chatcommands["/stack"].privs,\r
+ name = "Stack",\r
+ privs = we_privs("stack"),\r
get_formspec = function(name)\r
local axis, count = gui_axis1[name], gui_count1[name]\r
return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_stack") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_stretch", {\r
- name = "Stretch", privs = minetest.chatcommands["/stretch"].privs,\r
+ name = "Stretch",\r
+ privs = we_privs("stretch"),\r
get_formspec = function(name)\r
local stretchx, stretchy, stretchz = gui_count1[name], gui_count2[name], gui_count3[name]\r
return "size[5,5]" .. worldedit.get_formspec_header("worldedit_gui_stretch") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_transpose", {\r
- name = "Transpose", privs = minetest.chatcommands["/transpose"].privs,\r
+ name = "Transpose",\r
+ privs = we_privs("transpose"),\r
get_formspec = function(name)\r
local axis1, axis2 = gui_axis1[name], gui_axis2[name]\r
return "size[5.5,3]" .. worldedit.get_formspec_header("worldedit_gui_transpose") ..\r
worldedit.register_gui_handler("worldedit_gui_transpose", function(name, fields)\r
if fields.worldedit_gui_transpose_submit then\r
gui_axis1[name] = axis_indices[fields.worldedit_gui_transpose_axis1]\r
- gui_axis2[name] = axis_indices[fields.worldedit_gui_transpose_axis2]\r
worldedit.show_page(name, "worldedit_gui_transpose")\r
minetest.chatcommands["/transpose"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], axis_values[gui_axis2[name]]))\r
return true\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_flip", {\r
- name = "Flip", privs = minetest.chatcommands["/flip"].privs,\r
+ name = "Flip",\r
+ privs = we_privs("flip"),\r
get_formspec = function(name)\r
local axis = gui_axis1[name]\r
return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_flip") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_rotate", {\r
- name = "Rotate", privs = minetest.chatcommands["/rotate"].privs,\r
+ name = "Rotate",\r
+ privs = we_privs("rotate"),\r
get_formspec = function(name)\r
local axis, angle = gui_axis1[name], gui_angle[name]\r
return "size[5.5,3]" .. worldedit.get_formspec_header("worldedit_gui_rotate") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_orient", {\r
- name = "Orient", privs = minetest.chatcommands["/orient"].privs,\r
+ name = "Orient",\r
+ privs = we_privs("orient"),\r
get_formspec = function(name)\r
local angle = gui_angle[name]\r
return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_orient") ..\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_fixlight", {\r
- name = "Fix Lighting", privs = minetest.chatcommands["/fixlight"].privs,\r
+ name = "Fix Lighting",\r
+ privs = we_privs("fixlight"),\r
on_select = function(name)\r
minetest.chatcommands["/fixlight"].func(name, "")\r
end,\r
})\r
\r
worldedit.register_gui_function("worldedit_gui_hide", {\r
- name = "Hide Region", privs = minetest.chatcommands["/hide"].privs,\r
+ name = "Hide Region",\r
+ privs = we_privs("hide"),\r
on_select = function(name)\r
minetest.chatcommands["/hide"].func(name, "")\r
end,\r
})\r
\r
worldedit.register_gui_function("worldedit_gui_suppress", {\r
- name = "Suppress Nodes", privs = minetest.chatcommands["/suppress"].privs,\r
+ name = "Suppress Nodes",\r
+ privs = we_privs("suppress"),\r
get_formspec = function(name)\r
local node = gui_nodename1[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_suppress") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_suppress_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_suppress_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
"button_exit[0,2.5;3,0.8;worldedit_gui_suppress_submit;Suppress Nodes]"\r
end,\r
})\r
gui_nodename1[name] = tostring(fields.worldedit_gui_suppress_node)\r
worldedit.show_page(name, "worldedit_gui_suppress")\r
if fields.worldedit_gui_suppress_submit then\r
- minetest.chatcommands["/suppress"].func(name, gui_nodename1[name])\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/suppress"].func(name, n)\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_highlight", {\r
- name = "Highlight Nodes", privs = minetest.chatcommands["/highlight"].privs,\r
+ name = "Highlight Nodes",\r
+ privs = we_privs("highlight"),\r
get_formspec = function(name)\r
local node = gui_nodename1[name]\r
local nodename = worldedit.normalize_nodename(node)\r
return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_highlight") ..\r
string.format("field[0.5,1.5;4,0.8;worldedit_gui_highlight_node;Name;%s]", minetest.formspec_escape(node)) ..\r
"button[4,1.18;1.5,0.8;worldedit_gui_highlight_search;Search]" ..\r
- (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
- or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
"button_exit[0,2.5;3,0.8;worldedit_gui_highlight_submit;Highlight Nodes]"\r
end,\r
})\r
gui_nodename1[name] = tostring(fields.worldedit_gui_highlight_node)\r
worldedit.show_page(name, "worldedit_gui_highlight")\r
if fields.worldedit_gui_highlight_submit then\r
- minetest.chatcommands["/highlight"].func(name, gui_nodename1[name])\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ minetest.chatcommands["/highlight"].func(name, n)\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_restore", {\r
- name = "Restore Region", privs = minetest.chatcommands["/restore"].privs,\r
+ name = "Restore Region",\r
+ privs = we_privs("restore"),\r
on_select = function(name)\r
minetest.chatcommands["/restore"].func(name, "")\r
end,\r
})\r
\r
worldedit.register_gui_function("worldedit_gui_save_load", {\r
- name = "Save/Load", privs = combine_privs(minetest.chatcommands["/save"].privs, minetest.chatcommands["/allocate"].privs, minetest.chatcommands["/load"].privs),\r
+ name = "Save/Load",\r
+ privs = combine_we_privs({"save", "allocate", "load"}),\r
get_formspec = function(name)\r
local filename = gui_filename[name]\r
return "size[6,4]" .. worldedit.get_formspec_header("worldedit_gui_save_load") ..\r
return false\r
end)\r
\r
-worldedit.register_gui_function("worldedit_gui_lua", {\r
- name = "Run Lua",\r
+worldedit.register_gui_function("worldedit_gui_cube", {\r
+ name = "Cuboid", -- technically the command is misnamed, I know...\r
+ privs = combine_we_privs({"hollowcube", "cube"}),\r
get_formspec = function(name)\r
- local code = gui_code[name]\r
- return "size[8,6.5]" .. worldedit.get_formspec_header("worldedit_gui_lua") ..\r
- string.format("textarea[0.5,1;7.5,5.5;worldedit_gui_lua_code;Lua Code;%s]", minetest.formspec_escape(code)) ..\r
- "button_exit[0,6;3,0.8;worldedit_gui_lua_run;Run Lua]" ..\r
- "button_exit[5,6;3,0.8;worldedit_gui_lua_transform;Lua Transform]"\r
+ local width, height, length = gui_distance1[name], gui_distance2[name], gui_distance3[name]\r
+ local node = gui_nodename1[name]\r
+ local nodename = worldedit.normalize_nodename(node)\r
+ return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_cube") ..\r
+ string.format("field[0.5,1.5;4,0.8;worldedit_gui_cube_node;Name;%s]", minetest.formspec_escape(node)) ..\r
+ "button[4,1.18;1.5,0.8;worldedit_gui_cube_search;Search]" ..\r
+ formspec_node("5.5,1.1", nodename) ..\r
+ string.format("field[0.5,2.5;1,0.8;worldedit_gui_cube_width;Width;%s]", minetest.formspec_escape(width)) ..\r
+ string.format("field[1.5,2.5;1,0.8;worldedit_gui_cube_height;Height;%s]", minetest.formspec_escape(height)) ..\r
+ string.format("field[2.5,2.5;1,0.8;worldedit_gui_cube_length;Length;%s]", minetest.formspec_escape(length)) ..\r
+ "button_exit[0,3.5;3,0.8;worldedit_gui_cube_submit_hollow;Hollow Cuboid]" ..\r
+ "button_exit[3.5,3.5;3,0.8;worldedit_gui_cube_submit_solid;Solid Cuboid]"\r
end,\r
})\r
\r
-worldedit.register_gui_handler("worldedit_gui_lua", function(name, fields)\r
- if fields.worldedit_gui_lua_run or fields.worldedit_gui_lua_transform then\r
- gui_code[name] = fields.worldedit_gui_lua_value\r
- worldedit.show_page(name, "worldedit_gui_lua")\r
- if fields.worldedit_gui_lua_run then\r
- minetest.chatcommands["/lua"].func(name, gui_code[name])\r
- else --fields.worldedit_gui_lua_transform\r
- minetest.chatcommands["/luatransform"].func(name, gui_code[name])\r
+worldedit.register_gui_handler("worldedit_gui_cube", function(name, fields)\r
+ if fields.worldedit_gui_cube_search\r
+ or fields.worldedit_gui_cube_submit_hollow or fields.worldedit_gui_cube_submit_solid then\r
+ gui_nodename1[name] = tostring(fields.worldedit_gui_cube_node)\r
+ gui_distance1[name] = tostring(fields.worldedit_gui_cube_width)\r
+ gui_distance2[name] = tostring(fields.worldedit_gui_cube_height)\r
+ gui_distance3[name] = tostring(fields.worldedit_gui_cube_length)\r
+ worldedit.show_page(name, "worldedit_gui_cube")\r
+\r
+ local submit = nil\r
+ if fields.worldedit_gui_cube_submit_hollow then\r
+ submit = "hollowcube"\r
+ elseif fields.worldedit_gui_cube_submit_solid then\r
+ submit = "cube"\r
+ end\r
+ if submit then\r
+ local n = worldedit.normalize_nodename(gui_nodename1[name])\r
+ if n then\r
+ local args = string.format("%s %s %s %s", gui_distance1[name], gui_distance2[name], gui_distance3[name], n)\r
+ minetest.chatcommands["/"..submit].func(name, args)\r
+ end\r
end\r
return true\r
end\r
end)\r
\r
worldedit.register_gui_function("worldedit_gui_clearobjects", {\r
- name = "Clear Objects", privs = minetest.chatcommands["/clearobjects"].privs,\r
+ name = "Clear Objects",\r
+ privs = we_privs("clearobjects"),\r
on_select = function(name)\r
minetest.chatcommands["/clearobjects"].func(name, "")\r
end,\r
})\r
-\r
-worldedit.register_gui_function("worldedit_gui_formspec_tester", {\r
- name = "Formspec Tester",\r
- get_formspec = function(name)\r
- local value = gui_formspec[name]\r
- return "size[8,6.5]" .. worldedit.get_formspec_header("worldedit_gui_formspec_tester") ..\r
- string.format("textarea[0.5,1;7.5,5.5;worldedit_gui_formspec_tester_value;Formspec Code;%s]", minetest.formspec_escape(value)) ..\r
- "button_exit[0,6;3,0.8;worldedit_gui_formspec_tester_show;Show Formspec]"\r
- end,\r
-})\r
-\r
-worldedit.register_gui_handler("worldedit_gui_formspec_tester", function(name, fields)\r
- if fields.worldedit_gui_formspec_tester_show then\r
- gui_formspec[name] = fields.worldedit_gui_formspec_tester_value or ""\r
- worldedit.show_page(name, "worldedit_gui_formspec_tester")\r
- minetest.show_formspec(name, "worldedit:formspec_tester", gui_formspec[name])\r
- return true\r
- end\r
- return false\r
-end)\r
projects / worldedit.git / blobdiff