Improve worldedit_gui.

diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua
index d3e6021d2f9e0a4bf6b23084f4bf9f0f59aec871..68ade5cfaa9aea220661f3ba9eee24a03e847dbd 100644 (file)
--- a/worldedit_gui/functionality.lua
+++ b/worldedit_gui/functionality.lua
@@ -1,6 +1,6 @@
 worldedit.register_gui_function("worldedit_gui_about", {\r
        name = "About",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/about"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/about"].func(name, "")\r
        end,\r
@@ -8,7 +8,7 @@ worldedit.register_gui_function("worldedit_gui_about", {
 \r
 worldedit.register_gui_function("worldedit_gui_inspect", {\r
        name = "Toggle Inspection",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/inspect"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/inspect"].func(name, worldedit.inspect[name] and "disable" or "enable")\r
        end,\r
@@ -16,7 +16,7 @@ worldedit.register_gui_function("worldedit_gui_inspect", {
 \r
 worldedit.register_gui_function("worldedit_gui_reset", {\r
        name = "Reset Region",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/reset"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/reset"].func(name, "")\r
        end,\r
@@ -24,7 +24,7 @@ worldedit.register_gui_function("worldedit_gui_reset", {
 \r
 worldedit.register_gui_function("worldedit_gui_mark", {\r
        name = "Mark Region",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/mark"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/mark"].func(name, "")\r
        end,\r
@@ -32,7 +32,7 @@ worldedit.register_gui_function("worldedit_gui_mark", {
 \r
 worldedit.register_gui_function("worldedit_gui_unmark", {\r
        name = "Unmark Region",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/unmark"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/unmark"].func(name, "")\r
        end,\r
@@ -40,7 +40,7 @@ worldedit.register_gui_function("worldedit_gui_unmark", {
 \r
 worldedit.register_gui_function("worldedit_gui_pos1", {\r
        name = "Position 1 Here",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/pos1"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/pos1"].func(name, "")\r
        end,\r
@@ -48,7 +48,7 @@ worldedit.register_gui_function("worldedit_gui_pos1", {
 \r
 worldedit.register_gui_function("worldedit_gui_pos2", {\r
        name = "Position 2 Here",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/pos2"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/pos2"].func(name, "")\r
        end,\r
@@ -56,7 +56,7 @@ worldedit.register_gui_function("worldedit_gui_pos2", {
 \r
 worldedit.register_gui_function("worldedit_gui_p", {\r
        name = "Get/Set Positions",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/p"].privs,\r
        get_formspec = function(name)\r
                return "size[12,2]" ..\r
                        "button[0,0;2,0.5;worldedit_gui;Back]" ..\r
@@ -68,12 +68,7 @@ worldedit.register_gui_function("worldedit_gui_p", {
        end,\r
 })\r
 \r
-minetest.register_on_player_receive_fields(function(player, formname, fields)\r
-       if fields.quit then\r
-               return false\r
-       end\r
-\r
-       local name = player:get_player_name()\r
+worldedit.register_gui_handler("worldedit_gui_p", function(name, fields)\r
        if fields.worldedit_gui_p_get then\r
                minetest.chatcommands["/p"].func(name, "get")\r
                return true\r
@@ -92,7 +87,7 @@ end)
 \r
 worldedit.register_gui_function("worldedit_gui_fixedpos", {\r
        name = "Fixed Positions",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/fixedpos"].privs,\r
        get_formspec = function(name)\r
                local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
                return "size[6.5,4]" ..\r
@@ -110,18 +105,14 @@ worldedit.register_gui_function("worldedit_gui_fixedpos", {
        end\r
 })\r
 \r
-minetest.register_on_player_receive_fields(function(player, formname, fields)\r
-       if fields.quit then\r
-               return false\r
-       end\r
-\r
+worldedit.register_gui_handler("worldedit_gui_fixedpos", function(name, fields)\r
        if fields.worldedit_gui_fixedpos_submit then\r
                if tonumber(fields.worldedit_gui_fixedpos_pos1x) and tonumber(fields.worldedit_gui_fixedpos_pos1y) and tonumber(fields.worldedit_gui_fixedpos_pos1z) then\r
-                       minetest.chatcommands["/fixedpos"].func(player:get_player_name(), string.format("set1 %d %d %d",\r
+                       minetest.chatcommands["/fixedpos"].func(name, string.format("set1 %d %d %d",\r
                                tonumber(fields.worldedit_gui_fixedpos_pos1x), tonumber(fields.worldedit_gui_fixedpos_pos1y), tonumber(fields.worldedit_gui_fixedpos_pos1z)))\r
                end\r
                if tonumber(fields.worldedit_gui_fixedpos_pos2x) and tonumber(fields.worldedit_gui_fixedpos_pos2y) and tonumber(fields.worldedit_gui_fixedpos_pos2z) then\r
-                       minetest.chatcommands["/fixedpos"].func(player:get_player_name(), string.format("set2 %d %d %d",\r
+                       minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %d %d %d",\r
                                tonumber(fields.worldedit_gui_fixedpos_pos2x), tonumber(fields.worldedit_gui_fixedpos_pos2y), tonumber(fields.worldedit_gui_fixedpos_pos2z)))\r
                end\r
                return true\r
@@ -131,48 +122,126 @@ end)
 \r
 worldedit.register_gui_function("worldedit_gui_volume", {\r
        name = "Region Volume",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/volume"].privs,\r
        on_select = function(name)\r
                minetest.chatcommands["/volume"].func(name, "")\r
        end,\r
 })\r
 \r
-local search_nodes = {}\r
+local gui_nodename_set = {}\r
 worldedit.register_gui_function("worldedit_gui_set", {\r
        name = "Set Nodes",\r
-       privs = {worldedit=1},\r
+       privs = minetest.chatcommands["/set"].privs,\r
        get_formspec = function(name)\r
-               local value = search_nodes[name]\r
-               local nodename\r
-               if value then\r
-                       nodename = worldedit.normalize_nodename(value)\r
-                       if nodename then\r
-                               value = nodename\r
-                       end\r
-               end\r
-               return "size[6,3]" ..\r
+               local value = gui_nodename_set[name] or "Cobblestone"\r
+               local nodename = worldedit.normalize_nodename(value)\r
+               value = nodename or value\r
+               return "size[6.5,3]" ..\r
                        "button[0,0;2,0.5;worldedit_gui;Back]" ..\r
                        "label[2,0;WorldEdit GUI > Set Nodes]" ..\r
-                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", value and minetest.formspec_escape(value) or "") ..\r
-                       "button[4,1.17;2,0.8;worldedit_gui_set_search;Search]" ..\r
-                       (nodename and string.format("item_image[4.5,2;1,1;%s]", nodename) or "image[4.5,2;1,1;unknown_node.png]") ..\r
+                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", minetest.formspec_escape(value)) ..\r
+                       "button[4,1.18;1.5,0.8;worldedit_gui_set_search;Search]" ..\r
+                       (nodename and string.format("item_image[5.5,1.18;1,1;%s]", nodename)\r
+                               or "image[5.5,1.18;1,1;unknown_node.png]") ..\r
                        "button_exit[0,2.5;4,0.8;worldedit_gui_set_submit;Set Nodes]"\r
        end,\r
 })\r
 \r
-minetest.register_on_player_receive_fields(function(player, formname, fields)\r
-       if fields.quit then\r
-               return false\r
-       end\r
-\r
-       local name = player:get_player_name()\r
+worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)\r
        if fields.worldedit_gui_set_search then\r
-               search_nodes[name] = fields.worldedit_gui_set_node\r
+               gui_nodename_set[name] = fields.worldedit_gui_set_node\r
                worldedit.show_page(name, "worldedit_gui_set")\r
                return true\r
        elseif fields.worldedit_gui_set_submit then\r
-               search_nodes[name] = fields.worldedit_gui_set_node\r
-               minetest.chatcommands["/set"].func(name, fields.worldedit_gui_set_node)\r
+               gui_nodename_set[name] = fields.worldedit_gui_set_node\r
+               minetest.chatcommands["/set"].func(name, gui_nodename_set[name])\r
+               return true\r
+       end\r
+       return false\r
+end)\r
+\r
+local gui_nodename_replace = {}\r
+worldedit.register_gui_function("worldedit_gui_replace", {\r
+       name = "Replace Nodes",\r
+       privs = minetest.chatcommands["/replace"].privs,\r
+       get_formspec = function(name)\r
+               local search_value = gui_nodename_set[name] or "Cobblestone"\r
+               local search_nodename = worldedit.normalize_nodename(search_value)\r
+               search_value = search_nodename or search_value\r
+               local replace_value, replace_nodename = gui_nodename_replace[name] or "Stone"\r
+               local replace_nodename = worldedit.normalize_nodename(replace_value)\r
+               replace_value = replace_nodename or replace_value\r
+               return "size[6,4]" ..\r
+                       "button[0,0;2,0.5;worldedit_gui;Back]" ..\r
+                       "label[2,0;WorldEdit GUI > Replace Nodes]" ..\r
+                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search_value)) ..\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.18;1,1;%s]", search_nodename)\r
+                               or "image[5.5,1.18;1,1;unknown_node.png]") ..\r
+                       string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace_value)) ..\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.18;1,1;%s]", replace_nodename)\r
+                               or "image[5.5,2.18;1,1;unknown_node.png]") ..\r
+                       "button_exit[0,3.5;4,0.8;worldedit_gui_replace_submit;Replace Nodes]"\r
+       end,\r
+})\r
+\r
+worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)\r
+       if fields.worldedit_gui_replace_search_search then\r
+               gui_nodename_set[name] = fields.worldedit_gui_replace_search\r
+               worldedit.show_page(name, "worldedit_gui_replace")\r
+               return true\r
+       elseif fields.worldedit_gui_replace_replace_search then\r
+               gui_nodename_replace[name] = fields.worldedit_gui_replace_replace\r
+               worldedit.show_page(name, "worldedit_gui_replace")\r
+               return true\r
+       elseif fields.worldedit_gui_replace_submit then\r
+               gui_nodename_set[name] = fields.worldedit_gui_replace_search\r
+               gui_nodename_replace[name] = fields.worldedit_gui_replace_replace\r
+               minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename_set[name], gui_nodename_replace[name]))\r
+               return true\r
+       end\r
+       return false\r
+end)\r
+\r
+worldedit.register_gui_function("worldedit_gui_replaceinverse", {\r
+       name = "Replace Inverse",\r
+       privs = minetest.chatcommands["/replaceinverse"].privs,\r
+       get_formspec = function(name)\r
+               local search_value = gui_nodename_set[name] or "Cobblestone"\r
+               local search_nodename = worldedit.normalize_nodename(search_value)\r
+               search_value = search_nodename or search_value\r
+               local replace_value, replace_nodename = gui_nodename_replace[name] or "Stone"\r
+               local replace_nodename = worldedit.normalize_nodename(replace_value)\r
+               replace_value = replace_nodename or replace_value\r
+               return "size[6,4]" ..\r
+                       "button[0,0;2,0.5;worldedit_gui;Back]" ..\r
+                       "label[2,0;WorldEdit GUI > Replace Inverse]" ..\r
+                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_replaceinverse_search;Name;%s]", minetest.formspec_escape(search_value)) ..\r
+                       "button[4,1.18;1.5,0.8;worldedit_gui_replaceinverse_search_search;Search]" ..\r
+                       (search_nodename and string.format("item_image[5.5,1.18;1,1;%s]", search_nodename)\r
+                               or "image[5.5,1.18;1,1;unknown_node.png]") ..\r
+                       string.format("field[0.5,2.5;4,0.8;worldedit_gui_replaceinverse_replace;Name;%s]", minetest.formspec_escape(replace_value)) ..\r
+                       "button[4,2.18;1.5,0.8;worldedit_gui_replaceinverse_replace_search;Search]" ..\r
+                       (replace_nodename and string.format("item_image[5.5,2.18;1,1;%s]", replace_nodename)\r
+                               or "image[5.5,2.18;1,1;unknown_node.png]") ..\r
+                       "button_exit[0,3.5;4,0.8;worldedit_gui_replaceinverse_submit;Replace Inverse]"\r
+       end,\r
+})\r
+\r
+worldedit.register_gui_handler("worldedit_gui_replaceinverse", function(name, fields)\r
+       if fields.worldedit_gui_replaceinverse_search_search then\r
+               gui_nodename_set[name] = fields.worldedit_gui_replaceinverse_search\r
+               worldedit.show_page(name, "worldedit_gui_replaceinverse")\r
+               return true\r
+       elseif fields.worldedit_gui_replaceinverse_replace_search then\r
+               gui_nodename_replace[name] = fields.worldedit_gui_replaceinverse_replace\r
+               worldedit.show_page(name, "worldedit_gui_replaceinverse")\r
+               return true\r
+       elseif fields.worldedit_gui_replaceinverse_submit then\r
+               gui_nodename_set[name] = fields.worldedit_gui_replaceinverse_search\r
+               gui_nodename_replace[name] = fields.worldedit_gui_replaceinverse_replace\r
+               minetest.chatcommands["/replaceinverse"].func(name, string.format("%s %s", gui_nodename_set[name], gui_nodename_replace[name]))\r
                return true\r
        end\r
        return false\r

diff --git a/worldedit_gui/init.lua b/worldedit_gui/init.lua
index 82936d829fc0e85a360bfa0ebf5cc12bf7b107c1..3aca3a910f21f9b02815453d2a487f11ff420ede 100644 (file)
--- a/worldedit_gui/init.lua
+++ b/worldedit_gui/init.lua
@@ -22,18 +22,44 @@ Use `nil` for the `privs` field to denote that no special privileges are require
 If the identifier is already registered to another function, it will be replaced by the new one.
 ]]
 
-local pages = {} --mapping of identifiers to options
+worldedit.pages = {} --mapping of identifiers to options
 local identifiers = {} --ordered list of identifiers
 worldedit.register_gui_function = function(identifier, options)
-       pages[identifier] = options
+       worldedit.pages[identifier] = options
        table.insert(identifiers, identifier)
 end
 
+--[[
+Example:
+
+    worldedit.register_gui_handler("worldedit_gui_hollow_cylinder", function(name, fields)
+       print(minetest.serialize(fields))
+    end)
+]]
+
+worldedit.register_gui_handler = function(identifier, handler)
+       minetest.register_on_player_receive_fields(function(player, formname, fields)
+               --ensure the form is not being exited since this is a duplicate message
+               if fields.quit then
+                       return false
+               end
+               
+               local name = player:get_player_name()
+               
+               --ensure the player has permission to perform the action
+               local entry = worldedit.pages[identifier]
+               if entry and minetest.check_player_privs(name, entry.privs or {}) then
+                       return handler(name, fields)
+               end
+               return false
+       end)
+end
+
 local get_formspec = function(name, identifier)
-       if pages[identifier] then
-               return pages[identifier].get_formspec(name)
+       if worldedit.pages[identifier] then
+               return worldedit.pages[identifier].get_formspec(name)
        end
-       return pages["worldedit_gui"].get_formspec(name)
+       return worldedit.pages["worldedit_gui"].get_formspec(name)
 end
 
 worldedit.show_page = function(name, page)
@@ -73,42 +99,16 @@ if inventory_plus then
        end
 end
 
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-       if fields.quit then
-               return false
-       end
-
-       --check for WorldEdit GUI main formspec button selection
-       for identifier, entry in pairs(pages) do
-               if fields[identifier] then
-                       local name = player:get_player_name()
-
-                       --ensure player has permission to perform action
-                       if entry.privs and not minetest.check_player_privs(name, entry.privs) then
-                               return false
-                       end
-                       if entry.on_select then
-                               entry.on_select(name)
-                       end
-                       if entry.get_formspec then
-                               worldedit.show_page(name, identifier)
-                       end
-                       return true
-               end
-       end
-       return false
-end)
-
 worldedit.register_gui_function("worldedit_gui", {
        name = "WorldEdit GUI",
        get_formspec = function(name)
-               --create a form with all the buttons arranged in a grid
+               --create a form with all the buttons arranged in a grid --wip: show only buttons that the player has privs for
                local buttons, x, y, index = {}, 0, 1, 0
                local width, height = 3, 0.8
                local columns = 5
                for i, identifier in pairs(identifiers) do
                        if identifier ~= "worldedit_gui" then
-                               local entry = pages[identifier]
+                               local entry = worldedit.pages[identifier]
                                table.insert(buttons, string.format((entry.get_formspec and "button" or "button_exit") ..
                                        "[%g,%g;%g,%g;%s;%s]", x, y, width, height, identifier, minetest.formspec_escape(entry.name)))
 
@@ -126,4 +126,24 @@ worldedit.register_gui_function("worldedit_gui", {
        end,
 })
 
+worldedit.register_gui_handler("worldedit_gui", function(name, fields)
+       --check for WorldEdit GUI main formspec button selection
+       for identifier, entry in pairs(worldedit.pages) do
+               if fields[identifier] then
+                       --ensure player has permission to perform action
+                       if not minetest.check_player_privs(name, entry.privs or {}) then
+                               return false
+                       end
+                       if entry.on_select then
+                               entry.on_select(name)
+                       end
+                       if entry.get_formspec then
+                               worldedit.show_page(name, identifier)
+                       end
+                       return true
+               end
+       end
+       return false
+end)
+
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/functionality.lua")
\ No newline at end of file