Skip to content

Commit 89d4548

Browse files
UberiUberi
committedDec 12, 2013
More improvements to worldedit_gui
·
supports_mt041.2
1 parent 6c03ab9 commit 89d4548

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed
 

‎worldedit_gui/functionality.lua

+28-18
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ worldedit.register_gui_handler("worldedit_gui_fixedpos", function(name, fields)
8282
if x2 and y2 and z2 then
8383
minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %d %d %d", x2, y2, z2))
8484
end
85+
worldedit.show_page(name, "worldedit_gui_fixedpos")
8586
return true
8687
end
8788
return false
@@ -110,6 +111,7 @@ worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
110111
return true
111112
elseif fields.worldedit_gui_set_submit then
112113
gui_nodename1[name] = fields.worldedit_gui_set_node
114+
worldedit.show_page(name, "worldedit_gui_set")
113115
minetest.chatcommands["/set"].func(name, gui_nodename1[name])
114116
return true
115117
end
@@ -149,6 +151,7 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
149151
elseif fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then
150152
gui_nodename1[name] = fields.worldedit_gui_replace_search
151153
gui_nodename2[name] = fields.worldedit_gui_replace_replace
154+
worldedit.show_page(name, "worldedit_gui_replace")
152155
if fields.worldedit_gui_replace_submit then
153156
minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))
154157
else
@@ -159,36 +162,43 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
159162
return false
160163
end)
161164

162-
worldedit.register_gui_function("worldedit_gui_sphere", {
163-
name = "Sphere", privs = minetest.chatcommands["/sphere"].privs,
165+
worldedit.register_gui_function("worldedit_gui_sphere_dome", {
166+
name = "Sphere/Dome", privs = minetest.chatcommands["/sphere"].privs,
164167
get_formspec = function(name)
165168
local value = gui_nodename1[name] or "Cobblestone"
166169
local radius = gui_radius[name] or "5"
167170
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+
return "size[6.5,5]" .. worldedit.get_formspec_header("worldedit_gui_sphere_dome") ..
172+
string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_dome_node;Name;%s]", minetest.formspec_escape(value)) ..
173+
"button[4,1.18;1.5,0.8;worldedit_gui_sphere_dome_search;Search]" ..
171174
(nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)
172175
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]"
176+
string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_dome_radius;Radius;%s]", minetest.formspec_escape(radius)) ..
177+
"button_exit[0,3.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow;Hollow Sphere]" ..
178+
"button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_dome_submit_solid;Solid Sphere]" ..
179+
"button_exit[0,4.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow_dome;Hollow Dome]" ..
180+
"button_exit[3.5,4.5;3,0.8;worldedit_gui_sphere_dome_submit_solid_dome;Solid Dome]"
176181
end,
177182
})
178183

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")
184+
worldedit.register_gui_handler("worldedit_gui_sphere_dome", function(name, fields)
185+
if fields.worldedit_gui_sphere_dome_search then
186+
gui_nodename1[name] = fields.worldedit_gui_sphere_dome_node
187+
worldedit.show_page(name, "worldedit_gui_sphere_dome")
183188
return true
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+
elseif fields.worldedit_gui_sphere_dome_submit_hollow or fields.worldedit_gui_sphere_dome_submit_solid
190+
or fields.worldedit_gui_sphere_dome_submit_hollow_dome or fields.worldedit_gui_sphere_dome_submit_solid_dome then
191+
gui_nodename1[name] = fields.worldedit_gui_sphere_dome_node
192+
gui_radius[name] = fields.worldedit_gui_sphere_dome_radius
193+
worldedit.show_page(name, "worldedit_gui_sphere_dome")
194+
if fields.worldedit_gui_sphere_dome_submit_hollow then
189195
minetest.chatcommands["/hollowsphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
190-
else
196+
elseif fields.worldedit_gui_sphere_dome_submit_solid then
191197
minetest.chatcommands["/sphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
198+
elseif fields.worldedit_gui_sphere_dome_submit_hollow_dome then
199+
minetest.chatcommands["/hollowdome"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
200+
else --fields.worldedit_gui_sphere_dome_submit_solid_dome
201+
minetest.chatcommands["/dome"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))
192202
end
193203
return true
194204
end

0 commit comments

Comments
 (0)
Please sign in to comment.