Skip to content

Commit 4b178bf

Browse files
UberiUberi
committedJul 18, 2014
Rename the randomized //set to //mix, style update, document changes.
·
supports_mt041.2
1 parent d8aa7e7 commit 4b178bf

File tree

2 files changed

+80
-78
lines changed

2 files changed

+80
-78
lines changed
 

‎Chat Commands.md

+14-5
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,23 @@ Display the volume of the current WorldEdit region.
9898

9999
//volume
100100

101-
### `//set <node1> ...`
101+
### `//set <node>`
102102

103-
Set the current WorldEdit region to a random mix of `<node1>`, `...`.
103+
Set the current WorldEdit region to `<node>`.
104104

105105
//set air
106-
//set cactus stone glass
107-
//set Bronze
108-
//set mesecons:wire_00000000_off
106+
//set cactus
107+
//set Blue Lightstone
108+
//set dirt with grass
109+
110+
### `//mix <node1> ...`
111+
112+
Fill the current WorldEdit region with a random mix of `<node1>`, `...`.
113+
114+
//mix air
115+
//mix cactus stone glass sandstone
116+
//mix Bronze
117+
//mix default:cobble air
109118

110119
### `//replace <search node> <replace node>`
111120

‎worldedit_commands/init.lua

+66-73
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ end
1515
dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")
1616
dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")
1717

18-
local get_position = function(name)
18+
local get_position = function(name) --position 1 retrieval function for when not using `safe_region`
1919
local pos1 = worldedit.pos1[name]
2020
if pos1 == nil then
2121
worldedit.player_notify(name, "no position 1 selected")
@@ -279,19 +279,35 @@ minetest.register_chatcommand("/volume", {
279279
})
280280

