Hide gui button in unified_inventory on missing privilege (#195 )

this fixes #151
Raise safe region limit to 20000
2025-07-04 09:00:36 +02:00 · 2020-12-05 14:12:32 +01:00 · 2020-10-06 13:53:22 +02:00 · 2020-05-25 19:48:54 +02:00 · 2020-05-12 21:53:01 +02:00 · 2020-05-12 21:29:51 +02:00
28 changed files with 1863 additions and 1364 deletions
--- a/ChatCommands.md
+++ b/ChatCommands.md
@ -29,24 +29,26 @@ Many commands also have shorter names that can be typed faster. For example, if

 ### `//about`

-Get information about the mod.
+Get information about the WorldEdit mod.

    //about

-### `//inspect on/off/1/0/true/false/yes/no/enable/disable/<blank>`
+### `//help [all/<cmd>]`
+
+Get help for WorldEdit commands. `all` shows all WorldEdit commands, `<cmd>`
+the help text for the given command.
+
+    //help
+    //help all
+    //help hollowpyramid
+
+
+### `//inspect [on/off/1/0/true/false/yes/no/enable/disable]`

 Enable or disable node inspection.

    //inspect on
    //inspect off
-    //inspect 1
-    //inspect 0
-    //inspect true
-    //inspect false
-    //inspect yes
-    //inspect no
-    //inspect enable
-    //inspect disable
    //inspect

 ### `//reset`
@ -81,16 +83,17 @@ Set WorldEdit region position 2 to the player's location.

 ### `//p set/set1/set2/get`

-Set WorldEdit region, WorldEdit position 1, or WorldEdit position 2 by punching nodes, or display the current WorldEdit region.
+Set WorldEdit region, WorldEdit position 1, or WorldEdit position 2 by
+punching nodes, or print the current WorldEdit region.

    //p set
    //p set1
    //p set2
    //p get

-### `//fixedpos set1 x y z`
+### `//fixedpos set1/set2 <x> <y> <z>`

-Set a WorldEdit region position to the position at (`<x>`, `<y>`, `<z>`).
+Set the WorldEdit region position 1 or 2 to the position (`<x>`, `<y>`, `<z>`).

    //fixedpos set1 0 0 0
    //fixedpos set1 -30 5 28
@ -121,9 +124,12 @@ Set the current WorldEdit region to `<node>`.

 Set the param2 value of all nodes in the current WorldEdit region to `<param2>`.

-### `//mix <node1> [<count1>] <node2> [<count2>]...`
+    //param2 8

-Fill the current WorldEdit region with a random mix of `<node1>`, `<node2>`, `...`. Weightings can be optionally specified via a number after a node name.
+### `//mix <node1> [count1] <node2> [count2] ...`
+
+Fill the current WorldEdit region with a random mix of `<node1>`, `<node2>`, `...`.
+Weightings can be optionally specified via the `[count1]`, `[count2]`, `...` parameters after a node name.

    //mix air
    //mix cactus stone glass sandstone
@ -152,13 +158,15 @@ Replace all nodes other than `<search node>` with `<replace node>` in the curren

 ### `//hollowcube <width> <height> <length> <node>`

-Adds a hollow cube with its ground level centered at WorldEdit position 1 with dimensions `<width>` x `<height>` x `<length>`, composed of `<node>`.
+Adds a hollow cube with its ground level centered at WorldEdit position 1 with
+dimensions `<width>` x `<height>` x `<length>`, composed of `<node>`.

    //hollowcube 6 5 6 Diamond Block

 ### `//cube <width> <height> <length> <node>`

-Adds a cube with its ground level centered at WorldEdit position 1 with dimensions `<width>` x `<height>` x `<length>`, composed of `<node>`.
+Adds a cube with its ground level centered at WorldEdit position 1 with
+dimensions `<width>` x `<height>` x `<length>`, composed of `<node>`.

    //cube 6 5 6 Diamond Block
    //cube 7 2 1 default:cobble
@ -197,7 +205,8 @@ Add dome centered at WorldEdit position 1 with radius `<radius>`, composed of `<

 ### `//hollowcylinder x/y/z/? <length> <radius1> [radius2] <node>`

-Add hollow cylinder at WorldEdit position 1 along the x/y/z/? axis with length `<length>`, base radius `<radius1>` (and top radius `[radius2]`), composed of `<node>`.
+Add hollow cylinder at WorldEdit position 1 along the given axis with length `<length>`,
+base radius `<radius1>` (and top radius `[radius2]`), composed of `<node>`.

 Despite its name this command allows you to create cones (`radius2` = 0) as well as any shapes inbetween (0 < `radius2` < `radius1`).
 Swapping `radius1` and `radius2` will create the same object but upside-down.
@ -213,7 +222,8 @@ Swapping `radius1` and `radius2` will create the same object but upside-down.

 ### `//cylinder x/y/z/? <length> <radius1> [radius2] <node>`

-Add cylinder at WorldEdit position 1 along the x/y/z/? axis with length `<length>`, base radius `<radius1>` (and top radius `[radius2]`), composed of `<node>`.
+Add cylinder at WorldEdit position 1 along the given axis with length `<length>`,
+base radius `<radius1>` (and top radius `[radius2]`), composed of `<node>`.
 Can also create shapes other than cylinders, e.g. cones (see documentation above).

    //cylinder x +5 8 Bronze Block
@ -225,18 +235,18 @@ Can also create shapes other than cylinders, e.g. cones (see documentation above
    //cylinder x 6 0 5 Dirt
    //cylinder z 20 10 20 default:desert_stone
    
-### `//hollowpyramid x/y/z? <height> <node>`
+### `//hollowpyramid x/y/z/? <height> <node>`

-Add hollow pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height `<height>`, composed of `<node>`.
+Add hollow pyramid centered at WorldEdit position 1 along the given axis with height `<height>` composed of `<node>`.

    //hollowpyramid x 8 Diamond Block
    //hollowpyramid y -5 glass
    //hollowpyramid z 2 mesecons:wire_00000000_off
    //hollowpyramid ? 12 mesecons:wire_00000000_off

-### `//pyramid x/y/z? <height> <node>`
+### `//pyramid x/y/z/? <height> <node>`

-Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height `<height>`, composed of `<node>`.
+Add pyramid centered at WorldEdit position 1 along the given axis with height `<height>` composed of `<node>`.

    //pyramid x 8 Diamond Block
    //pyramid y -5 glass
@ -245,7 +255,8 @@ Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height

 ### `//spiral <length> <height> <spacer> <node>`

-Add spiral centered at WorldEdit position 1 with side length `<length>`, height `<height>`, space between walls `<spacer>`, composed of `<node>`.
+Add spiral centered at WorldEdit position 1 with side length `<length>`,
+height `<height>`, space between walls `<spacer>`, composed of `<node>`.

    //spiral 20 5 3 Diamond Block
    //spiral 5 2 1 glass
@ -253,7 +264,7 @@ Add spiral centered at WorldEdit position 1 with side length `<length>`, height

 ### `//copy x/y/z/? <amount>`

-Copy the current WorldEdit region along the x/y/z/? axis by `<amount>` nodes.
+Copy the current WorldEdit region along the given axis by `<amount>` nodes.

    //copy x 15
    //copy y -7
@ -262,7 +273,7 @@ Copy the current WorldEdit region along the x/y/z/? axis by `<amount>` nodes.

 ### `//move x/y/z/? <amount>`

-Move the current WorldEdit positions and region along the x/y/z/? axis by `<amount>` nodes.
+Move the current WorldEdit positions and region along the given axis by `<amount>` nodes.

    //move x 15
    //move y -7
@ -271,7 +282,7 @@ Move the current WorldEdit positions and region along the x/y/z/? axis by `<amou

 ### `//stack x/y/z/? <count>`

-Stack the current WorldEdit region along the x/y/z/? axis `<count>` times.
+Stack the current WorldEdit region along the given axis `<count>` times.

    //stack x 3
    //stack y -1
@ -287,7 +298,9 @@ Stack the current WorldEdit region `<count>` times by offset `<x>`, `<y>`, `<z>`

 ### `//stretch <stretchx> <stretchy> <stretchz>`

-Scale the current WorldEdit positions and region by a factor of `<stretchx>`, `<stretchy>`, `<stretchz>` along the X, Y, and Z axes, repectively, with position 1 as the origin.
+Scale the current WorldEdit positions and region by a factor of
+`<stretchx>`, `<stretchy>`, `<stretchz>` along the X, Y, and Z axes,
+respectively, with position 1 as the origin.

    //stretch 2 2 2
    //stretch 1 2 1
@ -295,25 +308,22 @@ Scale the current WorldEdit positions and region by a factor of `<stretchx>`, `<

 ### `//transpose x/y/z/? x/y/z/?`

-Transpose the current WorldEdit positions and region along the x/y/z/? and x/y/z/? axes.
+Transpose the current WorldEdit positions and region along given axes.

    //transpose x y
-    //transpose x z
    //transpose y z
    //transpose ? y

 ### `//flip x/y/z/?`

-Flip the current WorldEdit region along the x/y/z/? axis.
+Flip the current WorldEdit region along the given axis.

    //flip x
-    //flip y
-    //flip z
    //flip ?

 ### `//rotate x/y/z/? <angle>`

-Rotate the current WorldEdit positions and region along the x/y/z/? axis by angle `<angle>` (90 degree increment).
+Rotate the current WorldEdit positions and region along the given axis by angle `<angle>` (90 degree increment).

    //rotate x 90
    //rotate y 180
@ -341,6 +351,13 @@ Removes any fluid node within the current WorldEdit region.

    //drain

+### `//clearcut`
+
+Removes any plant, tree or foilage-like nodes in the selected region.
+The idea is to remove anything that isn't part of the terrain, leaving a "natural" empty space ready for building.
+
+    //clearcut
+
 ### `//hide`

 Hide all nodes in the current WorldEdit region non-destructively.
@ -349,7 +366,7 @@ Hide all nodes in the current WorldEdit region non-destructively.

 ### `//suppress <node>`

-Suppress all <node> in the current WorldEdit region non-destructively.
+Suppress all `<node>` in the current WorldEdit region non-destructively.

    //suppress Diamond Block
    //suppress glass
@ -357,7 +374,7 @@ Suppress all <node> in the current WorldEdit region non-destructively.

 ### `//highlight <node>`

-Highlight <node> in the current WorldEdit region by hiding everything else non-destructively.
+Highlight `<node>` in the current WorldEdit region by hiding everything else non-destructively.

    //highlight Diamond Block
    //highlight glass
@ -401,8 +418,8 @@ Executes `<code>` as a Lua chunk in the global namespace.

 Executes `<code>` as a Lua chunk in the global namespace with the variable pos available, for each node in the current WorldEdit region.

-    //luatransform minetest.add_node(pos, {name="default:stone"})
-    //luatransform if minetest.get_node(pos).name == "air" then minetest.add_node(pos, {name="default:water_source"})
+    //luatransform minetest.swap_node(pos, {name="default:stone"})
+    //luatransform if minetest.get_node(pos).name == "air" then minetest.add_node(pos, {name="default:water_source"}) end

 ### `//mtschemcreate <file>`

@ -431,42 +448,44 @@ Clears all objects within the WorldEdit region.

    //clearobjects
    
-### `//shift x/y/z/?/up/down/left/right/front/back [+|-]<amount>`
+### `//shift x/y/z/?/up/down/left/right/front/back [+/-]<amount>`

-Shifts the selection area by `[+|-]<amount>` without touching its contents. The shifting axis can be absolute (`x/y/z`) or 
-relative (`up/down/left/right/front/back`). 
+Shifts the selection area by `[+|-]<amount>` without moving its contents.
+The shifting axis can be absolute (`x/y/z`) or relative (`up/down/left/right/front/back`). 

 		//shift left 5

-### `//expand [+|-]x/y/z/?/up/down/left/right/front/back <amount> [reverse-amount]`
+### `//expand [+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]`

-Expands the selection by `<amount>` in the selected absolute or relative axis. If specified, the selection can be expanded in the
-opposite direction over the same axis by `[reverse-amount]`.
+Expands the selection by `<amount>` in the selected absolute or relative axis.
+If specified, the selection can be expanded in the opposite direction over the same axis by `[reverse amount]`.

 		//expand right 7 5
 		
-### `//contract [+|-]x/y/z/?/up/down/left/right/front/back <amount> [reverse-amount]`
+### `//contract [+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]`

-Contracts the selection by `<amount>` in the selected absolute or relative axis. If specified, the selection can be contracted in the
-opposite direction over the same axis by `[reverse-amount]`.
+Contracts the selection by `<amount>` in the selected absolute or relative axis.
+If specified, the selection can be contracted in the opposite direction over the same axis by `[reverse amount]`.

 		//expand right 7 5
 		
-### `//outset [hv] <amount>`
+### `//outset [h/v] <amount>`

-Expands the selection in all directions by `<amount>`. If specified, the selection can be expanded horizontally in the x and z axes `[h]`
-or vertically in the y axis `[v]`.
+Expands the selection in all directions by `<amount>`. If specified,
+the selection can be expanded horizontally in the x and z axes using `h`
+or vertically in the y axis using `v`.

 		//outset v 5
 		
-### `//inset [hv] <amount>`
+### `//inset [h/v] <amount>`

-Contracts the selection in all directions by `<amount>`. If specified, the selection can be contracted horizontally in the x and z axes `[h]`
-or vertically in the y axis `[v]`.
+Contracts the selection in all directions by `<amount>`. If specified,
+the selection can be contracted horizontally in the x and z axes using `h`
+or vertically in the y axis using `v`.

-		//outset v 5
+		//inset h 5

-### `//brush none/<command> [parameters]`
+### `//brush none/(<command> [parameters])`

 Assigns the given `<command>` to the currently held brush item, it will be ran with the first pointed solid node (as determined via raycast) as
 WorldEdit position 1 when using that specific brush item.
@ -476,3 +495,14 @@ Note that this functionality requires the `worldedit_brush` mod enabled.
 		//brush cube 8 8 8 Cobblestone
 		//brush spr 12 glass
 		//brush none
+
+### `//cubeapply <size>/(<sizex> <sizey> <sizez>) <command> [parameters]`
+
+Selects a cube with side length of `<size>` around the WorldEdit position 1 and runs the given `<command>` on the newly selected region.
+If `<sizex>`, `<sizey>` and `<sizez>` are given, they instead specify the length of the cuboid in X, Y, Z direction.
+This is mostly useful for brushes since it allows commands such as `//replace` to be ran, but it can also be used standalone.
+
+		//cubeapply 10 replaceinverse air default:water_source
+		//brush cubeapply 15 drain
+		//brush cubeapply 12 3 12 drain
+		//brush cubeapply 1 deleteblocks
--- a/README.md
+++ b/README.md
@ -47,11 +47,11 @@ The chat interface adds many chat commands that perform various WorldEdit powere

 Compatibility
 -------------
-This mod supports Minetest versions 0.4.8 and newer. Older versions of WorldEdit may work with older versions of Minetest, but are not recommended or supported.
+This mod supports Minetest versions 5.0 and newer. Older versions of WorldEdit may work with older versions of Minetest, but are not recommended or supported.

 WorldEdit works quite well with other mods, and does not have any known mod conflicts.

-WorldEdit GUI requires one of [sfinv](https://github.com/minetest/minetest_game/tree/master/mods/sfinv) (included in minetest_game since 0.4.15), [Unified Inventory](https://forum.minetest.net/viewtopic.php?id=3933) or [Inventory++](https://forum.minetest.net/viewtopic.php?id=6204).
+WorldEdit GUI requires one of [sfinv](https://github.com/minetest/minetest_game/tree/master/mods/sfinv) (included in minetest_game), [Unified Inventory](https://forum.minetest.net/viewtopic.php?t=12767) or [Inventory++](https://forum.minetest.net/viewtopic.php?id=6204) or [Smart Inventory](https://forum.minetest.net/viewtopic.php?t=16597).

 If you use any other inventory manager mods, note that they may conflict with the WorldEdit GUI. If this is the case, it may be necessary to disable them.

@ -59,9 +59,9 @@ WorldEdit API
 -------------
 WorldEdit exposes all significant functionality in a simple Lua interface.

-Adding WorldEdit to the file "depends.txt" in your mod gives you access to all of the `worldedit` functions. The API is useful for tasks such as high-performance node manipulation, alternative interfaces, and map creation.
+Adding WorldEdit as a dependency to your mod gives you access to all of the `worldedit` functions. The API is useful for tasks such as high-performance node manipulation, alternative interfaces, and map creation.

-AGPLv3 compatible mods may further include WorldEdit files in their own mods. This may be useful if a modder wishes to completely avoid any dependencies on WorldEdit. Note that it is required to give credit to the authors.
+AGPLv3 compatible mods may further include WorldEdit files in their own mods. This can be useful if a modder wishes to completely avoid any dependency on WorldEdit. Note that it is required to give credit to the authors in this case.

 This API is documented in the [WorldEdit API Reference](WorldEdit%20API.md).

@ -136,20 +136,38 @@ Authors
 -------
 WorldEdit would not be possible without the contributions of many developers and designers. Below, they are listed alphabetically:

-    cheapie
+    Alexander Weber
+    beyondlimits
+    Carter Kolwey
    cornernote
-    cyisfor
-    danierukun
+    Cy
+    Daniel Sosa
    electricface
    est31
+    Eugen Wesseloh
+    HybridDog
+    Isidor Zeuner
+    Jean-Patrick Guerrero
+    Joseph Pickard
    kaeza
-    khonkhortisan
-    pickardjoe
+    kilbith
+    KodexKy
+    Kyle
+    MT-Modder
+    Niwla23
+    Panquesito7
+    Pedro Gimeno
+    Rui
    Sebastien Ponce
    sfan5
    ShadowNinja
+    shivajiva101
    spillz
+    Starbeamrainbowlabs
+    TalkLounge
+    tenplus1
    Uberi/Temperest
+    Wuzzy

 License
 -------
--- a/API.md
+++ b/API.md
@ -24,6 +24,7 @@ Contained in manipulations.lua, this module allows several node operations to be
 ### count = worldedit.set(pos1, pos2, node_name)

 Sets a region defined by positions `pos1` and `pos2` to `node_name`. To clear a region, use "air" as the value of `node_name`.
+If `node_name` is a list of nodes, each set node is randomly picked from it.

 Returns the number of nodes set.

@ -54,6 +55,7 @@ Returns the number of nodes copied.
 ### count = worldedit.copy2(pos1, pos2, off)

 Copies the region defined by positions `pos1` and `pos2` by the offset vector `off`.
+Note that the offset needs to be big enough that there is no overlap.

 Returns the number of nodes copied.

@ -72,6 +74,7 @@ Returns the number of nodes stacked.
 ### count = worldedit.stack2(pos1, pos2, direction, amount)

 Duplicates the region defined by positions `pos1` and `pos2` `amount` times with offset vector `direction`.
+Note that the offset vector needs to be big enough that there is no overlap.

 Returns the number of nodes stacked.

--- a/modpack.conf
+++ b/modpack.conf
@ -0,0 +1,2 @@
+name = Minetest-WorldEdit
+description = WorldEdit is an in-game world editor. Use it to repair griefing, or just create awesome buildings in seconds.
--- a/modpack.txt
+++ b/modpack.txt
--- a/worldedit/common.lua
+++ b/worldedit/common.lua
@ -46,6 +46,9 @@ end


 function worldedit.keep_loaded(pos1, pos2)
+	-- Create a vmanip and read the area from map, this
+	-- causes all MapBlocks to be loaded into memory.
+	-- This doesn't actually *keep* them loaded, unlike the name implies.
 	local manip = minetest.get_voxel_manip()
 	manip:read_from_map(pos1, pos2)
 end
@ -107,7 +110,9 @@ end

 function mh.finish(manip, data)
 	-- Update map
+	if data ~= nil then
 		manip:set_data(data)
+	end
 	manip:write_to_map()
 	manip:update_map()
 end
--- a/worldedit/cuboid.lua
+++ b/worldedit/cuboid.lua
@ -98,21 +98,6 @@ worldedit.marker_move = function(name, marker, deltavector)
 	return true
 end

-- Updates the location ingame of the markers
-worldedit.marker_update = function(name, marker)
-	if marker == nil then
-		worldedit.mark_pos1(name)
-		worldedit.mark_pos2(name)
-	elseif marker == 1 then
-		worldedit.mark_pos1(name)
-	elseif marker == 2 then
-		worldedit.mark_pos2(name)
-	else
-		minetest.debug(
-			"worldedit: Invalid execution of function update_markers")
-	end
-end
-

 -- Returns two vectors with the directions for volumetric expansion
 worldedit.get_expansion_directions = function(mark1, mark2)
@ -149,7 +134,7 @@ end

 -- Return the marker that is closest to the player
 worldedit.marker_get_closest_to_player = function(name)
-	local playerpos = minetest.get_player_by_name(name):getpos()
+	local playerpos = minetest.get_player_by_name(name):get_pos()
 	local dist1 = vector.distance(playerpos, worldedit.pos1[name])
 	local dist2 = vector.distance(playerpos, worldedit.pos2[name])
 	
--- a/worldedit/init.lua
+++ b/worldedit/init.lua
@ -15,14 +15,6 @@ local ver = {major=1, minor=2}
 worldedit.version = ver
 worldedit.version_string = string.format("%d.%d", ver.major, ver.minor)

-if not minetest.get_voxel_manip then
-	local err_msg = "This version of WorldEdit requires Minetest 0.4.8 or later!  You have an old version."
-	minetest.log("error", string.rep("#", 128))
-	minetest.log("error", err_msg)
-	minetest.log("error", string.rep("#", 128))
-	error(err_msg)
-end
-
 local path = minetest.get_modpath(minetest.get_current_modname())

 local function load_module(path)
--- a/worldedit/manipulations.lua
+++ b/worldedit/manipulations.lua
@ -76,9 +76,6 @@ function worldedit.replace(pos1, pos2, search_node, replace_node, inverse)

 	local count = 0

-	--- TODO: This could be shortened by checking `inverse` in the loop,
-	-- but that would have a speed penalty.  Is the penalty big enough
-	-- to matter?
 	if not inverse then
 		for i in area:iterp(pos1, pos2) do
 			if data[i] == search_id then
@ -101,27 +98,47 @@ function worldedit.replace(pos1, pos2, search_node, replace_node, inverse)
 end


+local function deferred_execution(next_one, finished)
+	-- Allocate 100% of server step for execution (might lag a little)
+	local allocated_usecs =
+		tonumber(minetest.settings:get("dedicated_server_step")) * 1000000
+	local function f()
+		local deadline = minetest.get_us_time() + allocated_usecs
+		repeat
+			local is_done = next_one()
+			if is_done then
+				if finished then
+					finished()
+				end
+				return
+			end
+		until minetest.get_us_time() >= deadline
+		minetest.after(0, f)
+	end
+	f()
+end
+
 --- Duplicates a region `amount` times with offset vector `direction`.
-- Stacking is spread across server steps, one copy per step.
+-- Stacking is spread across server steps.
 -- @return The number of nodes stacked.
 function worldedit.stack2(pos1, pos2, direction, amount, finished)
+	-- Protect arguments from external changes during execution
+	pos1 = table.copy(pos1)
+	pos2 = table.copy(pos2)
+	direction = table.copy(direction)
+
 	local i = 0
 	local translated = {x=0, y=0, z=0}
-	local function next_one()
-		if i < amount then
-			i = i + 1
+	local function step()
 		translated.x = translated.x + direction.x
 		translated.y = translated.y + direction.y
 		translated.z = translated.z + direction.z
 		worldedit.copy2(pos1, pos2, translated)
-			minetest.after(0, next_one)
-		else
-			if finished then
-				finished()
+		i = i + 1
+		return i >= amount
 	end
-		end
-	end
-	next_one()
+	deferred_execution(step, finished)
+
 	return worldedit.volume(pos1, pos2) * amount
 end

@ -135,181 +152,187 @@ end
 function worldedit.copy(pos1, pos2, axis, amount)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)

-	worldedit.keep_loaded(pos1, pos2)
+	-- Decide if we need to copy stuff backwards (only applies to metadata)
+	local backwards = amount > 0 and amount < (pos2[axis] - pos1[axis] + 1)

-	local get_node, get_meta, set_node = minetest.get_node,
-			minetest.get_meta, minetest.set_node
-	-- Copy things backwards when negative to avoid corruption.
-	-- FIXME: Lots of code duplication here.
-	if amount < 0 then
-		local pos = {}
-		pos.x = pos1.x
-		while pos.x <= pos2.x do
-			pos.y = pos1.y
-			while pos.y <= pos2.y do
-				pos.z = pos1.z
-				while pos.z <= pos2.z do
-					local node = get_node(pos) -- Obtain current node
-					local meta = get_meta(pos):to_table() -- Get meta of current node
-					local value = pos[axis] -- Store current position
-					pos[axis] = value + amount -- Move along axis
-					set_node(pos, node) -- Copy node to new position
-					get_meta(pos):from_table(meta) -- Set metadata of new node
-					pos[axis] = value -- Restore old position
-					pos.z = pos.z + 1
-				end
-				pos.y = pos.y + 1
-			end
-			pos.x = pos.x + 1
-		end
-	else
-		local pos = {}
-		pos.x = pos2.x
-		while pos.x >= pos1.x do
-			pos.y = pos2.y
-			while pos.y >= pos1.y do
-				pos.z = pos2.z
-				while pos.z >= pos1.z do
-					local node = get_node(pos) -- Obtain current node
-					local meta = get_meta(pos):to_table() -- Get meta of current node
-					local value = pos[axis] -- Store current position
-					pos[axis] = value + amount -- Move along axis
-					set_node(pos, node) -- Copy node to new position
-					get_meta(pos):from_table(meta) -- Set metadata of new node
-					pos[axis] = value -- Restore old position
-					pos.z = pos.z - 1
-				end
-				pos.y = pos.y - 1
-			end
-			pos.x = pos.x - 1
-		end
-	end
-	return worldedit.volume(pos1, pos2)
+	local off = {x=0, y=0, z=0}
+	off[axis] = amount
+	return worldedit.copy2(pos1, pos2, off, backwards)
 end

 --- Copies a region by offset vector `off`.
 -- @param pos1
 -- @param pos2
 -- @param off
+-- @param meta_backwards (not officially part of API)
 -- @return The number of nodes copied.
-function worldedit.copy2(pos1, pos2, off)
+function worldedit.copy2(pos1, pos2, off, meta_backwards)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)

-	worldedit.keep_loaded(pos1, pos2)
+	local src_manip, src_area = mh.init(pos1, pos2)
+	local src_stride = {x=1, y=src_area.ystride, z=src_area.zstride}
+	local src_offset = vector.subtract(pos1, src_area.MinEdge)

-	local get_node, get_meta, set_node = minetest.get_node,
-			minetest.get_meta, minetest.set_node
-	local pos = {}
-	pos.x = pos2.x
-	while pos.x >= pos1.x do
-		pos.y = pos2.y
-		while pos.y >= pos1.y do
-			pos.z = pos2.z
-			while pos.z >= pos1.z do
-				local node = get_node(pos) -- Obtain current node
-				local meta = get_meta(pos):to_table() -- Get meta of current node
-				local newpos = vector.add(pos, off) -- Calculate new position
-				set_node(newpos, node) -- Copy node to new position
-				get_meta(newpos):from_table(meta) -- Set metadata of new node
-				pos.z = pos.z - 1
+	local dpos1 = vector.add(pos1, off)
+	local dpos2 = vector.add(pos2, off)
+	local dim = vector.add(vector.subtract(pos2, pos1), 1)
+
+	local dst_manip, dst_area = mh.init(dpos1, dpos2)
+	local dst_stride = {x=1, y=dst_area.ystride, z=dst_area.zstride}
+	local dst_offset = vector.subtract(dpos1, dst_area.MinEdge)
+
+	local function do_copy(src_data, dst_data)
+		for z = 0, dim.z-1 do
+			local src_index_z = (src_offset.z + z) * src_stride.z + 1 -- +1 for 1-based indexing
+			local dst_index_z = (dst_offset.z + z) * dst_stride.z + 1
+			for y = 0, dim.y-1 do
+				local src_index_y = src_index_z + (src_offset.y + y) * src_stride.y
+				local dst_index_y = dst_index_z + (dst_offset.y + y) * dst_stride.y
+				-- Copy entire row at once
+				local src_index_x = src_index_y + src_offset.x
+				local dst_index_x = dst_index_y + dst_offset.x
+				for x = 0, dim.x-1 do
+					dst_data[dst_index_x + x] = src_data[src_index_x + x]
 				end
-			pos.y = pos.y - 1
 			end
-		pos.x = pos.x - 1
 		end
+	end
+
+	-- Copy node data
+	local src_data = src_manip:get_data()
+	local dst_data = dst_manip:get_data()
+	do_copy(src_data, dst_data)
+	dst_manip:set_data(dst_data)
+
+	-- Copy param1
+	src_manip:get_light_data(src_data)
+	dst_manip:get_light_data(dst_data)
+	do_copy(src_data, dst_data)
+	dst_manip:set_light_data(dst_data)
+
+	-- Copy param2
+	src_manip:get_param2_data(src_data)
+	dst_manip:get_param2_data(dst_data)
+	do_copy(src_data, dst_data)
+	dst_manip:set_param2_data(dst_data)
+
+	mh.finish(dst_manip)
+	src_data = nil
+	dst_data = nil
+
+	-- Copy metadata
+	local get_meta = minetest.get_meta
+	if meta_backwards then
+	for z = dim.z-1, 0, -1 do
+		for y = dim.y-1, 0, -1 do
+			for x = dim.x-1, 0, -1 do
+				local pos = {x=pos1.x+x, y=pos1.y+y, z=pos1.z+z}
+				local meta = get_meta(pos):to_table()
+				pos = vector.add(pos, off)
+				get_meta(pos):from_table(meta)
+			end
+		end
+	end
+	else
+	for z = 0, dim.z-1 do
+		for y = 0, dim.y-1 do
+			for x = 0, dim.x-1 do
+				local pos = {x=pos1.x+x, y=pos1.y+y, z=pos1.z+z}
+				local meta = get_meta(pos):to_table()
+				pos = vector.add(pos, off)
+				get_meta(pos):from_table(meta)
+			end
+		end
+	end
+	end
+
 	return worldedit.volume(pos1, pos2)
 end

+--- Deletes all node metadata in the region
+-- @param pos1
+-- @param pos2
+-- @return The number of nodes that had their meta deleted.
+function worldedit.delete_meta(pos1, pos2)
+	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+	local meta_positions = minetest.find_nodes_with_meta(pos1, pos2)
+	local get_meta = minetest.get_meta
+	for _, pos in ipairs(meta_positions) do
+		get_meta(pos):from_table(nil)
+	end
+
+	return #meta_positions
+end
+
 --- Moves a region along `axis` by `amount` nodes.
 -- @return The number of nodes moved.
 function worldedit.move(pos1, pos2, axis, amount)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)

-	worldedit.keep_loaded(pos1, pos2)
+	local dim = vector.add(vector.subtract(pos2, pos1), 1)
+	local overlap = math.abs(amount) < dim[axis]
+	-- Decide if we need to copy metadata backwards
+	local backwards = overlap and amount > 0

-	--- TODO: Move slice by slice using schematic method in the move axis
-	-- and transfer metadata in separate loop (and if the amount is
-	-- greater than the length in the axis, copy whole thing at a time and
-	-- erase original after, using schematic method).
-	local get_node, get_meta, set_node, remove_node = minetest.get_node,
-			minetest.get_meta, minetest.set_node, minetest.remove_node
-	-- Copy things backwards when negative to avoid corruption.
-	--- FIXME: Lots of code duplication here.
-	if amount < 0 then
-		local pos = {}
-		pos.x = pos1.x
-		while pos.x <= pos2.x do
-			pos.y = pos1.y
-			while pos.y <= pos2.y do
-				pos.z = pos1.z
-				while pos.z <= pos2.z do
-					local node = get_node(pos) -- Obtain current node
-					local meta = get_meta(pos):to_table() -- Get metadata of current node
-					remove_node(pos) -- Remove current node
-					local value = pos[axis] -- Store current position
-					pos[axis] = value + amount -- Move along axis
-					set_node(pos, node) -- Move node to new position
-					get_meta(pos):from_table(meta) -- Set metadata of new node
-					pos[axis] = value -- Restore old position
-					pos.z = pos.z + 1
+	local function nuke_area(my_off, my_dim)
+		if my_dim.x == 0 or my_dim.y == 0 or my_dim.z == 0 then
+			return
 		end
-				pos.y = pos.y + 1
-			end
-			pos.x = pos.x + 1
+		local my_pos1 = vector.add(pos1, my_off)
+		local my_pos2 = vector.subtract(vector.add(my_pos1, my_dim), 1)
+		worldedit.set(my_pos1, my_pos2, "air")
+		worldedit.delete_meta(my_pos1, my_pos2)
 	end
+
+	-- Copy stuff to new location
+	local off = {x=0, y=0, z=0}
+	off[axis] = amount
+	worldedit.copy2(pos1, pos2, off, backwards)
+	-- Nuke old area
+	if not overlap then
+		nuke_area({x=0, y=0, z=0}, dim)
 	else
-		local pos = {}
-		pos.x = pos2.x
-		while pos.x >= pos1.x do
-			pos.y = pos2.y
-			while pos.y >= pos1.y do
-				pos.z = pos2.z
-				while pos.z >= pos1.z do
-					local node = get_node(pos) -- Obtain current node
-					local meta = get_meta(pos):to_table() -- Get metadata of current node
-					remove_node(pos) -- Remove current node
-					local value = pos[axis] -- Store current position
-					pos[axis] = value + amount -- Move along axis
-					set_node(pos, node) -- Move node to new position
-					get_meta(pos):from_table(meta) -- Set metadata of new node
-					pos[axis] = value -- Restore old position
-					pos.z = pos.z - 1
-				end
-				pos.y = pos.y - 1
-			end
-			pos.x = pos.x - 1
+		-- Source and destination region are overlapping, which means we can't
+		-- blindly delete the [pos1, pos2] area
+		local leftover = vector.new(dim) -- size of the leftover slice
+		leftover[axis] = math.abs(amount)
+		if amount > 0 then
+			nuke_area({x=0, y=0, z=0}, leftover)
+		else
+			local top = {x=0, y=0, z=0} -- offset of the leftover slice from pos1
+			top[axis] = dim[axis] - math.abs(amount)
+			nuke_area(top, leftover)
 		end
 	end
+
 	return worldedit.volume(pos1, pos2)
 end

-
 --- Duplicates a region along `axis` `amount` times.
-- Stacking is spread across server steps, one copy per step.
+-- Stacking is spread across server steps.
 -- @param pos1
 -- @param pos2
 -- @param axis Axis direction, "x", "y", or "z".
 -- @param count
 -- @return The number of nodes stacked.
-function worldedit.stack(pos1, pos2, axis, count)
+function worldedit.stack(pos1, pos2, axis, count, finished)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
 	local length = pos2[axis] - pos1[axis] + 1
 	if count < 0 then
 		count = -count
 		length = -length
 	end
-	local amount = 0
-	local copy = worldedit.copy
-	local i = 1
-	local function next_one()
-		if i <= count then
+
+	local i, distance = 0, 0
+	local function step()
+		distance = distance + length
+		worldedit.copy(pos1, pos2, axis, distance)
 		i = i + 1
-			amount = amount + length
-			copy(pos1, pos2, axis, amount)
-			minetest.after(0, next_one)
+		return i >= count
 	end
-	end
-	next_one()
+	deferred_execution(step, finished)
+
 	return worldedit.volume(pos1, pos2) * count
 end

@ -638,7 +661,7 @@ function worldedit.clear_objects(pos1, pos2)
 		-- Avoid players and WorldEdit entities
 		if not obj:is_player() and (not entity or
 				not entity.name:find("^worldedit:")) then
-			local pos = obj:getpos()
+			local pos = obj:get_pos()
 			if pos.x >= pos1x and pos.x <= pos2x and
 					pos.y >= pos1y and pos.y <= pos2y and
 					pos.z >= pos1z and pos.z <= pos2z then
--- a/worldedit/mod.conf
+++ b/worldedit/mod.conf
@ -0,0 +1,2 @@
+name = worldedit
+description = WorldEdit main functionality & API
--- a/worldedit/serialization.lua
+++ b/worldedit/serialization.lua
@ -24,7 +24,7 @@ Serialization version history:
 -- @return Extra header fields as a list of strings, or nil if not supported.
 -- @return Content (data after header).
 function worldedit.read_header(value)
-	if value:find("^[0-9]+[%-:]") then
+	if value:find("^[0-9]+[,:]") then
 		local header_end = value:find(":", 1, true)
 		local header = value:sub(1, header_end - 1):split(",")
 		local version = tonumber(header[1])
@ -114,16 +114,44 @@ function worldedit.serialize(pos1, pos2)
 	return LATEST_SERIALIZATION_HEADER .. result, count
 end

-
--- Loads the schematic in `value` into a node list in the latest format.
 -- Contains code based on [table.save/table.load](http://lua-users.org/wiki/SaveTableToFile)
 -- by ChillCode, available under the MIT license.
+local function deserialize_workaround(content)
+	local nodes
+	if not jit then
+		nodes = minetest.deserialize(content, true)
+	else
+		-- XXX: This is a filthy hack that works surprisingly well
+		-- in LuaJIT, `minetest.deserialize` will fail due to the register limit
+		nodes = {}
+		content = content:gsub("^%s*return%s*{", "", 1):gsub("}%s*$", "", 1) -- remove the starting and ending values to leave only the node data
+		-- remove string contents strings while preserving their length
+		local escaped = content:gsub("\\\\", "@@"):gsub("\\\"", "@@"):gsub("(\"[^\"]*\")", function(s) return string.rep("@", #s) end)
+		local startpos, startpos1 = 1, 1
+		local endpos
+		while true do -- go through each individual node entry (except the last)
+			startpos, endpos = escaped:find("},%s*{", startpos)
+			if not startpos then
+				break
+			end
+			local current = content:sub(startpos1, startpos)
+			local entry = minetest.deserialize("return " .. current, true)
+			table.insert(nodes, entry)
+			startpos, startpos1 = endpos, endpos
+		end
+		local entry = minetest.deserialize("return " .. content:sub(startpos1), true) -- process the last entry
+		table.insert(nodes, entry)
+	end
+	return nodes
+end
+
+--- Loads the schematic in `value` into a node list in the latest format.
 -- @return A node list in the latest format, or nil on failure.
 local function load_schematic(value)
 	local version, header, content = worldedit.read_header(value)
 	local nodes = {}
 	if version == 1 or version == 2 then -- Original flat table format
-		local tables = minetest.deserialize(content)
+		local tables = minetest.deserialize(content, true)
 		if not tables then return nil end

 		-- Transform the node table into an array of nodes
@ -161,28 +189,7 @@ local function load_schematic(value)
 			})
 		end
 	elseif version == 4 or version == 5 then -- Nested table format
-		if not jit then
-			-- This is broken for larger tables in the current version of LuaJIT
-			nodes = minetest.deserialize(content)
-		else
-			-- XXX: This is a filthy hack that works surprisingly well - in LuaJIT, `minetest.deserialize` will fail due to the register limit
-			nodes = {}
-			content = content:gsub("return%s*{", "", 1):gsub("}%s*$", "", 1) -- remove the starting and ending values to leave only the node data
-			local escaped = content:gsub("\\\\", "@@"):gsub("\\\"", "@@"):gsub("(\"[^\"]*\")", function(s) return string.rep("@", #s) end)
-			local startpos, startpos1, endpos = 1, 1
-			while true do -- go through each individual node entry (except the last)
-				startpos, endpos = escaped:find("},%s*{", startpos)
-				if not startpos then
-					break
-				end
-				local current = content:sub(startpos1, startpos)
-				local entry = minetest.deserialize("return " .. current)
-				table.insert(nodes, entry)
-				startpos, startpos1 = endpos, endpos
-			end
-			local entry = minetest.deserialize("return " .. content:sub(startpos1)) -- process the last entry
-			table.insert(nodes, entry)
-		end
+		nodes = deserialize_workaround(content)
 	else
 		return nil
 	end
--- a/worldedit_brush/depends.txt
+++ b/worldedit_brush/depends.txt
@ -1,2 +0,0 @@
-worldedit
-worldedit_commands
--- a/worldedit_brush/init.lua
+++ b/worldedit_brush/init.lua
@ -1,57 +1,10 @@
-local modname = minetest.get_current_modname()
-
-- check compatibility
 if minetest.raycast == nil then
-	function log_unavailable_error()
-		minetest.log("error",
-			"[MOD] " .. modname .. " is not compatible with current game version, " ..
-			"you can disable it in the game settings!"
+	error(
+		"worldedit_brush requires at least Minetest 5.0"
 	)
-		minetest.log("verbose",
-			"[MOD] " .. modname .. " requires a suitable version of 0.4.16-dev or higher, " ..
-			"that includes support for minetest.raycast() [since 7th July 2017]"
-		)
-	end
-
-	if minetest.is_singleplayer() then
-		-- delay message until player is connected
-		minetest.register_on_joinplayer(log_unavailable_error)
-	else
-		log_unavailable_error()
-	end
-
-	-- exit here / do not load this mod
-	return
 end

 local BRUSH_MAX_DIST = 150
-local BRUSH_ALLOWED_COMMANDS = {
-	-- basically everything that only needs pos1
-	"cube",
-	"cylinder",
-	"dome",
-	"hollowcube",
-	"hollowcylinder",
-	"hollowdome",
-	"hollowpyramid",
-	"hollowsphere",
-	"load",
-	"pyramid",
-	"sphere",
-	"spiral",
-
-	"cyl",
-	"do",
-	"hcube",
-	"hcyl",
-	"hdo",
-	"hpyr",
-	"hspr",
-	"l",
-	"pyr",
-	"spr",
-	"spl",
-}
 local brush_on_use = function(itemstack, placer)
 	local meta = itemstack:get_meta()
 	local name = placer:get_player_name()
@ -62,8 +15,10 @@ local brush_on_use = function(itemstack, placer)
 			"This brush is not bound, use //brush to bind a command to it.")
 		return false
 	end
-	local cmddef = minetest.registered_chatcommands["/" .. cmd]
+
+	local cmddef = worldedit.registered_commands[cmd]
 	if cmddef == nil then return false end -- shouldn't happen as //brush checks this
+
 	local has_privs, missing_privs = minetest.check_player_privs(name, cmddef.privs)
 	if not has_privs then
 		worldedit.player_notify(name,
@ -71,7 +26,8 @@ local brush_on_use = function(itemstack, placer)
 		return false
 	end

-	local raybegin = vector.add(placer:get_pos(), {x=0, y=2, z=0}) -- player head
+	local raybegin = vector.add(placer:get_pos(),
+		{x=0, y=placer:get_properties().eye_height, z=0})
 	local rayend = vector.add(raybegin, vector.multiply(placer:get_look_dir(), BRUSH_MAX_DIST))
 	local ray = minetest.raycast(raybegin, rayend, false, true)
 	local pointed_thing = ray:next()
@ -83,20 +39,23 @@ local brush_on_use = function(itemstack, placer)
 	assert(pointed_thing.type == "node")
 	worldedit.pos1[name] = pointed_thing.under
 	worldedit.pos2[name] = nil
-	worldedit.mark_region(name)
-	-- is this a horrible hack? oh yes.
-	worldedit._override_safe_regions = true
+	worldedit.marker_update(name)
+
+	-- this isn't really clean...
 	local player_notify_old = worldedit.player_notify
 	worldedit.player_notify = function(name, msg)
 		if string.match(msg, "^%d") then return end -- discard "1234 nodes added."
 		return player_notify_old(name, msg)
 	end

+	assert(cmddef.require_pos < 2)
+	local parsed = {cmddef.parse(meta:get_string("params"))}
+	if not table.remove(parsed, 1) then return false end -- shouldn't happen
+
 	minetest.log("action", string.format("%s uses WorldEdit brush (//%s) at %s",
 		name, cmd, minetest.pos_to_string(pointed_thing.under)))
-	cmddef.func(name, meta:get_string("params"))
+	cmddef.func(name, unpack(parsed))

-	worldedit._override_safe_regions = false
 	worldedit.player_notify = player_notify_old
 	return true
 end
@ -112,21 +71,22 @@ minetest.register_tool(":worldedit:brush", {
 	end,
 })

-minetest.register_chatcommand("/brush", {
+worldedit.register_command("brush", {
 	privs = {worldedit=true},
 	params = "none/<cmd> [parameters]",
 	description = "Assign command to WorldEdit brush item",
-	func = function(name, param)
+	parse = function(param)
 		local found, _, cmd, params = param:find("^([^%s]+)%s+(.+)$")
 		if not found then
 			params = ""
 			found, _, cmd = param:find("^(.+)$")
 		end
 		if not found then
-			worldedit.player_notify(name, "Invalid usage.")
-			return
+			return false
 		end
-
+		return true, cmd, params
+	end,
+	func = function(name, cmd, params)
 		local itemstack = minetest.get_player_by_name(name):get_wielded_item()
 		if itemstack == nil or itemstack:get_name() ~= "worldedit:brush" then
 			worldedit.player_notify(name, "Not holding brush item.")
@ -139,16 +99,20 @@ minetest.register_chatcommand("/brush", {
 			meta:from_table(nil)
 			worldedit.player_notify(name, "Brush assignment cleared.")
 		else
-			local cmddef
-			if table.indexof(BRUSH_ALLOWED_COMMANDS, cmd) ~= -1 then
-				cmddef = minetest.registered_chatcommands["/" .. cmd]
-			else
-				cmddef = nil
-			end
-			if cmddef == nil then
-				worldedit.player_notify(name, "Invalid command for brush use: //" .. cmd)
+			local cmddef = worldedit.registered_commands[cmd]
+			if cmddef == nil or cmddef.require_pos ~= 1 then
+				worldedit.player_notify(name, "//" .. cmd .. " cannot be used with brushes")
 				return
 			end
+
+			-- Try parsing command params so we can give the user feedback
+			local ok, err = cmddef.parse(params)
+			if not ok then
+				err = err or "invalid usage"
+				worldedit.player_notify(name, "Error with brush command: " .. err)
+				return
+			end
+
 			meta:set_string("command", cmd)
 			meta:set_string("params", params)
 			local fullcmd = "//" .. cmd .. " " .. params
--- a/worldedit_brush/mod.conf
+++ b/worldedit_brush/mod.conf
@ -0,0 +1,3 @@
+name = worldedit_brush
+description = WorldEdit brush
+depends = worldedit, worldedit_commands
--- a/worldedit_commands/cuboid.lua
+++ b/worldedit_commands/cuboid.lua
@ -1,28 +1,22 @@
-minetest.register_chatcommand("/outset", {
-	params = "[h|v] <amount>",
-	description = "outset the selection",
+worldedit.register_command("outset", {
+	params = "[h/v] <amount>",
+	description = "Outset the selected region.",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
-		
 		if find == nil then
-			return false, "invalid usage: " .. param
-		end
-		
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
-		
-		if pos1 == nil or pos2 == nil then
-			return false, 
-				"Undefined region. Region must be defined beforehand."
+			return false
 		end

 		local hv_test = dir:find("[^hv]+")
-		
 		if hv_test ~= nil then
 			return false, "Invalid direction."
 		end

+		return true, dir, tonumber(amount)
+	end,
+	func = function(name, dir, amount)
 		if dir == "" or dir == "hv" or dir == "vh" then
 			assert(worldedit.cuboid_volumetric_expand(name, amount))
 		elseif dir == "h" then
@ -40,35 +34,26 @@ minetest.register_chatcommand("/outset", {
 		worldedit.marker_update(name)
 		return true, "Region outset by " .. amount .. " blocks"
      end,
-  }
-)
+})


-minetest.register_chatcommand("/inset", {
-	params = "[h|v] <amount>",
-	description = "inset the selection",
+worldedit.register_command("inset", {
+	params = "[h/v] <amount>",
+	description = "Inset the selected region.",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
-		
 		if find == nil then
-			return false, "invalid usage: " .. param
+			return false
 		end
-		
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
-		
-		if pos1 == nil or pos2 == nil then
-			return false, 
-				"Undefined region. Region must be defined beforehand."
-		end
-		
-		local hv_test = dir:find("[^hv]+")
-		
-		if hv_test ~= nil then
+		if dir:find("[^hv]") ~= nil then
 			return false, "Invalid direction."
 		end

+		return true, dir, tonumber(amount)
+	end,
+	func = function(name, dir, amount)
 		if dir == "" or dir == "vh" or dir == "hv" then
 			assert(worldedit.cuboid_volumetric_expand(name, -amount))
 		elseif dir == "h" then
@ -86,30 +71,23 @@ minetest.register_chatcommand("/inset", {
 		worldedit.marker_update(name)
 		return true, "Region inset by " .. amount .. " blocks"
      end,
-  }
-)
+})


-minetest.register_chatcommand("/shift", {
-	params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
-	description = "Moves the selection region. Does not move contents.",
+worldedit.register_command("shift", {
+	params = "x/y/z/?/up/down/left/right/front/back [+/-]<amount>",
+	description = "Shifts the selection area without moving its contents",
 	privs = {worldedit=true},
-	func = function(name, param)
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
+	require_pos = 2,
+	parse = function(param)
 		local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")
-		
 		if find == nil then
-			worldedit.player_notify(name, "invalid usage: " .. param)
-			return
-		end
-		
-		if pos1 == nil or pos2 == nil then
-			worldedit.player_notify(name, 
-				"Undefined region. Region must be defined beforehand.")
-			return
+			return false
 		end

+		return true, direction, tonumber(amount)
+	end,
+	func = function(name, direction, amount)
 		local axis, dir
 		if direction == "x" or direction == "y" or direction == "z" then
 			axis, dir = direction, 1
@ -128,36 +106,31 @@ minetest.register_chatcommand("/shift", {

 		return true, "Region shifted by " .. amount .. " nodes"
      end,
-  }
-)
+})


-minetest.register_chatcommand("/expand", {
-	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
-	description = "expand the selection in one or two directions at once",
+worldedit.register_command("expand", {
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
+	description = "Expands the selection in the selected absolute or relative axis",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, sign, direction, amount,
 				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
-	
 		if find == nil then
-		worldedit.player_notify(name, "invalid use: " .. param)
-		return
+			return false
 		end

-	if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
-		worldedit.player_notify(name, 
-		"Undefined region. Region must be defined beforehand.")
-		return
-	end
-	
-	local absolute = direction:find("[xyz?]")
-	local dir, axis
-	
 		if rev_amount == "" then
-		rev_amount = 0
+			rev_amount = "0"
 		end

+		return true, sign, direction, tonumber(amount), tonumber(rev_amount)
+	end,
+	func = function(name, sign, direction, amount, rev_amount)
+		local absolute = direction:find("[xyz?]")
+		local dir, axis
+
 		if absolute == nil then
 			axis, dir = worldedit.translate_direction(name, direction)

@ -182,36 +155,31 @@ minetest.register_chatcommand("/expand", {
 		worldedit.marker_update(name)
 		return true, "Region expanded by " .. (amount + rev_amount) .. " nodes"
 	end,
-  }
-)
+})


-minetest.register_chatcommand("/contract", {
-	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
-	description = "contract the selection in one or two directions at once",
+worldedit.register_command("contract", {
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
+	description = "Contracts the selection in the selected absolute or relative axis",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, sign, direction, amount,
 				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
-	
 		if find == nil then
-		worldedit.player_notify(name, "invalid use: " .. param)
-		return
+			return false
 		end

-	if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
-		worldedit.player_notify(name, 
-		"Undefined region. Region must be defined beforehand.")
-		return
-	end
-	
-	local absolute = direction:find("[xyz?]")
-	local dir, axis
-	
 		if rev_amount == "" then
-		rev_amount = 0
+			rev_amount = "0"
 		end

+		return true, sign, direction, tonumber(amount), tonumber(rev_amount)
+	end,
+	func = function(name, sign, direction, amount, rev_amount)
+		local absolute = direction:find("[xyz?]")
+		local dir, axis
+
 		if absolute == nil then
 			axis, dir = worldedit.translate_direction(name, direction)

@ -236,5 +204,63 @@ minetest.register_chatcommand("/contract", {
 		worldedit.marker_update(name)
 		return true, "Region contracted by " .. (amount + rev_amount) .. " nodes"
 	end,
-  }
-)
+})
+
+worldedit.register_command("cubeapply", {
+	params = "<size>/(<sizex> <sizey> <sizez>) <command> [parameters]",
+	description = "Select a cube with side length <size> around position 1 and run <command> on region",
+	privs = {worldedit=true},
+	require_pos = 1,
+	parse = function(param)
+		local found, _, sidex, sidey, sidez, cmd, args =
+			param:find("^(%d+)%s+(%d+)%s+(%d+)%s+([^%s]+)%s*(.*)$")
+		if found == nil then
+			found, _, sidex, cmd, args = param:find("^(%d+)%s+([^%s]+)%s*(.*)$")
+			if found == nil then
+				return false
+			end
+			sidey = sidex
+			sidez = sidex
+		end
+		sidex = tonumber(sidex)
+		sidey = tonumber(sidey)
+		sidez = tonumber(sidez)
+		if sidex < 1 or sidey < 1 or sidez < 1 then
+			return false
+		end
+		local cmddef = worldedit.registered_commands[cmd]
+		if cmddef == nil or cmddef.require_pos ~= 2 then
+			return false, "invalid usage: //" .. cmd .. " cannot be used with cubeapply"
+		end
+		-- run parsing of target command
+		local parsed = {cmddef.parse(args)}
+		if not table.remove(parsed, 1) then
+			return false, parsed[1]
+		end
+		return true, sidex, sidey, sidez, cmd, parsed
+	end,
+	nodes_needed = function(name, sidex, sidey, sidez, cmd, parsed)
+		-- its not possible to defer to the target command at this point
+		return sidex * sidey * sidez
+	end,
+	func = function(name, sidex, sidey, sidez, cmd, parsed)
+		local cmddef = assert(worldedit.registered_commands[cmd])
+		local success, missing_privs = minetest.check_player_privs(name, cmddef.privs)
+		if not success then
+			worldedit.player_notify(name, "Missing privileges: " ..
+				table.concat(missing_privs, ", "))
+			return
+		end
+
+		-- update region to be the cuboid the user wanted
+		local half = vector.divide(vector.new(sidex, sidey, sidez), 2)
+		local sizea, sizeb = vector.apply(half, math.floor), vector.apply(half, math.ceil)
+		local center = worldedit.pos1[name]
+		worldedit.pos1[name] = vector.subtract(center, sizea)
+		worldedit.pos2[name] = vector.add(center, vector.subtract(sizeb, 1))
+		worldedit.marker_update(name)
+
+		-- actually run target command
+		return cmddef.func(name, unpack(parsed))
+	end,
+})
--- a/worldedit_commands/depends.txt
+++ b/worldedit_commands/depends.txt
@ -1 +0,0 @@
-worldedit
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
--- a/worldedit_commands/mark.lua
+++ b/worldedit_commands/mark.lua
@ -2,57 +2,60 @@ worldedit.marker1 = {}
 worldedit.marker2 = {}
 worldedit.marker_region = {}

+local init_sentinel = "new" .. tostring(math.random(99999))
+
 --marks worldedit region position 1
-worldedit.mark_pos1 = function(name)
+worldedit.mark_pos1 = function(name, region_too)
 	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-	if pos1 ~= nil then
-		--make area stay loaded
-		local manip = minetest.get_voxel_manip()
-		manip:read_from_map(pos1, pos1)
-	end
 	if worldedit.marker1[name] ~= nil then --marker already exists
 		worldedit.marker1[name]:remove() --remove marker
 		worldedit.marker1[name] = nil
 	end
 	if pos1 ~= nil then
+		--make area stay loaded
+		local manip = minetest.get_voxel_manip()
+		manip:read_from_map(pos1, pos1)
+
 		--add marker
-		worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1")
+		worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1", init_sentinel)
 		if worldedit.marker1[name] ~= nil then
 			worldedit.marker1[name]:get_luaentity().player_name = name
 		end
 	end
+	if region_too == nil or region_too then
 		worldedit.mark_region(name)
+	end
 end

 --marks worldedit region position 2
-worldedit.mark_pos2 = function(name)
+worldedit.mark_pos2 = function(name, region_too)
 	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-	if pos2 ~= nil then
-		--make area stay loaded
-		local manip = minetest.get_voxel_manip()
-		manip:read_from_map(pos2, pos2)
-	end
 	if worldedit.marker2[name] ~= nil then --marker already exists
 		worldedit.marker2[name]:remove() --remove marker
 		worldedit.marker2[name] = nil
 	end
 	if pos2 ~= nil then
+		--make area stay loaded
+		local manip = minetest.get_voxel_manip()
+		manip:read_from_map(pos2, pos2)
+
 		--add marker
-		worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2")
+		worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2", init_sentinel)
 		if worldedit.marker2[name] ~= nil then
 			worldedit.marker2[name]:get_luaentity().player_name = name
 		end
 	end
+	if region_too == nil or region_too then
 		worldedit.mark_region(name)
+	end
 end

 worldedit.mark_region = function(name)
 	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

 	if worldedit.marker_region[name] ~= nil then --marker already exists
-		--wip: make the area stay loaded somehow
 		for _, entity in ipairs(worldedit.marker_region[name]) do
 			entity:remove()
 		end
@ -64,7 +67,7 @@ worldedit.mark_region = function(name)

 		local vec = vector.subtract(pos2, pos1)
 		local maxside = math.max(vec.x, math.max(vec.y, vec.z))
-		local limit = tonumber(minetest.setting_get("active_object_send_range_blocks")) * 16
+		local limit = tonumber(minetest.settings:get("active_object_send_range_blocks")) * 16
 		if maxside > limit * 1.5 then
 			-- The client likely won't be able to see the plane markers as intended anyway,
 			-- thus don't place them and also don't load the area into memory
@ -82,7 +85,8 @@ worldedit.mark_region = function(name)

 		--XY plane markers
 		for _, z in ipairs({pos1.z - 0.5, pos2.z + 0.5}) do
-			local marker = minetest.add_entity({x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}, "worldedit:region_cube")
+			local entpos = {x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}
+			local marker = minetest.add_entity(entpos, "worldedit:region_cube", init_sentinel)
 			if marker ~= nil then
 				marker:set_properties({
 					visual_size={x=sizex * 2, y=sizey * 2},
@ -95,13 +99,14 @@ worldedit.mark_region = function(name)

 		--YZ plane markers
 		for _, x in ipairs({pos1.x - 0.5, pos2.x + 0.5}) do
-			local marker = minetest.add_entity({x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}, "worldedit:region_cube")
+			local entpos = {x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}
+			local marker = minetest.add_entity(entpos, "worldedit:region_cube", init_sentinel)
 			if marker ~= nil then
 				marker:set_properties({
 					visual_size={x=sizez * 2, y=sizey * 2},
 					collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},
 				})
-				marker:setyaw(math.pi / 2)
+				marker:set_yaw(math.pi / 2)
 				marker:get_luaentity().player_name = name
 				table.insert(markers, marker)
 			end
@ -111,6 +116,13 @@ worldedit.mark_region = function(name)
 	end
 end

+--convenience function that calls everything
+worldedit.marker_update = function(name)
+	worldedit.mark_pos1(name, false)
+	worldedit.mark_pos2(name, false)
+	worldedit.mark_region(name)
+end
+
 minetest.register_entity(":worldedit:pos1", {
 	initial_properties = {
 		visual = "cube",
@ -120,9 +132,11 @@ minetest.register_entity(":worldedit:pos1", {
 			"worldedit_pos1.png", "worldedit_pos1.png"},
 		collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},
 		physical = false,
+		static_save = false,
 	},
-	on_step = function(self, dtime)
-		if worldedit.marker1[self.player_name] == nil then
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
 			self.object:remove()
 		end
 	end,
@ -130,6 +144,9 @@ minetest.register_entity(":worldedit:pos1", {
 		self.object:remove()
 		worldedit.marker1[self.player_name] = nil
 	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	end,
 })

 minetest.register_entity(":worldedit:pos2", {
@ -141,9 +158,11 @@ minetest.register_entity(":worldedit:pos2", {
 			"worldedit_pos2.png", "worldedit_pos2.png"},
 		collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},
 		physical = false,
+		static_save = false,
 	},
-	on_step = function(self, dtime)
-		if worldedit.marker2[self.player_name] == nil then
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
 			self.object:remove()
 		end
 	end,
@ -151,20 +170,23 @@ minetest.register_entity(":worldedit:pos2", {
 		self.object:remove()
 		worldedit.marker2[self.player_name] = nil
 	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	end,
 })

 minetest.register_entity(":worldedit:region_cube", {
 	initial_properties = {
 		visual = "upright_sprite",
-		visual_size = {x=1.1, y=1.1},
 		textures = {"worldedit_cube.png"},
 		visual_size = {x=10, y=10},
 		physical = false,
+		static_save = false,
 	},
-	on_step = function(self, dtime)
-		if worldedit.marker_region[self.player_name] == nil then
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
 			self.object:remove()
-			return
 		end
 	end,
 	on_punch = function(self, hitter)
@ -177,5 +199,8 @@ minetest.register_entity(":worldedit:region_cube", {
 		end
 		worldedit.marker_region[self.player_name] = nil
 	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	end,
 })

--- a/worldedit_commands/mod.conf
+++ b/worldedit_commands/mod.conf
@ -0,0 +1,3 @@
+name = worldedit_commands
+description = WorldEdit chat commands
+depends = worldedit
--- a/worldedit_commands/safe.lua
+++ b/worldedit_commands/safe.lua
@ -1,53 +1,33 @@
 local safe_region_callback = {}
-local safe_region_param = {}
-
-worldedit._override_safe_regions = false -- internal use ONLY!
-
-local function check_region(name, param)
-	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] --obtain positions
-	if pos1 == nil or pos2 == nil then
-		worldedit.player_notify(name, "no region selected")
-		return nil
-	end
-	return worldedit.volume(pos1, pos2)
-end

+--`count` is the number of nodes that would possibly be modified
 --`callback` is a callback to run when the user confirms
--`nodes_needed` is a function accepting `param`, `pos1`, and `pos2` to calculate the number of nodes needed
-local function safe_region(callback, nodes_needed)
-	--default node volume calculation
-	nodes_needed = nodes_needed or check_region
-
-	return function(name, param)
-		--check if the operation applies to a safe number of nodes
-		local count = nodes_needed(name, param)
-		if count == nil then return end --invalid command
-		if worldedit._override_safe_regions or count < 10000 then
-			return callback(name, param)
+local function safe_region(name, count, callback)
+	if count < 20000 then
+		return callback()
 	end

 	--save callback to call later
-		safe_region_callback[name], safe_region_param[name] = callback, param
+	safe_region_callback[name] = callback
 	worldedit.player_notify(name, "WARNING: this operation could affect up to " .. count .. " nodes; type //y to continue or //n to cancel")
-	end
 end

 local function reset_pending(name)
-	safe_region_callback[name], safe_region_param[name] = nil, nil
+	safe_region_callback[name] = nil
 end

 minetest.register_chatcommand("/y", {
 	params = "",
 	description = "Confirm a pending operation",
 	func = function(name)
-		local callback, param = safe_region_callback[name], safe_region_param[name]
+		local callback = safe_region_callback[name]
 		if not callback then
 			worldedit.player_notify(name, "no operation pending")
 			return
 		end

 		reset_pending(name)
-		callback(name, param)
+		callback(name)
 	end,
 })

@ -65,4 +45,4 @@ minetest.register_chatcommand("/n", {
 })


-return safe_region, check_region, reset_pending
+return safe_region, reset_pending
--- a/worldedit_commands/wand.lua
+++ b/worldedit_commands/wand.lua
@ -6,25 +6,58 @@ local function above_or_under(placer, pointed_thing)
 	end
 end

+local punched_air_time = {}
+
 minetest.register_tool(":worldedit:wand", {
-	description = "WorldEdit Wand tool, Left-click to set 1st position, right-click to set 2nd",
+	description = "WorldEdit Wand tool\nLeft-click to set 1st position, right-click to set 2nd",
 	inventory_image = "worldedit_wand.png",
 	stack_max = 1, -- there is no need to have more than one
 	liquids_pointable = true, -- ground with only water on can be selected as well

 	on_use = function(itemstack, placer, pointed_thing)
-		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
+		if placer == nil or pointed_thing == nil then return end
 		local name = placer:get_player_name()
+		if pointed_thing.type == "node" then
+			-- set and mark pos1
 			worldedit.pos1[name] = above_or_under(placer, pointed_thing)
 			worldedit.mark_pos1(name)
+		elseif pointed_thing.type == "nothing" then
+			local now = minetest.get_us_time()
+			if now - (punched_air_time[name] or 0) < 1000 * 1000 then
+				-- reset markers
+				worldedit.registered_commands["reset"].func(name)
 			end
+			punched_air_time[name] = now
+		elseif pointed_thing.type == "object" then
+			local entity = pointed_thing.ref:get_luaentity()
+			if entity and entity.name == "worldedit:pos2" then
+				-- set pos1 = pos2
+				worldedit.pos1[name] = worldedit.pos2[name]
+				worldedit.mark_pos1(name)
+			end
+		end
+	end,
+
+	on_place = function(itemstack, placer, pointed_thing)
+		if placer == nil or (pointed_thing or {}).type ~= "node" then
+			return itemstack
+		end
+		local name = placer:get_player_name()
+		-- set and mark pos2
+		worldedit.pos2[name] = above_or_under(placer, pointed_thing)
+		worldedit.mark_pos2(name)
 		return itemstack -- nothing consumed, nothing changed
 	end,

-	on_place = function(itemstack, placer, pointed_thing) -- Left Click
-		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
-			local name = placer:get_player_name()
-			worldedit.pos2[name] = above_or_under(placer, pointed_thing)
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		if user == nil or (pointed_thing or {}).type ~= "object" then
+			return itemstack
+		end
+		local name = user:get_player_name()
+		local entity = pointed_thing.ref:get_luaentity()
+		if entity and entity.name == "worldedit:pos1" then
+			-- set pos2 = pos1
+			worldedit.pos2[name] = worldedit.pos1[name]
 			worldedit.mark_pos2(name)
 		end
 		return itemstack -- nothing consumed, nothing changed
--- a/worldedit_gui/depends.txt
+++ b/worldedit_gui/depends.txt
@ -1,7 +0,0 @@
-worldedit
-worldedit_commands
-unified_inventory?
-inventory_plus?
-sfinv?
-creative?
-smart_inventory?
--- a/worldedit_gui/functionality.lua
+++ b/worldedit_gui/functionality.lua
@ -52,13 +52,18 @@ end

 -- display node (or unknown_node image otherwise) at specified pos in formspec
 local formspec_node = function(pos, nodename)
-	return nodename and string.format("item_image[%s;1,1;%s]", pos, nodename)
-		or string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos)
+	local ndef = nodename and minetest.registered_nodes[nodename]
+	if nodename and ndef then
+		return string.format("item_image[%s;1,1;%s]", pos, nodename) ..
+			string.format("tooltip[%s;1,1;%s]", pos, minetest.formspec_escape(ndef.description))
+	else
+		return string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos)
+	end
 end

 -- two further priv helpers
 local function we_privs(command)
-	return minetest.chatcommands["/" .. command].privs
+	return worldedit.registered_commands[command].privs
 end

 local function combine_we_privs(list)
@ -69,11 +74,79 @@ local function combine_we_privs(list)
 	return combine_privs(unpack(args))
 end

+-- functions that handle value changing & page reshowing (without submitting)
+local function copy_changes(name, fields, def)
+	for field, into in pairs(def) do
+		if into ~= true and fields[field] then
+			local value = tostring(fields[field])
+			if into == gui_axis1 or into == gui_axis2 then
+				into[name] = axis_indices[value]
+			elseif into == gui_angle then
+				into[name] = angle_indices[value]
+			else
+				into[name] = value
+			end
+		end
+	end
+end
+
+local function handle_changes(name, identifier, fields, def)
+	local any = false
+	for field, into in pairs(def) do
+		if fields.key_enter_field == field then
+			any = true
+		end
+		-- first condition: buttons (value not saved)
+		-- others: dropdowns which will be sent when their value changes
+		if into == true or into == gui_axis1 or into == gui_axis2 or into == gui_angle then
+			if fields[field] then
+				any = true
+			end
+		end
+	end
+	if not any then
+		return false
+	end
+
+	any = false
+	for field, into in pairs(def) do
+		if into ~= true and fields[field] then
+			local value = tostring(fields[field])
+			if into == gui_axis1 or into == gui_axis2 then
+				into[name] = axis_indices[value]
+			elseif into == gui_angle then
+				into[name] = angle_indices[value]
+			else
+				into[name] = value
+			end
+
+			if into == gui_nodename1 or into == gui_nodename2 then
+				any = true
+			end
+		end
+	end
+	-- Only nodename fields change based on the value, so only re-show the page if necessary
+	if any then
+		worldedit.show_page(name, identifier)
+	end
+	return true
+end
+
+-- This has the same behaviour as the player invoking the chat command
+local function execute_worldedit_command(command_name, player_name, params)
+	local chatcmd = minetest.registered_chatcommands["/" .. command_name]
+	assert(chatcmd, "unknown command: " .. command_name)
+	local _, msg = chatcmd.func(player_name, params)
+	if msg then
+		 worldedit.player_notify(player_name, msg)
+	end
+end
+
 worldedit.register_gui_function("worldedit_gui_about", {
 	name = "About",
 	privs = {interact=true},
 	on_select = function(name)
-		minetest.chatcommands["/about"].func(name, "")
+		execute_worldedit_command("about", name, "")
 	end,
 })

@ -81,7 +154,8 @@ worldedit.register_gui_function("worldedit_gui_inspect", {
 	name = "Toggle Inspect",
 	privs = we_privs("inspect"),
 	on_select = function(name)
-		minetest.chatcommands["/inspect"].func(name, worldedit.inspect[name] and "disable" or "enable")
+		execute_worldedit_command("inspect", name,
+			worldedit.inspect[name] and "disable" or "enable")
 	end,
 })

@ -115,47 +189,47 @@ worldedit.register_gui_function("worldedit_gui_region", {

 worldedit.register_gui_handler("worldedit_gui_region", function(name, fields)
 	if fields.worldedit_gui_p_get then
-		minetest.chatcommands["/p"].func(name, "get")
+		execute_worldedit_command("p", name, "get")
 		return true
 	elseif fields.worldedit_gui_p_set1 then
-		minetest.chatcommands["/p"].func(name, "set1")
+		execute_worldedit_command("p", name, "set1")
 		return true
 	elseif fields.worldedit_gui_p_set2 then
-		minetest.chatcommands["/p"].func(name, "set2")
+		execute_worldedit_command("p", name, "set2")
 		return true
 	elseif fields.worldedit_gui_pos1 then
-		minetest.chatcommands["/pos1"].func(name, "")
+		execute_worldedit_command("pos1", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_pos2 then
-		minetest.chatcommands["/pos2"].func(name, "")
+		execute_worldedit_command("pos2", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_reset then
-		minetest.chatcommands["/reset"].func(name, "")
+		execute_worldedit_command("reset", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_mark then
-		minetest.chatcommands["/mark"].func(name, "")
+		execute_worldedit_command("mark", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_unmark then
-		minetest.chatcommands["/unmark"].func(name, "")
+		execute_worldedit_command("unmark", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_volume then
-		minetest.chatcommands["/volume"].func(name, "")
+		execute_worldedit_command("volume", name, "")
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_fixedpos_pos1_submit then
-		minetest.chatcommands["/fixedpos"].func(name, string.format("set1 %s %s %s",
+		execute_worldedit_command("fixedpos", name, ("set1 %s %s %s"):format(
 			tostring(fields.worldedit_gui_fixedpos_pos1x),
 			tostring(fields.worldedit_gui_fixedpos_pos1y),
 			tostring(fields.worldedit_gui_fixedpos_pos1z)))
 		worldedit.show_page(name, "worldedit_gui_region")
 		return true
 	elseif fields.worldedit_gui_fixedpos_pos2_submit then
-		minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %s %s %s",
+		execute_worldedit_command("fixedpos", name, ("set2 %s %s %s"):format(
 			tostring(fields.worldedit_gui_fixedpos_pos2x),
 			tostring(fields.worldedit_gui_fixedpos_pos2y),
 			tostring(fields.worldedit_gui_fixedpos_pos2z)))
@ -173,6 +247,7 @@ worldedit.register_gui_function("worldedit_gui_set", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_set") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_set_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_set_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_set_submit;Set Nodes]"
@ -180,18 +255,22 @@ worldedit.register_gui_function("worldedit_gui_set", {
 })

 worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
-	if fields.worldedit_gui_set_search or fields.worldedit_gui_set_submit then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_set_node)
-		worldedit.show_page(name, "worldedit_gui_set")
+	local cg = {
+		worldedit_gui_set_search = true,
+		worldedit_gui_set_node = gui_nodename1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_set", fields, cg)
 	if fields.worldedit_gui_set_submit then
+		copy_changes(name, fields, cg)
+		worldedit.show_page(name, "worldedit_gui_set")
+
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/set"].func(name, n)
-			end
+			execute_worldedit_command("set", name, n)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_replace", {
@ -202,9 +281,11 @@ worldedit.register_gui_function("worldedit_gui_replace", {
 		local search_nodename, replace_nodename = worldedit.normalize_nodename(search), worldedit.normalize_nodename(replace)
 		return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_replace") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search)) ..
+			"field_close_on_enter[worldedit_gui_replace_search;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_replace_search_search;Search]" ..
 			formspec_node("5.5,1.1", search_nodename) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace)) ..
+			"field_close_on_enter[worldedit_gui_replace_replace;false]" ..
 			"button[4,2.18;1.5,0.8;worldedit_gui_replace_replace_search;Search]" ..
 			formspec_node("5.5,2.1", replace_nodename) ..
 			"button_exit[0,3.5;3,0.8;worldedit_gui_replace_submit;Replace Nodes]" ..
@ -213,28 +294,29 @@ worldedit.register_gui_function("worldedit_gui_replace", {
 })

 worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
-	if fields.worldedit_gui_replace_search_search or fields.worldedit_gui_replace_replace_search
-	or fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_replace_search)
-		gui_nodename2[name] = tostring(fields.worldedit_gui_replace_replace)
+	local cg = {
+		worldedit_gui_replace_search_search = true,
+		worldedit_gui_replace_replace_search = true,
+		worldedit_gui_replace_search = gui_nodename1,
+		worldedit_gui_replace_replace = gui_nodename2,
+	}
+	local ret = handle_changes(name, "worldedit_gui_replace", fields, cg)
+	if fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_replace")

-		local submit = nil
-		if fields.worldedit_gui_replace_submit then
-			submit = "replace"
-		elseif fields.worldedit_gui_replace_submit_inverse then
+		local submit = "replace"
+		if fields.worldedit_gui_replace_submit_inverse then
 			submit = "replaceinverse"
 		end
-		if submit then
 		local n1 = worldedit.normalize_nodename(gui_nodename1[name])
 		local n2 = worldedit.normalize_nodename(gui_nodename2[name])
 		if n1 and n2 then
-				minetest.chatcommands["/"..submit].func(name, string.format("%s %s", n1, n2))
-			end
+			execute_worldedit_command(submit, name, n1 .. " " .. n2)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_sphere_dome", {
@ -245,9 +327,11 @@ worldedit.register_gui_function("worldedit_gui_sphere_dome", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,5]" .. worldedit.get_formspec_header("worldedit_gui_sphere_dome") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_dome_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_sphere_dome_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_sphere_dome_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_dome_radius;Radius;%s]", minetest.formspec_escape(radius)) ..
+			"field_close_on_enter[worldedit_gui_sphere_dome_radius;false]" ..
 			"button_exit[0,3.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow;Hollow Sphere]" ..
 			"button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_dome_submit_solid;Solid Sphere]" ..
 			"button_exit[0,4.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow_dome;Hollow Dome]" ..
@ -256,32 +340,33 @@ worldedit.register_gui_function("worldedit_gui_sphere_dome", {
 })

 worldedit.register_gui_handler("worldedit_gui_sphere_dome", function(name, fields)
-	if fields.worldedit_gui_sphere_dome_search
-	or fields.worldedit_gui_sphere_dome_submit_hollow or fields.worldedit_gui_sphere_dome_submit_solid
+	local cg = {
+		worldedit_gui_sphere_dome_search = true,
+		worldedit_gui_sphere_dome_node = gui_nodename1,
+		worldedit_gui_sphere_dome_radius = gui_distance2,
+	}
+	local ret = handle_changes(name, "worldedit_gui_sphere_dome", fields, cg)
+	if fields.worldedit_gui_sphere_dome_submit_hollow or fields.worldedit_gui_sphere_dome_submit_solid
 	or fields.worldedit_gui_sphere_dome_submit_hollow_dome or fields.worldedit_gui_sphere_dome_submit_solid_dome then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_sphere_dome_node)
-		gui_distance2[name] = tostring(fields.worldedit_gui_sphere_dome_radius)
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_sphere_dome")

-		local submit = nil
-		if fields.worldedit_gui_sphere_dome_submit_hollow then
-			submit = "hollowsphere"
-		elseif fields.worldedit_gui_sphere_dome_submit_solid then
+		local submit = "hollowsphere"
+		if fields.worldedit_gui_sphere_dome_submit_solid then
 			submit = "sphere"
 		elseif fields.worldedit_gui_sphere_dome_submit_hollow_dome then
 			submit = "hollowdome"
 		elseif fields.worldedit_gui_sphere_dome_submit_solid_dome then
 			submit = "dome"
 		end
-		if submit then
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/"..submit].func(name, string.format("%s %s", gui_distance2[name], n))
-			end
+			execute_worldedit_command(submit, name,
+				gui_distance2[name] .. " " .. n)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_cylinder", {
@ -293,12 +378,16 @@ worldedit.register_gui_function("worldedit_gui_cylinder", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,6]" .. worldedit.get_formspec_header("worldedit_gui_cylinder") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_cylinder_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_cylinder_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_cylinder_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_cylinder_length;Length;%s]", minetest.formspec_escape(length)) ..
 			string.format("dropdown[4,2.18;2.5;worldedit_gui_cylinder_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..
 			string.format("field[0.5,3.5;2,0.8;worldedit_gui_cylinder_radius1;Base Radius;%s]", minetest.formspec_escape(radius1)) ..
 			string.format("field[2.5,3.5;2,0.8;worldedit_gui_cylinder_radius2;Top Radius;%s]", minetest.formspec_escape(radius2)) ..
+			"field_close_on_enter[worldedit_gui_cylinder_length;false]" ..
+			"field_close_on_enter[worldedit_gui_cylinder_radius1;false]" ..
+			"field_close_on_enter[worldedit_gui_cylinder_radius2;false]" ..
 			"label[0.25,4;Equal base and top radius creates a cylinder,\n"..
 				"zero top radius creates a cone.\nConsult documentation for more information.]"..
 			"button_exit[0,5.5;3,0.8;worldedit_gui_cylinder_submit_hollow;Hollow Cylinder]" ..
@ -307,36 +396,31 @@ worldedit.register_gui_function("worldedit_gui_cylinder", {
 })

 worldedit.register_gui_handler("worldedit_gui_cylinder", function(name, fields)
-	if fields.worldedit_gui_cylinder_search
-	or fields.worldedit_gui_cylinder_submit_hollow or fields.worldedit_gui_cylinder_submit_solid then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_cylinder_node)
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_cylinder_axis]
-		gui_distance1[name] = tostring(fields.worldedit_gui_cylinder_length)
-		gui_distance2[name] = tostring(fields.worldedit_gui_cylinder_radius1)
-		gui_distance3[name] = tostring(fields.worldedit_gui_cylinder_radius2)
+	local cg = {
+		worldedit_gui_cylinder_search = true,
+		worldedit_gui_cylinder_node = gui_nodename1,
+		worldedit_gui_cylinder_axis = gui_axis1,
+		worldedit_gui_cylinder_length = gui_distance1,
+		worldedit_gui_cylinder_radius1 = gui_distance2,
+		worldedit_gui_cylinder_radius2 = gui_distance3,
+	}
+	local ret = handle_changes(name, "worldedit_gui_cylinder", fields, cg)
+	if fields.worldedit_gui_cylinder_submit_hollow or fields.worldedit_gui_cylinder_submit_solid then
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_cylinder")

-		local submit = nil
-		if fields.worldedit_gui_cylinder_submit_hollow then
-			submit = "hollowcylinder"
-		elseif fields.worldedit_gui_cylinder_submit_solid then
+		local submit = "hollowcylinder"
+		if fields.worldedit_gui_cylinder_submit_solid then
 			submit = "cylinder"
 		end
-		if submit then
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
 			local args = string.format("%s %s %s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], gui_distance2[name], gui_distance3[name], n)
-				minetest.chatcommands["/"..submit].func(name, args)
-			end
+			execute_worldedit_command(submit, name, args)
 		end
 		return true
 	end
-	if fields.worldedit_gui_cylinder_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_cylinder_axis]
-		worldedit.show_page(name, "worldedit_gui_cylinder")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_pyramid", {
@ -347,42 +431,42 @@ worldedit.register_gui_function("worldedit_gui_pyramid", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_pyramid") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_pyramid_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_pyramid_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_pyramid_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_pyramid_length;Length;%s]", minetest.formspec_escape(length)) ..
 			string.format("dropdown[4,2.18;2.5;worldedit_gui_pyramid_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..
+			"field_close_on_enter[worldedit_gui_pyramid_length;false]" ..
 			"button_exit[0,3.5;3,0.8;worldedit_gui_pyramid_submit_hollow;Hollow Pyramid]" ..
 			"button_exit[3.5,3.5;3,0.8;worldedit_gui_pyramid_submit_solid;Solid Pyramid]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields)
-	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
-		gui_nodename1[name] = tostring(fields.worldedit_gui_pyramid_node)
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_pyramid_axis]
-		gui_distance1[name] = tostring(fields.worldedit_gui_pyramid_length)
+	local cg = {
+		worldedit_gui_pyramid_search = true,
+		worldedit_gui_pyramid_node = gui_nodename1,
+		worldedit_gui_pyramid_axis = gui_axis1,
+		worldedit_gui_pyramid_length = gui_distance1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_pyramid", fields, cg)
+	if fields.worldedit_gui_pyramid_submit_solid or fields.worldedit_gui_pyramid_submit_hollow then
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_pyramid")

-		local submit = nil
-		if fields.worldedit_gui_pyramid_submit_solid then
-			submit = "pyramid"
-		elseif fields.worldedit_gui_pyramid_submit_hollow then
+		local submit = "pyramid"
+		if fields.worldedit_gui_pyramid_submit_hollow then
 			submit = "hollowpyramid"
 		end
-		if submit then
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/"..submit].func(name, string.format("%s %s %s", axis_values[gui_axis1[name]], gui_distance1[name], n))
-			end
+			execute_worldedit_command(submit, name,
+				string.format("%s %s %s", axis_values[gui_axis1[name]],
+				gui_distance1[name], n))
 		end
 		return true
 	end
-	if fields.worldedit_gui_pyramid_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_pyramid_axis]
-		worldedit.show_page(name, "worldedit_gui_pyramid")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_spiral", {
@ -393,31 +477,41 @@ worldedit.register_gui_function("worldedit_gui_spiral", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,6]" .. worldedit.get_formspec_header("worldedit_gui_spiral") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_spiral_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_spiral_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_spiral_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_spiral_length;Side Length;%s]", minetest.formspec_escape(length)) ..
 			string.format("field[0.5,3.5;4,0.8;worldedit_gui_spiral_height;Height;%s]", minetest.formspec_escape(height)) ..
 			string.format("field[0.5,4.5;4,0.8;worldedit_gui_spiral_space;Wall Spacing;%s]", minetest.formspec_escape(space)) ..
+			"field_close_on_enter[worldedit_gui_spiral_length;false]" ..
+			"field_close_on_enter[worldedit_gui_spiral_height;false]" ..
+			"field_close_on_enter[worldedit_gui_spiral_space;false]" ..
 			"button_exit[0,5.5;3,0.8;worldedit_gui_spiral_submit;Spiral]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_spiral", function(name, fields)
-	if fields.worldedit_gui_spiral_search or fields.worldedit_gui_spiral_submit then
-		gui_nodename1[name] = fields.worldedit_gui_spiral_node
-		gui_distance1[name] = tostring(fields.worldedit_gui_spiral_length)
-		gui_distance2[name] = tostring(fields.worldedit_gui_spiral_height)
-		gui_distance3[name] = tostring(fields.worldedit_gui_spiral_space)
-		worldedit.show_page(name, "worldedit_gui_spiral")
+	local cg = {
+		worldedit_gui_spiral_search = true,
+		worldedit_gui_spiral_node = gui_nodename1,
+		worldedit_gui_spiral_length = gui_distance1,
+		worldedit_gui_spiral_height = gui_distance2,
+		worldedit_gui_spiral_space = gui_distance3,
+	}
+	local ret = handle_changes(name, "worldedit_gui_spiral", fields, cg)
 	if fields.worldedit_gui_spiral_submit then
+		copy_changes(name, fields, cg)
+		worldedit.show_page(name, "worldedit_gui_spiral")
+
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/spiral"].func(name, string.format("%s %s %s %s", gui_distance1[name], gui_distance2[name], gui_distance3[name], n))
-			end
+			execute_worldedit_command("spiral", name,
+				string.format("%s %s %s %s", gui_distance1[name],
+				gui_distance2[name], gui_distance3[name], n))
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_copy_move", {
@ -429,29 +523,31 @@ worldedit.register_gui_function("worldedit_gui_copy_move", {
 		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_copy_move") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_copy_move_amount;Amount;%s]", minetest.formspec_escape(amount)) ..
 			string.format("dropdown[4,1.18;2.5;worldedit_gui_copy_move_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..
+			"field_close_on_enter[worldedit_gui_copy_move_amount;false]" ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_copy_move_copy;Copy Region]" ..
 			"button_exit[3.5,2.5;3,0.8;worldedit_gui_copy_move_move;Move Region]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_copy_move", function(name, fields)
+	local cg = {
+		worldedit_gui_copy_move_amount = gui_distance1,
+		worldedit_gui_copy_move_axis = gui_axis1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_spiral", fields, cg)
 	if fields.worldedit_gui_copy_move_copy or fields.worldedit_gui_copy_move_move then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_copy_move_axis] or 4
-		gui_distance1[name] = tostring(fields.worldedit_gui_copy_move_amount)
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_copy_move")
-		if fields.worldedit_gui_copy_move_copy then
-			minetest.chatcommands["/copy"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], gui_distance1[name]))
-		else --fields.worldedit_gui_copy_move_move
-			minetest.chatcommands["/move"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], gui_distance1[name]))
+
+		local submit = "copy"
+		if fields.worldedit_gui_copy_move_move then
+			submit = "move"
 		end
+		execute_worldedit_command(submit, name,
+			axis_values[gui_axis1[name]] .. " " .. gui_distance1[name])
 		return true
 	end
-	if fields.worldedit_gui_copy_move_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_copy_move_axis] or 4
-		worldedit.show_page(name, "worldedit_gui_copy_move")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_stack", {
@ -462,24 +558,26 @@ worldedit.register_gui_function("worldedit_gui_stack", {
 		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_stack") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_stack_count;Count;%s]", minetest.formspec_escape(count)) ..
 			string.format("dropdown[4,1.18;2.5;worldedit_gui_stack_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..
+			"field_close_on_enter[worldedit_gui_stack_count;false]" ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_stack_submit;Stack]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_stack", function(name, fields)
+	local cg = {
+		worldedit_gui_stack_axis = gui_axis1,
+		worldedit_gui_stack_count = gui_count1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_stack", fields, cg)
 	if fields.worldedit_gui_stack_submit then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_stack_axis]
-		gui_count1[name] = tostring(fields.worldedit_gui_stack_count)
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_stack")
-		minetest.chatcommands["/stack"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], gui_count1[name]))
+
+		execute_worldedit_command("stack", name,
+			axis_values[gui_axis1[name]] .. " " .. gui_count1[name])
 		return true
 	end
-	if fields.worldedit_gui_stack_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_stack_axis]
-		worldedit.show_page(name, "worldedit_gui_stack")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_stretch", {
@ -491,20 +589,29 @@ worldedit.register_gui_function("worldedit_gui_stretch", {
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_stretch_x;Stretch X;%s]", minetest.formspec_escape(stretchx)) ..
 			string.format("field[0.5,2.5;4,0.8;worldedit_gui_stretch_y;Stretch Y;%s]", minetest.formspec_escape(stretchy)) ..
 			string.format("field[0.5,3.5;4,0.8;worldedit_gui_stretch_z;Stretch Z;%s]", minetest.formspec_escape(stretchz)) ..
+			"field_close_on_enter[worldedit_gui_stretch_x;false]" ..
+			"field_close_on_enter[worldedit_gui_stretch_y;false]" ..
+			"field_close_on_enter[worldedit_gui_stretch_z;false]" ..
 			"button_exit[0,4.5;3,0.8;worldedit_gui_stretch_submit;Stretch]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_stretch", function(name, fields)
+	local cg = {
+		worldedit_gui_stretch_x = gui_count1,
+		worldedit_gui_stretch_y = gui_count2,
+		worldedit_gui_stretch_z = gui_count3,
+	}
+	local ret = handle_changes(name, "worldedit_gui_stretch", fields, cg)
 	if fields.worldedit_gui_stretch_submit then
-		gui_count1[name] = tostring(fields.worldedit_gui_stretch_x)
-		gui_count2[name] = tostring(fields.worldedit_gui_stretch_y)
-		gui_count3[name] = tostring(fields.worldedit_gui_stretch_z)
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_stretch")
-		minetest.chatcommands["/stretch"].func(name, string.format("%s %s %s", gui_count1[name], gui_count2[name], gui_count3[name]))
+
+		execute_worldedit_command("stretch", name, string.format("%s %s %s",
+			gui_count1[name], gui_count2[name], gui_count3[name]))
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_transpose", {
@ -520,23 +627,19 @@ worldedit.register_gui_function("worldedit_gui_transpose", {
 })

 worldedit.register_gui_handler("worldedit_gui_transpose", function(name, fields)
+	local cg = {
+		worldedit_gui_transpose_axis1 = gui_axis1,
+		worldedit_gui_transpose_axis2 = gui_axis2,
+	}
+	local ret = handle_changes(name, "worldedit_gui_transpose", fields, cg)
 	if fields.worldedit_gui_transpose_submit then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_transpose_axis1]
-		worldedit.show_page(name, "worldedit_gui_transpose")
-		minetest.chatcommands["/transpose"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], axis_values[gui_axis2[name]]))
+		copy_changes(name, fields, cg)
+
+		execute_worldedit_command("transpose", name,
+			axis_values[gui_axis1[name]] .. " " .. axis_values[gui_axis2[name]])
 		return true
 	end
-	if fields.worldedit_gui_transpose_axis1 then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_transpose_axis1]
-		worldedit.show_page(name, "worldedit_gui_transpose")
-		return true
-	end
-	if fields.worldedit_gui_transpose_axis2 then
-		gui_axis2[name] = axis_indices[fields.worldedit_gui_transpose_axis2]
-		worldedit.show_page(name, "worldedit_gui_transpose")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_flip", {
@ -551,18 +654,18 @@ worldedit.register_gui_function("worldedit_gui_flip", {
 })

 worldedit.register_gui_handler("worldedit_gui_flip", function(name, fields)
+	local cg = {
+		worldedit_gui_flip_axis = gui_axis1
+	}
+	local ret = handle_changes(name, "worldedit_gui_flip", fields, cg)
 	if fields.worldedit_gui_flip_submit then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_flip_axis]
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_flip")
-		minetest.chatcommands["/flip"].func(name, axis_values[gui_axis1[name]])
+
+		execute_worldedit_command("flip", name, axis_values[gui_axis1[name]])
 		return true
 	end
-	if fields.worldedit_gui_flip_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_flip_axis]
-		worldedit.show_page(name, "worldedit_gui_flip")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_rotate", {
@ -578,24 +681,20 @@ worldedit.register_gui_function("worldedit_gui_rotate", {
 })

 worldedit.register_gui_handler("worldedit_gui_rotate", function(name, fields)
+	local cg = {
+		worldedit_gui_rotate_axis = gui_axis1,
+		worldedit_gui_rotate_angle = gui_angle,
+	}
+	local ret = handle_changes(name, "worldedit_gui_rotate", fields, cg)
 	if fields.worldedit_gui_rotate_submit then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_rotate_axis]
-		gui_angle[name] = angle_indices[fields.worldedit_gui_rotate_angle]
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_rotate")
-		minetest.chatcommands["/rotate"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], angle_values[gui_angle[name]]))
+
+		execute_worldedit_command("rotate", name,
+			axis_values[gui_axis1[name]] .. " " .. angle_values[gui_angle[name]])
 		return true
 	end
-	if fields.worldedit_gui_rotate_axis then
-		gui_axis1[name] = axis_indices[fields.worldedit_gui_rotate_axis]
-		worldedit.show_page(name, "worldedit_gui_rotate")
-		return true
-	end
-	if fields.worldedit_gui_rotate_angle then
-		gui_angle[name] = angle_indices[fields.worldedit_gui_rotate_angle]
-		worldedit.show_page(name, "worldedit_gui_rotate")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_orient", {
@ -610,25 +709,26 @@ worldedit.register_gui_function("worldedit_gui_orient", {
 })

 worldedit.register_gui_handler("worldedit_gui_orient", function(name, fields)
+	local cg = {
+		worldedit_gui_orient_angle = gui_angle,
+	}
+	local ret = handle_changes(name, "worldedit_gui_orient", fields, cg)
 	if fields.worldedit_gui_orient_submit then
-		gui_angle[name] = angle_indices[fields.worldedit_gui_orient_angle]
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_orient")
-		minetest.chatcommands["/orient"].func(name, tostring(angle_values[gui_angle[name]]))
+
+		execute_worldedit_command("orient", name,
+			tostring(angle_values[gui_angle[name]]))
 		return true
 	end
-	if fields.worldedit_gui_orient_angle then
-		gui_angle[name] = angle_indices[fields.worldedit_gui_orient_angle]
-		worldedit.show_page(name, "worldedit_gui_orient")
-		return true
-	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_fixlight", {
 	name = "Fix Lighting",
 	privs = we_privs("fixlight"),
 	on_select = function(name)
-		minetest.chatcommands["/fixlight"].func(name, "")
+		execute_worldedit_command("fixlight", name, "")
 	end,
 })

@ -636,7 +736,7 @@ worldedit.register_gui_function("worldedit_gui_hide", {
 	name = "Hide Region",
 	privs = we_privs("hide"),
 	on_select = function(name)
-		minetest.chatcommands["/hide"].func(name, "")
+		execute_worldedit_command("hide", name, "")
 	end,
 })

@ -648,6 +748,7 @@ worldedit.register_gui_function("worldedit_gui_suppress", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_suppress") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_suppress_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_suppress_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_suppress_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_suppress_submit;Suppress Nodes]"
@ -655,18 +756,22 @@ worldedit.register_gui_function("worldedit_gui_suppress", {
 })

 worldedit.register_gui_handler("worldedit_gui_suppress", function(name, fields)
-	if fields.worldedit_gui_suppress_search or fields.worldedit_gui_suppress_submit then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_suppress_node)
-		worldedit.show_page(name, "worldedit_gui_suppress")
+	local cg = {
+		worldedit_gui_suppress_search = true,
+		worldedit_gui_suppress_node = gui_nodename1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_suppress", fields, cg)
 	if fields.worldedit_gui_suppress_submit then
+		copy_changes(name, fields, cg)
+		worldedit.show_page(name, "worldedit_gui_suppress")
+
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/suppress"].func(name, n)
-			end
+			execute_worldedit_command("suppress", name, n)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_highlight", {
@ -677,6 +782,7 @@ worldedit.register_gui_function("worldedit_gui_highlight", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_highlight") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_highlight_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_highlight_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_highlight_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_highlight_submit;Highlight Nodes]"
@ -684,25 +790,29 @@ worldedit.register_gui_function("worldedit_gui_highlight", {
 })

 worldedit.register_gui_handler("worldedit_gui_highlight", function(name, fields)
-	if fields.worldedit_gui_highlight_search or fields.worldedit_gui_highlight_submit then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_highlight_node)
-		worldedit.show_page(name, "worldedit_gui_highlight")
+	local cg = {
+		worldedit_gui_highlight_search = true,
+		worldedit_gui_highlight_node = gui_nodename1,
+	}
+	local ret = handle_changes(name, "worldedit_gui_highlight", fields, cg)
 	if fields.worldedit_gui_highlight_submit then
+		copy_changes(name, fields, cg)
+		worldedit.show_page(name, "worldedit_gui_highlight")
+
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-				minetest.chatcommands["/highlight"].func(name, n)
-			end
+			execute_worldedit_command("highlight", name, n)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_restore", {
 	name = "Restore Region",
 	privs = we_privs("restore"),
 	on_select = function(name)
-		minetest.chatcommands["/restore"].func(name, "")
+		execute_worldedit_command("restore", name, "")
 	end,
 })

@ -713,6 +823,7 @@ worldedit.register_gui_function("worldedit_gui_save_load", {
 		local filename = gui_filename[name]
 		return "size[6,4]" .. worldedit.get_formspec_header("worldedit_gui_save_load") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_save_filename;Filename;%s]", minetest.formspec_escape(filename)) ..
+			"field_close_on_enter[worldedit_gui_save_filename;false]" ..
 			"button_exit[0,2.5;3,0.8;worldedit_gui_save_load_submit_save;Save]" ..
 			"button_exit[3,2.5;3,0.8;worldedit_gui_save_load_submit_allocate;Allocate]" ..
 			"button_exit[0,3.5;3,0.8;worldedit_gui_save_load_submit_load;Load]"
@ -723,12 +834,13 @@ worldedit.register_gui_handler("worldedit_gui_save_load", function(name, fields)
 	if fields.worldedit_gui_save_load_submit_save or fields.worldedit_gui_save_load_submit_allocate or fields.worldedit_gui_save_load_submit_load then
 		gui_filename[name] = tostring(fields.worldedit_gui_save_filename)
 		worldedit.show_page(name, "worldedit_gui_save_load")
+
 		if fields.worldedit_gui_save_load_submit_save then
-			minetest.chatcommands["/save"].func(name, gui_filename[name])
+			execute_worldedit_command("save", name, gui_filename[name])
 		elseif fields.worldedit_gui_save_load_submit_allocate then
-			minetest.chatcommands["/allocate"].func(name, gui_filename[name])
+			execute_worldedit_command("allocate", name, gui_filename[name])
 		else --fields.worldedit_gui_save_load_submit_load
-			minetest.chatcommands["/load"].func(name, gui_filename[name])
+			execute_worldedit_command("load", name, gui_filename[name])
 		end
 		return true
 	end
@ -736,7 +848,7 @@ worldedit.register_gui_handler("worldedit_gui_save_load", function(name, fields)
 end)

 worldedit.register_gui_function("worldedit_gui_cube", {
-	name = "Cuboid", -- technically the command is misnamed, I know...
+	name = "Cube",
 	privs = combine_we_privs({"hollowcube", "cube"}),
 	get_formspec = function(name)
 		local width, height, length = gui_distance1[name], gui_distance2[name], gui_distance3[name]
@ -744,47 +856,51 @@ worldedit.register_gui_function("worldedit_gui_cube", {
 		local nodename = worldedit.normalize_nodename(node)
 		return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_cube") ..
 			string.format("field[0.5,1.5;4,0.8;worldedit_gui_cube_node;Name;%s]", minetest.formspec_escape(node)) ..
+			"field_close_on_enter[worldedit_gui_cube_node;false]" ..
 			"button[4,1.18;1.5,0.8;worldedit_gui_cube_search;Search]" ..
 			formspec_node("5.5,1.1", nodename) ..
 			string.format("field[0.5,2.5;1,0.8;worldedit_gui_cube_width;Width;%s]", minetest.formspec_escape(width)) ..
 			string.format("field[1.5,2.5;1,0.8;worldedit_gui_cube_height;Height;%s]", minetest.formspec_escape(height)) ..
 			string.format("field[2.5,2.5;1,0.8;worldedit_gui_cube_length;Length;%s]", minetest.formspec_escape(length)) ..
+			"field_close_on_enter[worldedit_gui_cube_width;false]" ..
+			"field_close_on_enter[worldedit_gui_cube_height;false]" ..
+			"field_close_on_enter[worldedit_gui_cube_length;false]" ..
 			"button_exit[0,3.5;3,0.8;worldedit_gui_cube_submit_hollow;Hollow Cuboid]" ..
 			"button_exit[3.5,3.5;3,0.8;worldedit_gui_cube_submit_solid;Solid Cuboid]"
 	end,
 })

 worldedit.register_gui_handler("worldedit_gui_cube", function(name, fields)
-	if fields.worldedit_gui_cube_search
-	or fields.worldedit_gui_cube_submit_hollow or fields.worldedit_gui_cube_submit_solid then
-		gui_nodename1[name] = tostring(fields.worldedit_gui_cube_node)
-		gui_distance1[name] = tostring(fields.worldedit_gui_cube_width)
-		gui_distance2[name] = tostring(fields.worldedit_gui_cube_height)
-		gui_distance3[name] = tostring(fields.worldedit_gui_cube_length)
+	local cg = {
+		worldedit_gui_cube_search = true,
+		worldedit_gui_cube_node = gui_nodename1,
+		worldedit_gui_cube_width = gui_distance1,
+		worldedit_gui_cube_height = gui_distance2,
+		worldedit_gui_cube_length = gui_distance3,
+	}
+	local ret = handle_changes(name, "worldedit_gui_cube", fields, cg)
+	if fields.worldedit_gui_cube_submit_hollow or fields.worldedit_gui_cube_submit_solid then
+		copy_changes(name, fields, cg)
 		worldedit.show_page(name, "worldedit_gui_cube")

-		local submit = nil
-		if fields.worldedit_gui_cube_submit_hollow then
-			submit = "hollowcube"
-		elseif fields.worldedit_gui_cube_submit_solid then
+		local submit = "hollowcube"
+		if fields.worldedit_gui_cube_submit_solid then
 			submit = "cube"
 		end
-		if submit then
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
 			local args = string.format("%s %s %s %s", gui_distance1[name], gui_distance2[name], gui_distance3[name], n)
-				minetest.chatcommands["/"..submit].func(name, args)
-			end
+			execute_worldedit_command(submit, name, args)
 		end
 		return true
 	end
-	return false
+	return ret
 end)

 worldedit.register_gui_function("worldedit_gui_clearobjects", {
 	name = "Clear Objects",
 	privs = we_privs("clearobjects"),
 	on_select = function(name)
-		minetest.chatcommands["/clearobjects"].func(name, "")
+		execute_worldedit_command("clearobjects", name, "")
 	end,
 })
--- a/worldedit_gui/init.lua
+++ b/worldedit_gui/init.lua
@ -70,7 +70,7 @@ local get_formspec = function(name, identifier)
 end

 --implement worldedit.show_page(name, page) in different ways depending on the available APIs
-if rawget(_G, "unified_inventory") then --unified inventory installed
+if minetest.global_exists("unified_inventory") then -- unified inventory installed
 	local old_func = worldedit.register_gui_function
 	worldedit.register_gui_function = function(identifier, options)
 		old_func(identifier, options)
@ -80,6 +80,9 @@ if rawget(_G, "unified_inventory") then --unified inventory installed
 	unified_inventory.register_button("worldedit_gui", {
 		type = "image",
 		image = "inventory_plus_worldedit_gui.png",
+		condition = function(player)
+			return minetest.check_player_privs(player:get_player_name(), {worldedit=true})
+		end,
 	})

 	minetest.register_on_player_receive_fields(function(player, formname, fields)
@ -103,7 +106,7 @@ if rawget(_G, "unified_inventory") then --unified inventory installed
 			player:set_inventory_formspec(get_formspec(name, page))
 		end
 	end
-elseif rawget(_G, "inventory_plus") then --inventory++ installed
+elseif minetest.global_exists("inventory_plus") then -- inventory++ installed
 	minetest.register_on_joinplayer(function(player)
 		local can_worldedit = minetest.check_player_privs(player:get_player_name(), {worldedit=true})
 		if can_worldedit then
@ -134,7 +137,7 @@ elseif rawget(_G, "inventory_plus") then --inventory++ installed
 			inventory_plus.set_inventory_formspec(player, get_formspec(name, page))
 		end
 	end
-elseif rawget(_G, "smart_inventory") then -- smart_inventory installed
+elseif minetest.global_exists("smart_inventory") then -- smart_inventory installed
 	-- redefinition: Update the code element on inventory page to show the we-page
 	function worldedit.show_page(name, page)
 		local state = smart_inventory.get_page_state("worldedit_gui", name)
@ -183,7 +186,7 @@ elseif rawget(_G, "smart_inventory") then -- smart_inventory installed
 		smartfs_callback = smart_worldedit_gui_callback,
 		sequence = 99
 	})
-elseif rawget(_G, "sfinv") then --sfinv installed (part of minetest_game since 0.4.15)
+elseif minetest.global_exists("sfinv") then -- sfinv installed
 	assert(sfinv.enabled)
 	local orig_get = sfinv.pages["sfinv:crafting"].get
 	sfinv.override_page("sfinv:crafting", {
@ -194,21 +197,13 @@ elseif rawget(_G, "sfinv") then --sfinv installed (part of minetest_game since 0
 		end
 	})

-	--compatibility with pre-0.4.16 sfinv
-	local set_page = sfinv.set_page or function(player, name)
-		--assumptions: src pg has no leave callback, dst pg has no enter callback
-		local ctx = {page=name}
-		sfinv.contexts[player:get_player_name()] = ctx
-		sfinv.set_player_inventory_formspec(player, ctx)
-	end
-
 	--show the form when the button is pressed and hide it when done
 	minetest.register_on_player_receive_fields(function(player, formname, fields)
 		if fields.worldedit_gui then --main page
 			worldedit.show_page(player:get_player_name(), "worldedit_gui")
 			return true
 		elseif fields.worldedit_gui_exit then --return to original page
-			set_page(player, "sfinv:crafting")
+			sfinv.set_page(player, "sfinv:crafting")
 			return true
 		end
 		return false
@ -222,11 +217,11 @@ elseif rawget(_G, "sfinv") then --sfinv installed (part of minetest_game since 0
 	end
 else
 	error(
-		"worldedit_gui requires a supported \"gui management\" mod to be installed\n"..
-		"To use the GUI you need to either\n"..
-		"* Use minetest_game (at least 0.4.15) or a subgame with compatible sfinv\n"..
-		"* Install Unified Inventory or Inventory++\n"..
-		"If you do not want to use worldedit_gui, disable it by editing world.mt or from the Main Menu"
+		"worldedit_gui requires a supported gui management mod to be installed.\n"..
+		"To use the it you need to either:\n"..
+		"* use minetest_game or another sfinv-compatible subgame\n"..
+		"* install Unified Inventory, Inventory++ or Smart Inventory\n"..
+		"If you don't want to use worldedit_gui, disable it by editing world.mt or from the main menu."
 	)
 end

--- a/worldedit_gui/mod.conf
+++ b/worldedit_gui/mod.conf
@ -0,0 +1,4 @@
+name = worldedit_gui
+description = WorldEdit GUI
+depends = worldedit, worldedit_commands
+optional_depends = unified_inventory, inventory_plus, sfinv, creative, smart_inventory
--- a/worldedit_shortcommands/depends.txt
+++ b/worldedit_shortcommands/depends.txt
@ -1 +0,0 @@
-worldedit_commands
--- a/worldedit_shortcommands/init.lua
+++ b/worldedit_shortcommands/init.lua
@ -1,52 +1,52 @@
 --provides shorter names for the commands in `worldedit_commands`

--returns true if command could not be aliased, false otherwise
-worldedit.alias_chatcommand = function(alias, original_command)
-	if not minetest.chatcommands[original_command] then
-		minetest.log("error", "worldedit_shortcommands: original command " .. original_command .. " does not exist")
-		return true
+worldedit.alias_command = function(alias, original)
+	if not worldedit.registered_commands[original] then
+		minetest.log("error", "worldedit_shortcommands: original " .. original .. " does not exist")
+		return
 	end
-	if minetest.chatcommands[alias] then
+	if minetest.chatcommands["/" .. alias] then
 		minetest.log("error", "worldedit_shortcommands: alias " .. alias .. " already exists")
-		return true
+		return
 	end
-	minetest.register_chatcommand(alias, minetest.chatcommands[original_command])
-	return false
+
+	minetest.register_chatcommand("/" .. alias, minetest.chatcommands["/" .. original])
+	worldedit.registered_commands[alias] = worldedit.registered_commands[original]
 end

-worldedit.alias_chatcommand("/i", "/inspect")
-worldedit.alias_chatcommand("/rst", "/reset")
-worldedit.alias_chatcommand("/mk", "/mark")
-worldedit.alias_chatcommand("/umk", "/unmark")
-worldedit.alias_chatcommand("/1", "/pos1")
-worldedit.alias_chatcommand("/2", "/pos2")
-worldedit.alias_chatcommand("/fp", "/fixedpos")
-worldedit.alias_chatcommand("/v", "/volume")
-worldedit.alias_chatcommand("/s", "/set")
-worldedit.alias_chatcommand("/r", "/replace")
-worldedit.alias_chatcommand("/ri", "/replaceinverse")
-worldedit.alias_chatcommand("/hcube", "/hollowcube")
-worldedit.alias_chatcommand("/hspr", "/hollowsphere")
-worldedit.alias_chatcommand("/spr", "/sphere")
-worldedit.alias_chatcommand("/hdo", "/hollowdome")
-worldedit.alias_chatcommand("/do", "/dome")
-worldedit.alias_chatcommand("/hcyl", "/hollowcylinder")
-worldedit.alias_chatcommand("/cyl", "/cylinder")
-worldedit.alias_chatcommand("/hpyr", "/hollowpyramid")
-worldedit.alias_chatcommand("/pyr", "/pyramid")
-worldedit.alias_chatcommand("/spl", "/spiral")
-worldedit.alias_chatcommand("/m", "/move")
-worldedit.alias_chatcommand("/c", "/copy")
-worldedit.alias_chatcommand("/stk", "/stack")
-worldedit.alias_chatcommand("/sch", "/stretch")
-worldedit.alias_chatcommand("/tps", "/transpose")
-worldedit.alias_chatcommand("/fl", "/flip")
-worldedit.alias_chatcommand("/rot", "/rotate")
-worldedit.alias_chatcommand("/ort", "/orient")
-worldedit.alias_chatcommand("/hi", "/hide")
-worldedit.alias_chatcommand("/sup", "/suppress")
-worldedit.alias_chatcommand("/hlt", "/highlight")
-worldedit.alias_chatcommand("/rsr", "/restore")
-worldedit.alias_chatcommand("/l", "/lua")
-worldedit.alias_chatcommand("/lt", "/luatransform")
-worldedit.alias_chatcommand("/clro", "/clearobjects")
+worldedit.alias_command("i", "inspect")
+worldedit.alias_command("rst", "reset")
+worldedit.alias_command("mk", "mark")
+worldedit.alias_command("umk", "unmark")
+worldedit.alias_command("1", "pos1")
+worldedit.alias_command("2", "pos2")
+worldedit.alias_command("fp", "fixedpos")
+worldedit.alias_command("v", "volume")
+worldedit.alias_command("s", "set")
+worldedit.alias_command("r", "replace")
+worldedit.alias_command("ri", "replaceinverse")
+worldedit.alias_command("hcube", "hollowcube")
+worldedit.alias_command("hspr", "hollowsphere")
+worldedit.alias_command("spr", "sphere")
+worldedit.alias_command("hdo", "hollowdome")
+worldedit.alias_command("do", "dome")
+worldedit.alias_command("hcyl", "hollowcylinder")
+worldedit.alias_command("cyl", "cylinder")
+worldedit.alias_command("hpyr", "hollowpyramid")
+worldedit.alias_command("pyr", "pyramid")
+worldedit.alias_command("spl", "spiral")
+worldedit.alias_command("m", "move")
+worldedit.alias_command("c", "copy")
+worldedit.alias_command("stk", "stack")
+worldedit.alias_command("sch", "stretch")
+worldedit.alias_command("tps", "transpose")
+worldedit.alias_command("fl", "flip")
+worldedit.alias_command("rot", "rotate")
+worldedit.alias_command("ort", "orient")
+worldedit.alias_command("hi", "hide")
+worldedit.alias_command("sup", "suppress")
+worldedit.alias_command("hlt", "highlight")
+worldedit.alias_command("rsr", "restore")
+worldedit.alias_command("l", "lua")
+worldedit.alias_command("lt", "luatransform")
+worldedit.alias_command("clro", "clearobjects")
--- a/worldedit_shortcommands/mod.conf
+++ b/worldedit_shortcommands/mod.conf
@ -0,0 +1,3 @@
+name = worldedit_shortcommands
+description = WorldEdit command short aliases
+depends = worldedit_commands
Author	SHA1	Message	Date
h3ndrik	f1b6da3c20	Hide gui button in unified_inventory on missing privilege (#195 ) this fixes #151	2020-12-05 14:12:32 +01:00
sfan5	418a30c89e	Raise safe region limit to 20000	2020-10-06 13:53:22 +02:00
sfan5	2f535dd053	worldedit: Document inner working of worldedit.keep_loaded	2020-05-25 19:48:54 +02:00
sfan5	867cd6edc7	Improve node name normalization again so that "desert stone" won't select "desert stone block"	2020-05-12 21:53:01 +02:00
sfan5	4918610c43	Fix rotate in worldedit GUI	2020-05-12 21:29:51 +02:00
sfan5	edd27636a6	Do not allow //mix with no nodes	2020-05-09 22:34:29 +02:00
sfan5	7d0811fd47	Update help texts to be consistent	2020-04-26 16:53:55 +02:00
sfan5	4d08a1cc55	Implement //cubeapply with three side lengths	2020-04-26 16:01:07 +02:00
sfan5	34844b2d38	Set static_save = false for marker entities	2020-04-16 23:50:15 +02:00
sfan5	0f5dcc790d	Implement //clearcut to delete trees, plants from generated terrain closes #165	2020-04-07 03:05:30 +02:00
sfan5	37de177f72	Fix off-by-one in //cubeapply	2020-04-07 00:46:13 +02:00
sfan5	f285a55dd5	Improve brush command error messages	2020-04-07 00:38:11 +02:00
sfan5	9b26034aea	Move worldedit.marker_update Markers are part of the UI (`worldedit_chatcommands`) and do not belong in `worldedit`.	2020-04-07 00:14:31 +02:00
sfan5	963a9f6b96	Implement //cubeapply	2020-04-06 23:32:11 +02:00
sfan5	5e8bfd5166	Improve node name normalization in case of multi-line descriptions	2020-03-29 21:55:47 +02:00
HybridDog	06a3b63578	GUI command execution: Do not ignore chatcommand return values Additionally, this commit makes the command execution more modular, so it is e.g. possible to implement something to disable the many nodes confirmation after setting a checkbox in the formspec.	2020-03-09 15:33:19 +01:00
sfan5	5e47af8773	Make region marker entities withstand TNT explosions Also fixes a crash when detonating TNT near them though this is not our fault and the proper fix is pending in minetest_game.	2020-03-06 21:20:15 +01:00
sfan5	da51c688d2	Call minetest.deserialize with safe=true wtf?	2020-02-06 11:53:14 +01:00
sfan5	ab93871877	Move some deserialization code around	2020-02-06 11:51:44 +01:00
sfan5	116ae25ebd	Unbreak //move (closes #188 )	2019-12-20 20:29:41 +01:00
sfan5	18444379a1	worldedit_gui: Improve behaviour of all input fields continuation of `45acf09e4a`	2019-12-19 18:20:24 +01:00
sfan5	974dcaa918	Improve nodename normalization in some cases	2019-12-19 16:58:33 +01:00
sfan5	abdecd4239	Fix some broken commands This happens when you don't test.	2019-12-19 16:45:38 +01:00
sfan5	9c38b9f6ad	Allow more commands for brush usage In fact, allow all commands that are compatible by the brush: the ones that expect exactly pos1 to be set	2019-12-19 16:44:15 +01:00
sfan5	7833b68c85	worldedit_brush: Remove "safe region" hack	2019-12-19 15:58:26 +01:00
sfan5	03bef18272	Update worldedit_shortcommands for new changes	2019-12-19 15:16:20 +01:00
sfan5	91d02f6f5b	Rewrite command registration	2019-12-19 15:13:55 +01:00
sfan5	8feaf8a21d	Fix area clearing step of negative //move's fixes #187	2019-11-13 20:49:25 +01:00
sfan5	5bab991e0b	Make object right-click work with wand	2019-11-10 00:40:31 +01:00
ANAND	9bb0ad0442	Fix double-definition of visual_size in entity def	2019-10-14 12:46:58 +02:00
sfan5	63a7069671	Allow easily setting pos1 + 2 to the same node using the wand Though right-click currently doesn't work due to an engine bug.	2019-09-19 00:06:30 +02:00
sfan5	79097dc6c8	Reset region by double-punching air using the wand	2019-09-18 23:56:21 +02:00
sfan5	3bc7a0f97d	worldedit_gui: Add tooltips to node search result	2019-09-18 18:55:55 +02:00
sfan5	45acf09e4a	worldedit_gui: Improve behaviour of some input fields Can't be bothered to do the rest. This stuff should be rewritten in a modular fashion anyway.	2019-09-18 18:52:27 +02:00
sfan5	adab528f8a	Fix nodename normalization with translated descriptions	2019-09-18 18:48:31 +02:00
sfan5	26b6682587	Update API docs	2019-09-17 18:44:13 +02:00
sfan5	b4826aa821	Use faster vmanip copying for //move too	2019-09-17 18:42:11 +02:00
sfan5	a0181ea897	Delete old metadata when moving regions This matches the behaviour before introduction of the vmanip code.	2019-09-17 18:03:19 +02:00
sfan5	2a4aaae8a2	Always use faster vmanip copying code Since the code has two arrays of the area before and after, the copy order is totally irrelevant. Of course, this doesn't apply to metadata and we still need to do that backwards.	2019-09-17 01:28:53 +02:00
sfan5	f6298d7b87	Fix schematics with extra headers to parse properly Currently no schematic format makes use of these, but that may change so do some future proofing.	2019-09-09 20:52:15 +02:00
sfan5	68f7bcc728	Warn when "misaligned" schematics are created The underlying issue is the size detection worldedit.allocate does and can't be fixed or worked around in a simple way.	2019-09-09 01:07:17 +02:00
sfan5	0919f7cab3	Clean up command code for //stack, //stack2	2019-09-08 22:14:07 +02:00
sfan5	de566d2e3e	Update API docs	2019-09-08 22:14:07 +02:00
sfan5	cc897150f2	Fix performance of //stack, //stack2	2019-09-08 22:14:07 +02:00
sfan5	f39a8e264d	Faster moving using vmanips (in some cases)	2019-09-08 22:14:07 +02:00
sfan5	da5abec273	Faster copying using vmanips	2019-09-08 22:14:07 +02:00
sfan5	ff53a71d58	Remove outdated function check	2019-09-08 18:57:54 +02:00
sfan5	0edcd1a59d	Fix crash on loading invalid schematic (fixes #160 )	2019-09-06 17:56:11 +02:00
sfan5	a1b6a34e61	Use eye_height property for brush raytracing	2019-09-06 17:45:51 +02:00
sfan5	f589c988b1	Handle invalid //rotate usage gracefully, fixes #150	2019-07-17 02:35:57 +02:00
sfan5	f28d9b8d35	Update README	2019-07-17 02:23:39 +02:00
sfan5	b8453a0e0b	Remove deprecated depends.txt, add descriptions to mod.conf	2019-07-17 02:15:04 +02:00
sfan5	0a16f11d93	Replace more deprecated functions	2019-07-17 02:06:29 +02:00
sfan5	b50294d10c	Adjust GUI compatibility code	2019-07-17 01:44:15 +02:00
sfan5	324eb556f6	Make compatibility error in worldedit_brush fatal again This reverts commit `a97cccd2a1`.	2019-07-17 01:42:28 +02:00
Panquesito7	3ffecdd9c4	Replace deprecated functions with newer ones These commits create compatibility with MT/MTG 5.0.0+. However, these commits may/will break with the 0.4-series.	2019-07-17 01:23:40 +02:00