281281
minetest.register_chatcommand("/set", {
282+
params = "<node>",
283+
description = "Set the current WorldEdit region to <node>",
284+
privs = {worldedit=true},
285+
func = safe_region(function(name, param)
286+
local node = get_node(name, param)
287+
if not node then
288+
worldedit.player_notify(name, "Could not identify node \"" .. param .. "\"")
289+
return
290+
end
291+
292+
local count = worldedit.set(worldedit.pos1[name], worldedit.pos2[name], node)
293+
worldedit.player_notify(name, count .. " nodes set")
294+
end, check_region),
295+
})
296+
297+
minetest.register_chatcommand("/mix", {
282298
params = "<node1> ...",
283-
description = "Set the current WorldEdit region to a random mix of <node1>, ...",
299+
description = "Fill the current WorldEdit region with a random mix of <node1>, ...",
284300
privs = {worldedit=true},
285301
func = safe_region(function(name, param)
286-
local nodes = {}
287-
for nodename in param:gmatch("[^%s]+") do
288-
local node = get_node(name, nodename)
289-
if not node then
290-
worldedit.player_notify(name, "Could not identify node \"" .. name .. "\"")
291-
return
292-
end
293-
nodes[#nodes + 1] = node
294-
end
302+
local nodes = {}
303+
for nodename in param:gmatch("[^,]+") do
304+
local node = get_node(name, nodename)
305+
if not node then
306+
worldedit.player_notify(name, "Could not identify node \"" .. name .. "\"")
307+
return
308+
end
309+
nodes[#nodes + 1] = node
310+
end
295311

296312
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
297313
local count = worldedit.set(pos1, pos2, nodes)
@@ -323,11 +339,10 @@ minetest.register_chatcommand("/replace", {
323339
description = "Replace all instances of <search node> with <replace node> in the current WorldEdit region",
324340
privs = {worldedit=true},
325341
func = safe_region(function(name, param)
326-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
327342
local found, _, searchnode, replacenode = param:find("^([^%s]+)%s+(.+)$")
328343
local newsearchnode = worldedit.normalize_nodename(searchnode)
329344
local newreplacenode = worldedit.normalize_nodename(replacenode)
330-
local count = worldedit.replace(pos1, pos2, newsearchnode, newreplacenode)
345+
local count = worldedit.replace(worldedit.pos1[name], worldedit.pos2[name], newsearchnode, newreplacenode)
331346
worldedit.player_notify(name, count .. " nodes replaced")
332347
end, check_replace),
333348
})
@@ -337,11 +352,10 @@ minetest.register_chatcommand("/replaceinverse", {
337352
description = "Replace all nodes other than <search node> with <replace node> in the current WorldEdit region",
338353
privs = {worldedit=true},
339354
func = safe_region(function(name, param)
340-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
341355
local found, _, searchnode, replacenode = param:find("^([^%s]+)%s+(.+)$")
342356
local newsearchnode = worldedit.normalize_nodename(searchnode)
343357
local newreplacenode = worldedit.normalize_nodename(replacenode)
344-
local count = worldedit.replaceinverse(pos1, pos2, searchnode, replacenode)
358+
local count = worldedit.replaceinverse(worldedit.pos1[name], worldedit.pos2[name], searchnode, replacenode)
345359
worldedit.player_notify(name, count .. " nodes replaced")
346360
end, check_replace),
347361
})
@@ -366,10 +380,9 @@ minetest.register_chatcommand("/hollowsphere", {
366380
description = "Add hollow sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",
367381
privs = {worldedit=true},
368382
func = safe_region(function(name, param)
369-
local pos = worldedit.pos1[name]
370383
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")
371384
local node = get_node(name, nodename)
372-
local count = worldedit.hollow_sphere(pos, tonumber(radius), node)
385+
local count = worldedit.hollow_sphere(worldedit.pos1[name], tonumber(radius), node)
373386
worldedit.player_notify(name, count .. " nodes added")
374387
end, check_sphere),
375388
})
@@ -379,10 +392,9 @@ minetest.register_chatcommand("/sphere", {
379392
description = "Add sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",
380393
privs = {worldedit=true},
381394
func = safe_region(function(name, param)
382-
local pos = worldedit.pos1[name]
383395
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")
384396
local node = get_node(name, nodename)
385-
local count = worldedit.sphere(pos, tonumber(radius), node)
397+
local count = worldedit.sphere(worldedit.pos1[name], tonumber(radius), node)
386398
worldedit.player_notify(name, count .. " nodes added")
387399
end, check_sphere),
388400
})
@@ -407,10 +419,9 @@ minetest.register_chatcommand("/hollowdome", {
407419
description = "Add hollow dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",
408420
privs = {worldedit=true},
409421
func = safe_region(function(name, param)
410-
local pos = worldedit.pos1[name]
411422
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")
412423
local node = get_node(name, nodename)
413-
local count = worldedit.hollow_dome(pos, tonumber(radius), node)
424+
local count = worldedit.hollow_dome(worldedit.pos1[name], tonumber(radius), node)
414425
worldedit.player_notify(name, count .. " nodes added")
415426
end, check_dome),
416427
})
@@ -420,10 +431,9 @@ minetest.register_chatcommand("/dome", {
420431
description = "Add dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",
421432
privs = {worldedit=true},
422433
func = safe_region(function(name, param)
423-
local pos = worldedit.pos1[name]
424434
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")
425435
local node = get_node(name, nodename)
426-
local count = worldedit.dome(pos, tonumber(radius), node)
436+
local count = worldedit.dome(worldedit.pos1[name], tonumber(radius), node)
427437
worldedit.player_notify(name, count .. " nodes added")
428438
end, check_dome),
429439
})
@@ -448,15 +458,14 @@ minetest.register_chatcommand("/hollowcylinder", {
448458
description = "Add hollow cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length> and radius <radius>, composed of <node>",
449459
privs = {worldedit=true},
450460
func = safe_region(function(name, param)
451-
local pos = worldedit.pos1[name]
452461
local found, _, axis, length, radius, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")
453462
length = tonumber(length)
454463
if axis == "?" then
455464
axis, sign = worldedit.player_axis(name)
456465
length = length * sign
457466
end
458467
local node = get_node(name, nodename)
459-
local count = worldedit.hollow_cylinder(pos, axis, length, tonumber(radius), node)
468+
local count = worldedit.hollow_cylinder(worldedit.pos1[name], axis, length, tonumber(radius), node)
460469
worldedit.player_notify(name, count .. " nodes added")
461470
end, check_cylinder),
462471
})
@@ -466,15 +475,14 @@ minetest.register_chatcommand("/cylinder", {
466475
description = "Add cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length> and radius <radius>, composed of <node>",
467476
privs = {worldedit=true},
468477
func = safe_region(function(name, param)
469-
local pos = worldedit.pos1[name]
470478
local found, _, axis, length, radius, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")
471479
length = tonumber(length)
472480
if axis == "?" then
473481
axis, sign = worldedit.player_axis(name)
474482
length = length * sign
475483
end
476484
local node = get_node(name, nodename)
477-
local count = worldedit.cylinder(pos, axis, length, tonumber(radius), node)
485+
local count = worldedit.cylinder(worldedit.pos1[name], axis, length, tonumber(radius), node)
478486
worldedit.player_notify(name, count .. " nodes added")
479487
end, check_cylinder),
480488
})
@@ -484,15 +492,14 @@ minetest.register_chatcommand("/pyramid", {
484492
description = "Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",
485493
privs = {worldedit=true},
486494
func = safe_region(function(name, param)
487-
local pos = get_position(name)
488495
local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")
489496
height = tonumber(height)
490497
if axis == "?" then
491498
axis, sign = worldedit.player_axis(name)
492499
height = height * sign
493500
end
494501
local node = get_node(name, nodename)
495-
local count = worldedit.pyramid(pos, axis, height, node)
502+
local count = worldedit.pyramid(worldedit.pos1[name], axis, height, node)
496503
worldedit.player_notify(name, count .. " nodes added")
497504
end,
498505
function(name, param)
@@ -517,10 +524,9 @@ minetest.register_chatcommand("/spiral", {
517524
description = "Add spiral centered at WorldEdit position 1 with side length <length>, height <height>, space between walls <space>, composed of <node>",
518525
privs = {worldedit=true},
519526
func = safe_region(function(name, param)
520-
local pos = worldedit.pos1[name]
521527
local found, _, length, height, space, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")
522528
local node = get_node(name, nodename)
523-
local count = worldedit.spiral(pos, tonumber(length), tonumber(height), tonumber(space), node)
529+
local count = worldedit.spiral(worldedit.pos1[name], tonumber(length), tonumber(height), tonumber(space), node)
524530
worldedit.player_notify(name, count .. " nodes added")
525531
end,
526532
function(name, param)
@@ -544,7 +550,6 @@ minetest.register_chatcommand("/copy", {
544550
description = "Copy the current WorldEdit region along the x/y/z/? axis by <amount> nodes",
545551
privs = {worldedit=true},
546552
func = safe_region(function(name, param)
547-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
548553
local found, _, axis, amount = param:find("^([xyz%?])%s+([+-]?%d+)$")
549554
if found == nil then
550555
worldedit.player_notify(name, "invalid usage: " .. param)
@@ -556,7 +561,7 @@ minetest.register_chatcommand("/copy", {
556561
amount = amount * sign
557562
end
558563

559-
local count = worldedit.copy(pos1, pos2, axis, amount)
564+
local count = worldedit.copy(worldedit.pos1[name], worldedit.pos2[name], axis, amount)
560565
worldedit.player_notify(name, count .. " nodes copied")
561566
end,
562567
function(name, param)
@@ -597,14 +602,13 @@ minetest.register_chatcommand("/stack", {
597602
description = "Stack the current WorldEdit region along the x/y/z/? axis <count> times",
598603
privs = {worldedit=true},
599604
func = safe_region(function(name, param)
600-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
601605
local found, _, axis, repetitions = param:find("^([xyz%?])%s+([+-]?%d+)$")
602606
repetitions = tonumber(repetitions)
603607
if axis == "?" then
604608
axis, sign = worldedit.player_axis(name)
605609
repetitions = repetitions * sign
606610
end
607-
local count = worldedit.stack(pos1, pos2, axis, repetitions)
611+
local count = worldedit.stack(worldedit.pos1[name], worldedit.pos2[name], axis, repetitions)
608612
worldedit.player_notify(name, count .. " nodes stacked")
609613
end,
610614
function(name, param)
@@ -624,32 +628,32 @@ minetest.register_chatcommand("/stack2", {
624628
privs = {worldedit=true},
625629
func = function(name, param)
626630
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
627-
if pos1 == nil or pos2 == nil then
631+
if pos1 == nil or pos2 == nil then
628632
worldedit.player_notify(name, "Select a position first!")
629-
return
630-
end
631-
local repetitions, incs = param:match("(%d+)%s*(.+)")
632-
if repetitions == nil then
633+
return
634+
end
635+
local repetitions, incs = param:match("(%d+)%s*(.+)")
636+
if repetitions == nil then
633637
worldedit.player_notify(name, "invalid count: " .. param)
634-
return
635-
end
638+
return
639+
end
636640
repetitions = tonumber(repetitions)
637641

638-
local x, y, z = incs:match("([+-]?%d+) ([+-]%d+) ([+-]%d+)")
639-
if x == nil then
640-
worldedit.player_notify(name, "invalid increments: " .. param)
641-
return
642-
end
643-
x, y, z = tonumber(x), tonumber(y), tonumber(z)
642+
local x, y, z = incs:match("([+-]?%d+) ([+-]%d+) ([+-]%d+)")
643+
if x == nil then
644+
worldedit.player_notify(name, "invalid increments: " .. param)
645+
return
646+
end
647+
x, y, z = tonumber(x), tonumber(y), tonumber(z)
644648

645-
local count = worldedit.volume(pos1, pos2) * repetitions
649+
local count = worldedit.volume(pos1, pos2) * repetitions
646650

647-
return safe_region(function()
651+
return safe_region(function()
648652
worldedit.stack2(pos1, pos2, {x=x, y=y, z=z}, repetitions,
649653
function() worldedit.player_notify(name, count .. " nodes stacked") end)
650654
end, function()
651655
return count
652-
end)(name,param) -- more hax
656+
end)(name,param) -- more hax --wip: clean this up a little bit
653657
end
654658
})
655659

@@ -726,9 +730,8 @@ minetest.register_chatcommand("/flip", {
726730
description = "Flip the current WorldEdit region along the x/y/z/? axis",
727731
privs = {worldedit=true},
728732
func = safe_region(function(name, param)
729-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
730733
if param == "?" then param = worldedit.player_axis(name) end
731-
local count = worldedit.flip(pos1, pos2, param)
734+
local count = worldedit.flip(worldedit.pos1[name], worldedit.pos2[name], param)
732735
worldedit.player_notify(name, count .. " nodes flipped")
733736
end,
734737
function(name, param)
@@ -777,9 +780,8 @@ minetest.register_chatcommand("/orient", {
777780
description = "Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)",
778781
privs = {worldedit=true},
779782
func = safe_region(function(name, param)
780-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
781783
local found, _, angle = param:find("^([+-]?%d+)$")
782-
local count = worldedit.orient(pos1, pos2, angle)
784+
local count = worldedit.orient(worldedit.pos1[name], worldedit.pos2[name], angle)
783785
worldedit.player_notify(name, count .. " nodes oriented")
784786
end,
785787
function(name, param)
@@ -801,8 +803,7 @@ minetest.register_chatcommand("/fixlight", {
801803
description = "Fix the lighting in the current WorldEdit region",
802804
privs = {worldedit=true},
803805
func = safe_region(function(name, param)
804-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
805-
local count = worldedit.fixlight(pos1, pos2)
806+
local count = worldedit.fixlight(worldedit.pos1[name], worldedit.pos2[name])
806807
worldedit.player_notify(name, count .. " nodes updated")
807808
end),
808809
})
@@ -812,8 +813,7 @@ minetest.register_chatcommand("/hide", {
812813
description = "Hide all nodes in the current WorldEdit region non-destructively",
813814
privs = {worldedit=true},
814815
func = safe_region(function(name, param)
815-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
816-
local count = worldedit.hide(pos1, pos2)
816+
local count = worldedit.hide(worldedit.pos1[name], worldedit.pos2[name])
817817
worldedit.player_notify(name, count .. " nodes hidden")
818818
end),
819819
})
@@ -823,9 +823,8 @@ minetest.register_chatcommand("/suppress", {
823823
description = "Suppress all <node> in the current WorldEdit region non-destructively",
824824
privs = {worldedit=true},
825825
func = safe_region(function(name, param)
826-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
827826
local node = get_node(name, param)
828-
local count = worldedit.suppress(pos1, pos2, node)
827+
local count = worldedit.suppress(worldedit.pos1[name], worldedit.pos2[name], node)
829828
worldedit.player_notify(name, count .. " nodes suppressed")
830829
end, check_set),
831830
})
@@ -835,9 +834,8 @@ minetest.register_chatcommand("/highlight", {
835834
description = "Highlight <node> in the current WorldEdit region by hiding everything else non-destructively",
836835
privs = {worldedit=true},
837836
func = safe_region(function(name, param)
838-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
839837
local node = get_node(name, param)
840-
local count = worldedit.highlight(pos1, pos2, node)
838+
local count = worldedit.highlight(worldedit.pos1[name], worldedit.pos2[name], node)
841839
worldedit.player_notify(name, count .. " nodes highlighted")
842840
end, check_set),
843841
})
@@ -847,8 +845,7 @@ minetest.register_chatcommand("/restore", {
847845
description = "Restores nodes hidden with WorldEdit in the current WorldEdit region",
848846
privs = {worldedit=true},
849847
func = safe_region(function(name, param)
850-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
851-
local count = worldedit.restore(pos1, pos2)
848+
local count = worldedit.restore(worldedit.pos1[name], worldedit.pos2[name])
852849
worldedit.player_notify(name, count .. " nodes restored")
853850
end),
854851
})
@@ -858,7 +855,6 @@ minetest.register_chatcommand("/save", {
858855
description = "Save the current WorldEdit region to \"(world folder)/schems/<file>.we\"",
859856
privs = {worldedit=true},
860857
func = safe_region(function(name, param)
861-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
862858
if param == "" then
863859
worldedit.player_notify(name, "invalid usage: " .. param)
864860
return
@@ -868,7 +864,7 @@ minetest.register_chatcommand("/save", {
868864
return
869865
end
870866

871-
local result, count = worldedit.serialize(pos1, pos2)
867+
local result, count = worldedit.serialize(worldedit.pos1[name], worldedit.pos2[name])
872868

873869
local path = minetest.get_worldpath() .. "/schems"
874870
local filename = path .. "/" .. param .. ".we"
@@ -1000,14 +996,13 @@ minetest.register_chatcommand("/luatransform", {
1000996
description = "Executes <code> as a Lua chunk in the global namespace with the variable pos available, for each node in the current WorldEdit region",
1001997
privs = {worldedit=true, server=true},
1002998
func = safe_region(function(name, param)
1003-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
1004999
local admin = minetest.setting_get("name")
10051000
if not admin or not name == admin then
10061001
worldedit.player_notify(name, "this command can only be run by the server administrator")
10071002
return
10081003
end
10091004

1010-
local err = worldedit.luatransform(pos1, pos2, param)
1005+
local err = worldedit.luatransform(worldedit.pos1[name], worldedit.pos2[name], param)
10111006
if err then
10121007
worldedit.player_notify(name, "code error: " .. err, false)
10131008
else
@@ -1021,7 +1016,6 @@ minetest.register_chatcommand("/mtschemcreate", {
10211016
description = "Save the current WorldEdit region using the Minetest Schematic format to \"(world folder)/schems/<filename>.mts\"",
10221017
privs = {worldedit=true},
10231018
func = safe_region(function(name, param)
1024-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
10251019
if param == nil then
10261020
worldedit.player_notify(name, "No filename specified")
10271021
return
@@ -1032,7 +1026,7 @@ minetest.register_chatcommand("/mtschemcreate", {
10321026
filename = filename:gsub("\"", "\\\""):gsub("\\", "\\\\") --escape any nasty characters
10331027
os.execute("mkdir \"" .. path .. "\"") --create directory if it does not already exist
10341028

1035-
local ret = minetest.create_schematic(pos1, pos2, worldedit.prob_list[name], filename)
1029+
local ret = minetest.create_schematic(worldedit.pos1[name], worldedit.pos2[name], worldedit.prob_list[name], filename)
10361030
if ret == nil then
10371031
worldedit.player_notify(name, "failed to create Minetest schematic", false)
10381032
else
@@ -1111,8 +1105,7 @@ minetest.register_chatcommand("/clearobjects", {
11111105
description = "Clears all objects within the WorldEdit region",
11121106
privs = {worldedit=true},
11131107
func = safe_region(function(name, param)
1114-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
1115-
local count = worldedit.clearobjects(pos1, pos2)
1108+
local count = worldedit.clearobjects(worldedit.pos1[name], worldedit.pos2[name])
11161109
worldedit.player_notify(name, count .. " objects cleared")
11171110
end),
11181111
})

0 commit comments

Comments
 (0)
Please sign in to comment.