fix

This reverts commit 68f7bcc728.

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,18 +83,19 @@ 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 0 0 0
     //fixedpos set1 -30 5 28
     //fixedpos set2 1004 -200 432
 
@@ -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 minetest.swap_node(pos, {name="default:stone"})
-    //luatransform if minetest.get_node(pos).name == "air" then minetest.add_node(pos, {name="default:water_source"})
+    //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 
+Shifts the selection area by `[+|-]<amount>` without moving its contents.
-relative (`up/down/left/right/front/back`). 
+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
+Expands the selection by `<amount>` in the selected absolute or relative axis.
-opposite direction over the same axis by `[reverse-amount]`.
+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
+Contracts the selection by `<amount>` in the selected absolute or relative axis.
-opposite direction over the same axis by `[reverse-amount]`.
+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]`
+Expands the selection in all directions by `<amount>`. If specified,
-or vertically in the y axis `[v]`.
+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]`
+Contracts the selection in all directions by `<amount>`. If specified,
-or vertically in the y axis `[v]`.
+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

README.md

@@ -1,4 +1,4 @@
-WorldEdit v1.2
+WorldEdit v1.3
 ==============
 The ultimate in-game world editing tool for [Minetest](http://minetest.net/)! Tons of functionality to help with building, fixing, and more.
 
@@ -11,37 +11,40 @@ For more information, see the [forum topic](https://forum.minetest.net/viewtopic
 Installing
 ----------
 
-If you are using Windows, consider installing this mod using [MODSTER](https://forum.minetest.net/viewtopic.php?id=6497), a super simple mod installer that will take care of everything for you. If you are using MODSTER, skip directly to step 6 in the instructions below.
-
 There is a nice installation guide over at the [Minetest Wiki](http://wiki.minetest.com/wiki/Installing_mods). Here is a short summary:
 
-1. Download the mod from the [official releases page](https://github.com/Uberi/Minetest-WorldEdit/releases). The download links are labelled "Source Code". If you are using Windows, you will probably want to download the ZIP version.
+1. Download the mod from the [official releases page](https://github.com/Uberi/Minetest-WorldEdit/releases). The download links are labelled "Source Code". If you are using Windows, you'll want to download the ZIP version.
-2. You should have a file named `SOMETHING.zip` or `SOMETHING.tar.gz`.
+2. You should have a file named `Minetest-WorldEdit-x.x.zip`.
 3. Extract this file using your archiver of choice. If you are using Windows, open the ZIP file and move the folder inside to a safe place outside of the ZIP file.
-4. Make sure that you now have a folder with a file named README.md inside it. If you just have another folder inside this folder, use this nested folder instead.
+4. Make sure that you now have a folder with a file named README.md inside it. If you just have another folder inside this folder, use the nested folder instead.
 5. Move this folder into the `MINETEST_FOLDER/mods` folder, where `MINETEST_FOLDER` is the folder Minetest is located in.
 6. Open Minetest to a world selection screen.
-7. Select a world you want to use WorldEdit in by left clicking on it once, and press the **Configure** button.
+7. Select a world you want to use WorldEdit in by left clicking on it once and press the **Configure** button.
-8. You should have a mod selection screen. Select the one named something like `Minetest-WorldEdit` by left clicking once and press the **Enable MP** button.
+8. You should have a mod selection screen. Select the one named something like `Minetest-WorldEdit` by left clicking once and press the **Enable Modpack** button.
 9. Press the **Save** button. You can now use WorldEdit in that world. Repeat steps 7 to 9 to enable WorldEdit for other worlds too.
 
-If you are having trouble, try asking for help in the [IRC channel](http://webchat.freenode.net/?channels=#minetest) (faster but may not always have helpers online) or ask on the [forum topic](https://forum.minetest.net/viewtopic.php?id=572) (slower but more likely to get help).
+If you are having trouble, try asking for help in the [IRC channel](https://webchat.freenode.net/?channels=#minetest) (faster but may not always have helpers online)
+or ask on the [forum topic](https://forum.minetest.net/viewtopic.php?id=572) (slower but more likely to get help).
 
 Usage
 -----
-WorldEdit works primarily through the WorldEdit GUI and chat commands. Depending on your key bindings, you can invoke chat entry with the "t" key, and open the chat console with the "F10" key.
+WorldEdit works primarily through the WorldEdit GUI and chat commands. Depending on your key bindings, you can invoke chat entry with the "T" key and open the chat console with the "F10" key.
 
-WorldEdit has a huge potential for abuse by untrusted players. Therefore, users will not be able to use WorldEdit unless they have the `worldedit` privelege. This is available by default in single player, but in multiplayer the permission must be explicitly given by someone with the right credentials, using the follwoing chat command: `/grant <player name> worldedit`. This privelege can later be removed using the following chat command: `/revoke <player name> worldedit`.
+WorldEdit has a huge potential for abuse by untrusted players. Therefore, users will not be able to use WorldEdit unless they have the `worldedit` privilege.
+This is available by default in singleplayer, but in multiplayer the permission must be explicitly given by someone with the right credentials,
+using the following chat command: `/grant <player name> worldedit`. This privilege can later be removed using the following chat command: `/revoke <player name> worldedit`.
 
-Certain functions/commands such as WorldEdit `//lua` and `//luatransform` chat commands additionally require the `server` privilege. This is because it is extremely dangerous to give access to these commands to untrusted players, since they essentially are able to control the computer the server is running on. Give this privilege only to people you trust with your computer.
+Certain functions/commands such as WorldEdit `//lua` and `//luatransform` chat commands additionally require the `server` privilege.
+This is because it is extremely dangerous to give access to these commands to untrusted players, since they essentially are able to control the computer the server is running on.
+Give this privilege only to people you trust with your computer.
 
-For in-game information about these commands, type `/help <command name>` in the chat. For example, to learn more about the `//copy` command, simply type `/help /copy` to display information relevant to copying a region.
+For in-game information about these commands, type `//help <command name>` in the chat. For example, to learn more about the `//copy` command, simply type `//help copy` to display information relevant to copying a region.
 
 Interface
 ---------
 WorldEdit is accessed in-game in two main ways.
 
-The GUI adds a screen to each player's inventory that gives access to various WorldEdit functions. The [tutorial](Tutorial.md) and the [Chat Commands Reference](ChatCommands.md) may be helpful in learning to use it.
+The GUI adds a screen to each player's inventory that gives access to various WorldEdit functions. The [tutorial](Tutorial.md) may be helpful in learning to use it.
 
 The chat interface adds many chat commands that perform various WorldEdit powered tasks. It is documented in the [Chat Commands Reference](ChatCommands.md).
 
@@ -49,9 +52,11 @@ Compatibility
 -------------
 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 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), [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).
+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),
+[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,7 +64,7 @@ WorldEdit API
 -------------
 WorldEdit exposes all significant functionality in a simple Lua interface.
 
-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.
+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 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.
 
@@ -79,13 +84,16 @@ Nodes
 -----
 Node names are required for many types of commands that identify or modify specific types of nodes. They can be specified in a number of ways.
 
-First, by description - the tooltip that appears when hovering over the item in an inventory. This is case insensitive and includes values such as "Cobblestone" and "bronze block". Note that certain commands (namely, `//replace` and `//replaceinverse`) do not support descriptions that contain spaces in the `<searchnode>` field.
+First, by description - the tooltip that appears when hovering over the item in an inventory. This is case insensitive and includes values such as "Cobblestone" and "bronze block".
+Note that certain commands (namely, `//replace` and `//replaceinverse`) do not support descriptions that contain spaces in the `<searchnode>` field.
 
-Second, by name - the node name that is defined by code, but without the mod name prefix. This is case sensitive and includes values such as "piston_normal_off" and "cactus". Nodes defined in the `default` mod always take precedence over other nodes when searching for the correct one, and if there are multiple possible nodes (such as "a:celery" and "b:celery"), one is chosen in no particular order.
+Second, by name - the node name that is defined by code, but without the mod name prefix. This is case sensitive and includes values such as "piston_normal_off" and "cactus".
+If there are multiple possible nodes (such as "a:celery" and "b:celery"), one is chosen in no particular order.
 
 Finally, by full name - the unambiguous identifier of the node, prefixes and all. This is case sensitive and includes values such as "default:stone" and "mesecons:wire_00000000_off".
 
-The node name "air" can be used anywhere a normal node name can, and acts as a blank node. This is useful for clearing or removing nodes. For example, `//set air` would remove all the nodes in the current WorldEdit region. Similarly, `//sphere 10 air`, when WorldEdit position 1 underground, would dig a large sphere out of the ground.
+The node name "air" can be used anywhere a normal node name can and acts as a blank node. This is useful for clearing or removing nodes.
+For example, `//set air` would remove all the nodes in the current WorldEdit region. Similarly, `//sphere 10 air`, when WorldEdit position 1 underground, would dig a large sphere out of the ground.
 
 Regions
 -------
@@ -93,11 +101,11 @@ Most WorldEdit commands operate on regions. Regions are a set of two positions t
 
 Each positions together define two opposing corners of the cube. With two opposing corners it is possible to determine both the location and dimensions of the region.
 
-Regions are not saved between server restarts. They start off as empty regions, and cannot be used with most WorldEdit commands until they are set to valid values.
+Regions are not saved between server restarts. They start off as empty regions and cannot be used with most WorldEdit commands until they are set to valid values.
 
 Markers
 -------
-Entities are used to mark the location of the WorldEdit regions. They appear as boxes containing the number 1 or 2, and represent position 1 and 2 of the WorldEdit region, respectively.
+Entities are used to mark the location of the WorldEdit regions. They appear as boxes containing the number 1 or 2 and represent the first and second position of the WorldEdit region, respectively.
 
 To remove the entities, simply punch them. This does not reset the positions themselves.
 
@@ -105,9 +113,11 @@ Schematics
 ----------
 WorldEdit supports two different types of schematics.
 
-The first is the WorldEdit Schematic format, with the file extension ".we", and in some older versions, ".wem". There have been several previous versions of the WorldEdit Schematic format, but WorldEdit is capable of loading any past versions, and will always support them - there is no need to worry about schematics becoming obselete.
+The first is the WorldEdit Schematic format, with the file extension ".we", and in some older versions, ".wem".
+There have been several previous versions of the WorldEdit Schematic format, but WorldEdit is capable of loading any past versions, and will always support them - there is no need to worry about schematics becoming obsolete.
 
-As of version 5, WorldEdit schematics include a header.  The header is seperated from the content by a colon (`:`).  It contains fields seperated by commas (`,`).  Currently only one field is used, which contains the version in ASCII decimal.
+As of version 5, WorldEdit schematics include a header. The header is seperated from the content by a colon (`:`). It may contain fields seperated by commas (`,`).
+Currently only one field is used, which contains the version as an ASCII decimal.
 
 The current version of the WorldEdit Schematic format is essentially an array of node data tables in Lua 5.1 table syntax preceded by a header.
 Specifically it looks like this:
@@ -130,13 +140,15 @@ The ordering of the values and minor aspects of the syntax, such as trailing com
 
 The WorldEdit Schematic format is accessed via the WorldEdit API, or WorldEdit serialization chat commands such as `//serialize` and `//deserialize`.
 
-The second is the Minetest Schematic format (MTS). The details of this format may be found in the Minetest documentation and are out of the scope of this document. Access to this format is done via specialized MTS commands such as `//mtschemcreate` and `//mtschemplace`.
+The second is the Minetest Schematic format (MTS). The details of this format may be found in the Minetest documentation and are out of the scope of this document.
+Access to this format is done via specialized MTS commands such as `//mtschemcreate` and `//mtschemplace`.
 
 Authors
 -------
 WorldEdit would not be possible without the contributions of many developers and designers. Below, they are listed alphabetically:
 
     Alexander Weber
+    ANAND
     beyondlimits
     Carter Kolwey
     cornernote
@@ -145,6 +157,7 @@ WorldEdit would not be possible without the contributions of many developers and
     electricface
     est31
     Eugen Wesseloh
+    h3ndrik
     HybridDog
     Isidor Zeuner
     Jean-Patrick Guerrero
@@ -171,9 +184,9 @@ WorldEdit would not be possible without the contributions of many developers and
 
 License
 -------
-Copyright 2013 sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote).
+Copyright (c) 2012 sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote).
 
-This mod is licensed under the [GNU Affero General Public License](http://www.gnu.org/licenses/agpl-3.0.html).
+This mod is licensed under the [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.html).
 
 Basically, this means everyone is free to use, modify, and distribute the files, as long as these modifications are also licensed the same way.
 Most importantly, the Affero variant of the GPL requires you to publish your modifications in source form, even if the mod is run only on the server, and not distributed.

Tutorial.md

@@ -1,13 +1,11 @@
 WorldEdit Tutorial
 ==================
-This is a step-by-step tutorial outlining the basic usage of WorldEdit. For more information, see the [README](README.md).
+This is a step-by-step tutorial outlining the basic usage of WorldEdit.
 
 Let's start with a few assumptions:
 
-* You have a compatible version of Minetest working.
+* You have a compatible version of Minetest working, that is 5.0 or later.
-  * See the [README](README.md) for compatibility information.
 * You have WorldEdit installed as a mod.
-  * If using Windows, [MODSTER](https://forum.minetest.net/viewtopic.php?pid=101463) makes installing mods totally painless.
   * Simply download the file, extract the archive, and move it to the correct mod folder for Minetest.
   * See the installation instructions in [README](README.md) if you need more details.
 * You are familiar with the basics of the game.
@@ -59,7 +57,7 @@ Look at the place between the two markers: it is now filled with MESE blocks!
 
 The `//set <node>` command fills the region with whatever node you want. It is a region-oriented command, which means it works inside the WorldEdit region only.
 
-Now, try a few different variations, such as `//set torch`, `//set cobble`, and `//set water`.
+Now, try a few different variations, such as `//set torch`, `//set cobble`, and `//set water source`.
 
 ### WorldEdit GUI
 
@@ -75,7 +73,7 @@ Look at the place between the two markers: it is now filled with MESE blocks!
 
 The "Set Nodes" function fills the region with whatever node you want. It is a region-oriented command, which means it works inside the WorldEdit region only.
 
-Now, try a few different variations on the node name, such as "torch", "cobble", and "water".
+Now, try a few different variations on the node name, such as "torch", "cobble", and "water source".
 
 Step 3: Position commands
 -------------------------
@@ -117,4 +115,4 @@ A very useful command to check out is the `//save <schematic>` command, which ca
 
 This only scratches the surface of what WorldEdit is capable of. Most of the functions in the WorldEdit GUI correspond to chat commands, and so the [Chat Commands Reference](ChatCommands.md) may be useful if you get stuck.
 
-It is helpful to explore the various buttons in the interface and check out what they do. Learning the chat command interface is also useful if you use WorldEdit intensively - an experienced chat command user can usually work faster than an experienced WorldEdit GUI user.
+It is helpful to explore the various buttons in the interface and check out what they do. Learning the chat command interface is also useful if you use WorldEdit intensively - an experienced chat command user can usually work faster than an experienced WorldEdit GUI user.

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

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)

worldedit/init.lua

@@ -1,7 +1,7 @@
---- Worldedit.
+--- WorldEdit mod for the Minetest engine
 -- @module worldedit
--- @release 1.2
+-- @release 1.3
--- @copyright 2013 sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote).
+-- @copyright 2012 sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote)
 -- @license GNU Affero General Public License version 3 (AGPLv3)
 -- @author sfan5
 -- @author Anthony Zang (Uberi/Temperest)
@@ -11,7 +11,7 @@
 
 worldedit = {}
 
-local ver = {major=1, minor=2}
+local ver = {major=1, minor=3}
 worldedit.version = ver
 worldedit.version_string = string.format("%d.%d", ver.major, ver.minor)
 

worldedit/manipulations.lua

@@ -640,10 +640,34 @@ function worldedit.clear_objects(pos1, pos2)
 
 	worldedit.keep_loaded(pos1, pos2)
 
+	local function should_delete(obj)
+		-- Avoid players and WorldEdit entities
+		if obj:is_player() then
+			return false
+		end
+		local entity = obj:get_luaentity()
+		return not entity or not entity.name:find("^worldedit:")
+	end
+
 	-- Offset positions to include full nodes (positions are in the center of nodes)
 	local pos1x, pos1y, pos1z = pos1.x - 0.5, pos1.y - 0.5, pos1.z - 0.5
 	local pos2x, pos2y, pos2z = pos2.x + 0.5, pos2.y + 0.5, pos2.z + 0.5
 
+	local count = 0
+	if minetest.get_objects_in_area then
+		local objects = minetest.get_objects_in_area({x=pos1x, y=pos1y, z=pos1z},
+			{x=pos2x, y=pos2y, z=pos2z})
+
+		for _, obj in pairs(objects) do
+			if should_delete(obj) then
+				obj:remove()
+				count = count + 1
+			end
+		end
+		return count
+	end
+
+	-- Fallback implementation via get_objects_inside_radius
 	-- Center of region
 	local center = {
 		x = pos1x + ((pos2x - pos1x) / 2),
@@ -655,12 +679,8 @@ function worldedit.clear_objects(pos1, pos2)
 			(center.x - pos1x) ^ 2 +
 			(center.y - pos1y) ^ 2 +
 			(center.z - pos1z) ^ 2)
-	local count = 0
 	for _, obj in pairs(minetest.get_objects_inside_radius(center, radius)) do
-		local entity = obj:get_luaentity()
+		if should_delete(obj) then
-		-- Avoid players and WorldEdit entities
-		if not obj:is_player() and (not entity or
-				not entity.name:find("^worldedit:")) then
 			local pos = obj:get_pos()
 			if pos.x >= pos1x and pos.x <= pos2x and
 					pos.y >= pos1y and pos.y <= pos2y and

worldedit/serialization.lua

@@ -1,9 +1,7 @@
 --- Schematic serialization and deserialiation.
 -- @module worldedit.serialization
 
-worldedit.LATEST_SERIALIZATION_VERSION = 5
+worldedit.LATEST_SERIALIZATION_VERSION = 6
-local LATEST_SERIALIZATION_HEADER = worldedit.LATEST_SERIALIZATION_VERSION .. ":"
-
 
 --[[
 Serialization version history:
@@ -15,6 +13,7 @@ Serialization version history:
       `name`, `param1`, `param2`, and `meta` fields.
   5: Added header and made `param1`, `param2`, and `meta` fields optional.
       Header format: <Version>,<ExtraHeaderField1>,...:<Content>
+  6: Much more complicated but also better format
 --]]
 
 
@@ -66,17 +65,105 @@ function worldedit.serialize(pos1, pos2)
 		has_meta[hash_node_position(meta_positions[i])] = true
 	end
 
-	local pos = {x=pos1.x, y=0, z=0}
+	-- Decide axis of saved rows
+	local dim = vector.add(vector.subtract(pos2, pos1), 1)
+	local axis
+	if dim.x * dim.y < math.min(dim.y * dim.z, dim.x * dim.z) then
+		axis = "z"
+	elseif dim.x * dim.z < math.min(dim.x * dim.y, dim.y * dim.z) then
+		axis = "y"
+	elseif dim.y * dim.z < math.min(dim.x * dim.y, dim.x * dim.z) then
+		axis = "x"
+	else
+		axis = "x" -- X or Z are usually most efficient
+	end
+	local other1, other2 = worldedit.get_axis_others(axis)
+
+	-- Helper functions (1)
+	local MATCH_DIST = 8
+	local function match_init(array, first_value)
+		array[1] = first_value
+		return {first_value}
+	end
+	local function match_try(cache, prev_pushed, value)
+		local i = #cache
+		while i >= 1 do
+			if cache[i] == value then
+				local ret = -(#cache - i + 1)
+				local was_value = type(prev_pushed) ~= "number" or prev_pushed >= 0
+				return ret, (was_value and ret == -1) or prev_pushed == ret
+			end
+			i = i - 1
+		end
+		return nil, false
+	end
+	local function match_push(cache, match, value)
+		if match ~= nil then -- don't advance cache
+			return match
+		end
+		local idx = #cache + 1
+		cache[idx] = value
+		if idx > MATCH_DIST then
+			table.remove(cache, 1)
+		end
+		return value
+	end
+	-- Helper functions (2)
+	local function cur_new(pos, pos1)
+		return {
+			a = axis,
+			p = {pos.x - pos1.x, pos.y - pos1.y, pos.z - pos1.z},
+			c = 1,
+			data = {},
+			param1 = {},
+			param2 = {},
+			meta = {},
+		}
+	end
+	local function is_emptyish(t)
+		-- returns true if <t> contains only one element and that one element is == 0
+		local seen = false
+		for _, value in pairs(t) do
+			if not seen then
+				if value ~= 0 then
+					return false
+				end
+				seen = true
+			else
+				return false
+			end
+		end
+		return true
+	end
+	local function cur_finish(result, cur)
+		if is_emptyish(cur.param1) then
+			cur.param1 = nil
+		end
+		if is_emptyish(cur.param2) then
+			cur.param2 = nil
+		end
+		if next(cur.meta) == nil then
+			cur.meta = nil
+		end
+		result[#result + 1] = cur
+	end
+
+	-- Serialize stuff
+	local pos = {}
 	local count = 0
 	local result = {}
-	while pos.x <= pos2.x do
+	local cur
-		pos.y = pos1.y
+	local cache_data, cache_param1, cache_param2
-		while pos.y <= pos2.y do
+	local prev_data, prev_param1, prev_param2
-			pos.z = pos1.z
+	pos[other1] = pos1[other1]
-			while pos.z <= pos2.z do
+	while pos[other1] <= pos2[other1] do
+		pos[other2] = pos1[other2]
+		while pos[other2] <= pos2[other2] do
+			pos[axis] = pos1[axis]
+			while pos[axis] <= pos2[axis] do
+
 				local node = get_node(pos)
 				if node.name ~= "air" and node.name ~= "ignore" then
-					count = count + 1
 
 					local meta
 					if has_meta[hash_node_position(pos)] then
@@ -93,37 +180,107 @@ function worldedit.serialize(pos1, pos2)
 						end
 					end
 
-					result[count] = {
+					if cur == nil then -- Start a new row
-						x = pos.x - pos1.x,
+						cur = cur_new(pos, pos1, axis, other1, other2)
-						y = pos.y - pos1.y,
+
-						z = pos.z - pos1.z,
+						cache_data = match_init(cur.data, node.name)
-						name = node.name,
+						cache_param1 = match_init(cur.param1, node.param1)
-						param1 = node.param1 ~= 0 and node.param1 or nil,
+						cache_param2 = match_init(cur.param2, node.param2)
-						param2 = node.param2 ~= 0 and node.param2 or nil,
+						prev_data = cur.data[1]
-						meta = meta,
+						prev_param1 = cur.param1[1]
-					}
+						prev_param2 = cur.param2[1]
+
+						cur.meta[1] = meta
+					else -- Append to existing row
+						local next_c = cur.c + 1
+						cur.c = next_c
+						local value, m, can_omit
+
+						value = node.name
+						m, can_omit = match_try(cache_data, prev_data, node.name)
+						if not can_omit then
+							 prev_data = match_push(cache_data, m, value)
+							 cur.data[next_c] = prev_data
+						end
+
+						value = node.param1
+						m, can_omit = match_try(cache_param1, prev_param1, value)
+						if not can_omit then
+							prev_param1 = match_push(cache_param1, m, value)
+							cur.param1[next_c] = prev_param1
+						end
+
+						value = node.param2
+						m, can_omit = match_try(cache_param2, prev_param2, value)
+						if not can_omit then
+							prev_param2 = match_push(cache_param2, m, value)
+							cur.param2[next_c] = prev_param2
+						end
+
+						cur.meta[next_c] = meta
+					end
+					count = count + 1
+				else
+					if cur ~= nil then -- Finish row
+						cur_finish(result, cur)
+						cur = nil
+					end
 				end
-				pos.z = pos.z + 1
+				pos[axis] = pos[axis] + 1
+
 			end
-			pos.y = pos.y + 1
+			if cur ~= nil then -- Finish leftover row
+				cur_finish(result, cur)
+				cur = nil
+			end
+			pos[other2] = pos[other2] + 1
 		end
-		pos.x = pos.x + 1
+		pos[other1] = pos[other1] + 1
 	end
+
 	-- Serialize entries
 	result = minetest.serialize(result)
-	return LATEST_SERIALIZATION_HEADER .. result, count
+	return tonumber(worldedit.LATEST_SERIALIZATION_VERSION) .. "," ..
+		string.format("%d,%d,%d:", dim.x, dim.y, dim.z) .. 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 minetest.global_exists("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 function legacy_load_schematic(version, header, content)
-	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 +318,9 @@ local function load_schematic(value)
 			})
 		end
 	elseif version == 4 or version == 5 then -- Nested table format
-		if not jit then
+		nodes = deserialize_workaround(content)
-			-- This is broken for larger tables in the current version of LuaJIT
+	elseif version >= 6 then
-			nodes = minetest.deserialize(content)
+		error("legacy_load_schematic called for non-legacy schematic")
-		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
 	else
 		return nil
 	end
@@ -195,14 +333,29 @@ end
 -- @return High corner position.
 -- @return The number of nodes.
 function worldedit.allocate(origin_pos, value)
-	local nodes = load_schematic(value)
+	local version, header, content = worldedit.read_header(value)
-	if not nodes or #nodes == 0 then return nil end
+	if version == 6 then
-	return worldedit.allocate_with_nodes(origin_pos, nodes)
+		local content = deserialize_workaround(content)
+		local pos2 = {
+			x = origin_pos.x + tonumber(header[1]) - 1,
+			y = origin_pos.y + tonumber(header[2]) - 1,
+			z = origin_pos.z + tonumber(header[3]) - 1,
+		}
+		local count = 0
+		for _, row in ipairs(content) do
+			count = count + row.c
+		end
+		return origin_pos, pos2, count
+	else
+		local nodes = legacy_load_schematic(version, header, content)
+		if not nodes or #nodes == 0 then return nil end
+		return worldedit.legacy_allocate_with_nodes(origin_pos, nodes)
+	end
 end
 
 
 -- Internal
-function worldedit.allocate_with_nodes(origin_pos, nodes)
+function worldedit.legacy_allocate_with_nodes(origin_pos, nodes)
 	local huge = math.huge
 	local pos1x, pos1y, pos1z = huge, huge, huge
 	local pos2x, pos2y, pos2z = -huge, -huge, -huge
@@ -225,24 +378,110 @@ end
 --- Loads the nodes represented by string `value` at position `origin_pos`.
 -- @return The number of nodes deserialized.
 function worldedit.deserialize(origin_pos, value)
-	local nodes = load_schematic(value)
+	local version, header, content = worldedit.read_header(value)
-	if not nodes then return nil end
+	if version == 6 then
-	if #nodes == 0 then return #nodes end
+		local content = deserialize_workaround(content)
+		local pos2 = {
+			x = origin_pos.x + tonumber(header[1]) - 1,
+			y = origin_pos.y + tonumber(header[2]) - 1,
+			z = origin_pos.z + tonumber(header[3]) - 1,
+		}
+		worldedit.keep_loaded(origin_pos, pos2)
 
-	local pos1, pos2 = worldedit.allocate_with_nodes(origin_pos, nodes)
+		return worldedit.deserialize_with_content(origin_pos, content)
-	worldedit.keep_loaded(pos1, pos2)
+	else
+		local nodes = legacy_load_schematic(version, header, content)
+		if not nodes or #nodes == 0 then return nil end
 
-	local origin_x, origin_y, origin_z = origin_pos.x, origin_pos.y, origin_pos.z
+		local pos1, pos2 = worldedit.legacy_allocate_with_nodes(origin_pos, nodes)
-	local count = 0
+		worldedit.keep_loaded(pos1, pos2)
-	local add_node, get_meta = minetest.add_node, minetest.get_meta
+
-	for i, entry in ipairs(nodes) do
+		local origin_x, origin_y, origin_z = origin_pos.x, origin_pos.y, origin_pos.z
-		entry.x, entry.y, entry.z = origin_x + entry.x, origin_y + entry.y, origin_z + entry.z
+		local count = 0
-		-- Entry acts as both position and node
+		local add_node, get_meta = minetest.add_node, minetest.get_meta
-		add_node(entry, entry)
+		for i, entry in ipairs(nodes) do
-		if entry.meta then
+			entry.x, entry.y, entry.z = origin_x + entry.x, origin_y + entry.y, origin_z + entry.z
-			get_meta(entry):from_table(entry.meta)
+			-- Entry acts as both position and node
+			add_node(entry, entry)
+			if entry.meta then
+				get_meta(entry):from_table(entry.meta)
+			end
 		end
+		return #nodes
 	end
-	return #nodes
 end
 
+-- Internal
+function worldedit.deserialize_with_content(origin_pos, content)
+	-- Helper functions
+	local function resolve_refs(array)
+		-- find (and cache) highest index
+		local max_i = 1
+		for i, _ in pairs(array) do
+			if i > max_i then max_i = i end
+		end
+		array.max_i = max_i
+		-- resolve references
+		local cache = {}
+		for i = 1, max_i do
+			local v = array[i]
+			if v ~= nil then
+				if type(v) == "number" and v < 0 then -- is a reference
+					array[i] = cache[#cache + v + 1]
+				else
+					cache[#cache + 1] = v
+				end
+			end
+		end
+	end
+	local function read_in_array(array, idx)
+		if idx > array.max_i then
+			return array[array.max_i]
+		end
+		-- go backwards until we find something
+		repeat
+			local v = array[idx]
+			if v ~= nil then
+				return v
+			end
+			idx = idx - 1
+		until idx == 0
+		assert(false)
+	end
+
+	-- Actually deserialize
+	local count = 0
+	local entry = {}
+	local add_node, get_meta = minetest.add_node, minetest.get_meta
+	for _, row in ipairs(content) do
+		local axis = row.a
+		local pos = {
+			x = origin_pos.x + row.p[1],
+			y = origin_pos.y + row.p[2],
+			z = origin_pos.z + row.p[3],
+		}
+		if row.param1 == nil then row.param1 = {0} end
+		if row.param2 == nil then row.param2 = {0} end
+		if row.meta == nil then row.meta = {} end
+		resolve_refs(row.data)
+		resolve_refs(row.param1)
+		resolve_refs(row.param2)
+
+		for i = 1, row.c do
+			entry.name = read_in_array(row.data, i)
+			entry.param1 = read_in_array(row.param1, i)
+			entry.param2 = read_in_array(row.param2, i)
+			add_node(pos, entry)
+
+			local meta = row.meta[i]
+			if meta then
+				get_meta(pos):from_table(meta)
+			end
+
+			pos[axis] = pos[axis] + 1
+		end
+
+		count = count + row.c
+	end
+	return count
+end

worldedit_brush/init.lua

@@ -39,7 +39,7 @@ 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)
+	worldedit.marker_update(name)
 
 	-- this isn't really clean...
 	local player_notify_old = worldedit.player_notify
@@ -101,7 +101,7 @@ worldedit.register_command("brush", {
 		else
 			local cmddef = worldedit.registered_commands[cmd]
 			if cmddef == nil or cmddef.require_pos ~= 1 then
-				worldedit.player_notify(name, "Invalid command for brush use: //" .. cmd)
+				worldedit.player_notify(name, "//" .. cmd .. " cannot be used with brushes")
 				return
 			end
 
@@ -109,7 +109,7 @@ worldedit.register_command("brush", {
 			local ok, err = cmddef.parse(params)
 			if not ok then
 				err = err or "invalid usage"
-				worldedit.player_notify(name, "Brush command: " .. err)
+				worldedit.player_notify(name, "Error with brush command: " .. err)
 				return
 			end
 

worldedit_commands/cuboid.lua

@@ -1,5 +1,5 @@
 worldedit.register_command("outset", {
-	params = "[h|v] <amount>",
+	params = "[h/v] <amount>",
 	description = "Outset the selected region.",
 	privs = {worldedit=true},
 	require_pos = 2,
@@ -38,7 +38,7 @@ worldedit.register_command("outset", {
 
 
 worldedit.register_command("inset", {
-	params = "[h|v] <amount>",
+	params = "[h/v] <amount>",
 	description = "Inset the selected region.",
 	privs = {worldedit=true},
 	require_pos = 2,
@@ -47,9 +47,7 @@ worldedit.register_command("inset", {
 		if find == nil then
 			return false
 		end
-
+		if dir:find("[^hv]") ~= nil then
-		local hv_test = dir:find("[^hv]+")
-		if hv_test ~= nil then
 			return false, "Invalid direction."
 		end
 
@@ -77,8 +75,8 @@ worldedit.register_command("inset", {
 
 
 worldedit.register_command("shift", {
-	params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
+	params = "x/y/z/?/up/down/left/right/front/back [+/-]<amount>",
-	description = "Moves the selection region. Does not move contents.",
+	description = "Shifts the selection area without moving its contents",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -112,8 +110,8 @@ worldedit.register_command("shift", {
 
 
 worldedit.register_command("expand", {
-	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
-	description = "expand the selection in one or two directions at once",
+	description = "Expands the selection in the selected absolute or relative axis",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -161,8 +159,8 @@ worldedit.register_command("expand", {
 
 
 worldedit.register_command("contract", {
-	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
-	description = "contract the selection in one or two directions at once",
+	description = "Contracts the selection in the selected absolute or relative axis",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -207,3 +205,62 @@ worldedit.register_command("contract", {
 		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,
+})

worldedit_commands/init.lua

@@ -122,8 +122,9 @@ local function check_region(name)
 	return worldedit.volume(worldedit.pos1[name], worldedit.pos2[name])
 end
 
+-- Strips any kind of escape codes (translation, colors) from a string
 -- https://github.com/minetest/minetest/blob/53dd7819277c53954d1298dfffa5287c306db8d0/src/util/string.cpp#L777
-local function strip_translation_escapes(input)
+local function strip_escapes(input)
 	local s = function(idx) return input:sub(idx, idx) end
 	local out = ""
 	local i = 1
@@ -153,6 +154,8 @@ local function string_endswith(full, part)
 	return full:find(part, 1, true) == #full - #part + 1
 end
 
+local description_cache = nil
+
 -- normalizes node "description" `nodename`, returning a string (or nil)
 worldedit.normalize_nodename = function(nodename)
 	nodename = nodename:gsub("^%s*(.-)%s*$", "%1") -- strip spaces
@@ -163,16 +166,30 @@ worldedit.normalize_nodename = function(nodename)
 		return fullname
 	end
 	nodename = nodename:lower()
-	for key, value in pairs(minetest.registered_nodes) do
+
-		if string_endswith(key, ":" .. nodename) then -- matches name (w/o mod part)
+	for key, _ in pairs(minetest.registered_nodes) do
+		if string_endswith(key:lower(), ":" .. nodename) then -- matches name (w/o mod part)
 			return key
 		end
 	end
-	for key, value in pairs(minetest.registered_nodes) do
+
-		local desc = strip_translation_escapes(value.description):lower()
+	if description_cache == nil then
+		-- cache stripped descriptions
+		description_cache = {}
+		for key, value in pairs(minetest.registered_nodes) do
+			local desc = strip_escapes(value.description):gsub("\n.*", "", 1):lower()
+			if desc ~= "" then
+				description_cache[key] = desc
+			end
+		end
+	end
+
+	for key, desc in pairs(description_cache) do
 		if desc == nodename then -- matches description
 			return key
 		end
+	end
+	for key, desc in pairs(description_cache) do
 		if desc == nodename .. " block" then
 			-- fuzzy description match (e.g. "Steel" == "Steel Block")
 			return key
@@ -180,8 +197,8 @@ worldedit.normalize_nodename = function(nodename)
 	end
 
 	local match = nil
-	for key, value in pairs(minetest.registered_nodes) do
+	for key, value in pairs(description_cache) do
-		if value.description:lower():find(nodename, 1, true) ~= nil then
+		if value:find(nodename, 1, true) ~= nil then
 			if match ~= nil then
 				return nil
 			end
@@ -215,7 +232,10 @@ worldedit.register_command("about", {
 	params = "",
 	description = "Get information about the WorldEdit mod",
 	func = function(name)
-		worldedit.player_notify(name, "WorldEdit " .. worldedit.version_string .. " is available on this server. Type //help to get a list of commands, or get more information at https://github.com/Uberi/Minetest-WorldEdit")
+		worldedit.player_notify(name, "WorldEdit " .. worldedit.version_string..
+			" is available on this server. Type //help to get a list of "..
+			"commands, or get more information at "..
+			"https://github.com/Uberi/Minetest-WorldEdit")
 	end,
 })
 
@@ -332,8 +352,7 @@ worldedit.register_command("reset", {
 	func = function(name)
 		worldedit.pos1[name] = nil
 		worldedit.pos2[name] = nil
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 		worldedit.set_pos[name] = nil
 		--make sure the user does not try to confirm an operation after resetting pos:
 		reset_pending(name)
@@ -346,8 +365,7 @@ worldedit.register_command("mark", {
 	description = "Show markers at the region positions",
 	privs = {worldedit=true},
 	func = function(name)
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 		worldedit.player_notify(name, "region marked")
 	end,
 })
@@ -360,8 +378,7 @@ worldedit.register_command("unmark", {
 		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
 		worldedit.pos1[name] = nil
 		worldedit.pos2[name] = nil
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 		worldedit.pos1[name] = pos1
 		worldedit.pos2[name] = pos2
 		worldedit.player_notify(name, "region unmarked")
@@ -430,7 +447,7 @@ worldedit.register_command("p", {
 })
 
 worldedit.register_command("fixedpos", {
-	params = "set1/set2 x y z",
+	params = "set1/set2 <x> <y> <z>",
 	description = "Set a WorldEdit region position to the position at (<x>, <y>, <z>)",
 	privs = {worldedit=true},
 	parse = function(param)
@@ -539,7 +556,7 @@ worldedit.register_command("param2", {
 	parse = function(param)
 		local param2 = tonumber(param)
 		if not param2 then
-			return false, "Invalid or missing param2 argument"
+			return false
 		elseif param2 < 0 or param2 > 255 then
 			return false, "Param2 is out of range (must be between 0 and 255 inclusive!)"
 		end
@@ -553,7 +570,7 @@ worldedit.register_command("param2", {
 })
 
 worldedit.register_command("mix", {
-	params = "<node1> [<weighting1>] [<node2> [<weighting2>]] ...",
+	params = "<node1> [count1] <node2> [count2] ...",
 	description = "Fill the current WorldEdit region with a random mix of <node1>, ...",
 	privs = {worldedit=true},
 	require_pos = 2,
@@ -573,6 +590,9 @@ worldedit.register_command("mix", {
 				nodes[#nodes + 1] = node
 			end
 		end
+		if #nodes == 0 then
+			return false
+		end
 		return true, nodes
 	end,
 	nodes_needed = check_region,
@@ -773,7 +793,7 @@ end
 
 worldedit.register_command("hollowcylinder", {
 	params = "x/y/z/? <length> <radius1> [radius2] <node>",
-	description = "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>",
+	description = "Add hollow cylinder at WorldEdit position 1 along the given axis with length <length>, base radius <radius1> (and top radius [radius2]), composed of <node>",
 	privs = {worldedit=true},
 	require_pos = 1,
 	parse = check_cylinder,
@@ -794,7 +814,7 @@ worldedit.register_command("hollowcylinder", {
 
 worldedit.register_command("cylinder", {
 	params = "x/y/z/? <length> <radius1> [radius2] <node>",
-	description = "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>",
+	description = "Add cylinder at WorldEdit position 1 along the given axis with length <length>, base radius <radius1> (and top radius [radius2]), composed of <node>",
 	privs = {worldedit=true},
 	require_pos = 1,
 	parse = check_cylinder,
@@ -827,7 +847,7 @@ end
      
 worldedit.register_command("hollowpyramid", {
 	params = "x/y/z/? <height> <node>",
-	description = "Add hollow pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",
+	description = "Add hollow pyramid centered at WorldEdit position 1 along the given axis with height <height>, composed of <node>",
 	privs = {worldedit=true},
 	require_pos = 1,
 	parse = check_pyramid,
@@ -847,7 +867,7 @@ worldedit.register_command("hollowpyramid", {
 
 worldedit.register_command("pyramid", {
 	params = "x/y/z/? <height> <node>",
-	description = "Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",
+	description = "Add pyramid centered at WorldEdit position 1 along the given axis with height <height>, composed of <node>",
 	privs = {worldedit=true},
 	require_pos = 1,
 	parse = check_pyramid,
@@ -892,7 +912,7 @@ worldedit.register_command("spiral", {
 
 worldedit.register_command("copy", {
 	params = "x/y/z/? <amount>",
-	description = "Copy the current WorldEdit region along the x/y/z/? axis by <amount> nodes",
+	description = "Copy the current WorldEdit region along the given axis by <amount> nodes",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -919,7 +939,7 @@ worldedit.register_command("copy", {
 
 worldedit.register_command("move", {
 	params = "x/y/z/? <amount>",
-	description = "Move the current WorldEdit region along the x/y/z/? axis by <amount> nodes",
+	description = "Move the current WorldEdit region along the given axis by <amount> nodes",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -944,15 +964,14 @@ worldedit.register_command("move", {
 
 		pos1[axis] = pos1[axis] + amount
 		pos2[axis] = pos2[axis] + amount
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 		worldedit.player_notify(name, count .. " nodes moved")
 	end,
 })
 
 worldedit.register_command("stack", {
 	params = "x/y/z/? <count>",
-	description = "Stack the current WorldEdit region along the x/y/z/? axis <count> times",
+	description = "Stack the current WorldEdit region along the given axis <count> times",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -1036,8 +1055,7 @@ worldedit.register_command("stretch", {
 		--reset markers to scaled positions
 		worldedit.pos1[name] = pos1
 		worldedit.pos2[name] = pos2
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 
 		worldedit.player_notify(name, count .. " nodes stretched")
 	end,
@@ -1045,7 +1063,7 @@ worldedit.register_command("stretch", {
 
 worldedit.register_command("transpose", {
 	params = "x/y/z/? x/y/z/?",
-	description = "Transpose the current WorldEdit region along the x/y/z/? and x/y/z/? axes",
+	description = "Transpose the current WorldEdit region along the given axes",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -1067,8 +1085,7 @@ worldedit.register_command("transpose", {
 		--reset markers to transposed positions
 		worldedit.pos1[name] = pos1
 		worldedit.pos2[name] = pos2
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 
 		worldedit.player_notify(name, count .. " nodes transposed")
 	end,
@@ -1076,7 +1093,7 @@ worldedit.register_command("transpose", {
 
 worldedit.register_command("flip", {
 	params = "x/y/z/?",
-	description = "Flip the current WorldEdit region along the x/y/z/? axis",
+	description = "Flip the current WorldEdit region along the given axis",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -1094,8 +1111,8 @@ worldedit.register_command("flip", {
 })
 
 worldedit.register_command("rotate", {
-	params = "<axis> <angle>",
+	params = "x/y/z/? <angle>",
-	description = "Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment)",
+	description = "Rotate the current WorldEdit region around the given axis by angle <angle> (90 degree increment)",
 	privs = {worldedit=true},
 	require_pos = 2,
 	parse = function(param)
@@ -1118,8 +1135,7 @@ worldedit.register_command("rotate", {
 		--reset markers to rotated positions
 		worldedit.pos1[name] = pos1
 		worldedit.pos2[name] = pos2
-		worldedit.mark_pos1(name)
+		worldedit.marker_update(name)
-		worldedit.mark_pos2(name)
 
 		worldedit.player_notify(name, count .. " nodes rotated")
 	end,
@@ -1186,6 +1202,85 @@ worldedit.register_command("drain", {
 	end,
 })
 
+local clearcut_cache
+
+local function clearcut(pos1, pos2)
+	-- decide which nodes we consider plants
+	if clearcut_cache == nil then
+		clearcut_cache = {}
+		for name, def in pairs(minetest.registered_nodes) do
+			local groups = def.groups or {}
+			if (
+				-- the groups say so
+				groups.flower or groups.grass or groups.flora or groups.plant or
+				groups.leaves or groups.tree or groups.leafdecay or groups.sapling or
+				-- drawtype heuristic
+				(def.is_ground_content and def.buildable_to and
+					(def.sunlight_propagates or not def.walkable)
+					and def.drawtype == "plantlike") or
+				-- if it's flammable, it probably needs to go too
+				(def.is_ground_content and not def.walkable and groups.flammable)
+			) then
+				clearcut_cache[name] = true
+			end
+		end
+	end
+	local plants = clearcut_cache
+
+	local count = 0
+	local prev, any
+
+	for x = pos1.x, pos2.x do
+	for z = pos1.z, pos2.z do
+		prev = false
+		any = false
+		-- first pass: remove floating nodes that would be left over
+		for y = pos1.y, pos2.y do
+			local n = minetest.get_node({x=x, y=y, z=z}).name
+			if plants[n] then
+				prev = true
+				any = true
+			elseif prev then
+				local def = minetest.registered_nodes[n] or {}
+				local groups = def.groups or {}
+				if groups.attached_node or (def.buildable_to and groups.falling_node) then
+					minetest.remove_node({x=x, y=y, z=z})
+					count = count + 1
+				else
+					prev = false
+				end
+			end
+		end
+
+		-- second pass: remove plants, top-to-bottom to avoid item drops
+		if any then
+			for y = pos2.y, pos1.y, -1 do
+				local n = minetest.get_node({x=x, y=y, z=z}).name
+				if plants[n] then
+					minetest.remove_node({x=x, y=y, z=z})
+					count = count + 1
+				end
+			end
+		end
+	end
+	end
+
+	return count
+end
+
+worldedit.register_command("clearcut", {
+	params = "",
+	description = "Remove any plant, tree or foilage-like nodes in the selected region",
+	privs = {worldedit=true},
+	require_pos = 2,
+	nodes_needed = check_region,
+	func = function(name)
+		local pos1, pos2 = worldedit.sort_pos(worldedit.pos1[name], worldedit.pos2[name])
+		local count = clearcut(pos1, pos2)
+		worldedit.player_notify(name, count .. " nodes removed")
+	end,
+})
+
 worldedit.register_command("hide", {
 	params = "",
 	description = "Hide all nodes in the current WorldEdit region non-destructively",
@@ -1248,23 +1343,6 @@ worldedit.register_command("restore", {
 	end,
 })
 
-local function detect_misaligned_schematic(name, pos1, pos2)
-	pos1, pos2 = worldedit.sort_pos(pos1, pos2)
-	-- Check that allocate/save can position the schematic correctly
-	-- The expected behaviour is that the (0,0,0) corner of the schematic stays
-	-- sat pos1, this only works when the minimum position is actually present
-	-- in the schematic.
-	local node = minetest.get_node(pos1)
-	local have_node_at_origin = node.name ~= "air" and node.name ~= "ignore"
-	if not have_node_at_origin then
-		worldedit.player_notify(name,
-			"Warning: The schematic contains excessive free space and WILL be "..
-			"misaligned when allocated or loaded. To avoid this, shrink your "..
-			"area to cover exactly the nodes to be saved."
-		)
-	end
-end
-
 worldedit.register_command("save", {
 	params = "<file>",
 	description = "Save the current WorldEdit region to \"(world folder)/schems/<file>.we\"",
@@ -1283,7 +1361,6 @@ worldedit.register_command("save", {
 	func = function(name, param)
 		local result, count = worldedit.serialize(worldedit.pos1[name],
 				worldedit.pos2[name])
-		detect_misaligned_schematic(name, worldedit.pos1[name], worldedit.pos2[name])
 
 		local path = minetest.get_worldpath() .. "/schems"
 		-- Create directory if it does not already exist
@@ -1345,9 +1422,8 @@ worldedit.register_command("allocate", {
 		end
 
 		worldedit.pos1[name] = nodepos1
-		worldedit.mark_pos1(name)
 		worldedit.pos2[name] = nodepos2
-		worldedit.mark_pos2(name)
+		worldedit.marker_update(name)
 
 		worldedit.player_notify(name, count .. " nodes allocated")
 	end,

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
-	worldedit.mark_region(name)
+	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
-	worldedit.mark_region(name)
+	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
@@ -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,7 +99,8 @@ 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},
@@ -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)
+	on_activate = function(self, staticdata, dtime_s)
-		if worldedit.marker1[self.player_name] == nil then
+		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)
+	on_activate = function(self, staticdata, dtime_s)
-		if worldedit.marker2[self.player_name] == nil then
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
 			self.object:remove()
 		end
 	end,
@@ -151,6 +170,9 @@ 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", {
@@ -159,11 +181,12 @@ minetest.register_entity(":worldedit:region_cube", {
 		textures = {"worldedit_cube.png"},
 		visual_size = {x=10, y=10},
 		physical = false,
+		static_save = false,
 	},
-	on_step = function(self, dtime)
+	on_activate = function(self, staticdata, dtime_s)
-		if worldedit.marker_region[self.player_name] == nil then
+		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)
@@ -176,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,
 })
 

worldedit_commands/safe.lua

@@ -3,7 +3,7 @@ local safe_region_callback = {}
 --`count` is the number of nodes that would possibly be modified
 --`callback` is a callback to run when the user confirms
 local function safe_region(name, count, callback)
-	if count < 10000 then
+	if count < 20000 then
 		return callback()
 	end
 

worldedit_gui/functionality.lua

@@ -11,6 +11,7 @@ local gui_count2 = {} --mapping of player names to a quantity (arbitrary strings
 local gui_count3 = {} --mapping of player names to a quantity (arbitrary strings may also appear as values)
 local gui_angle = {} --mapping of player names to an angle (one of 90, 180, 270, representing the angle in degrees clockwise)
 local gui_filename = {} --mapping of player names to file names
+local gui_param2 = {} --mapping of player names to param2 values
 
 --set default values
 setmetatable(gui_nodename1, {__index = function() return "Cobblestone" end})
@@ -25,6 +26,7 @@ setmetatable(gui_count2,     {__index = function() return "6" end})
 setmetatable(gui_count3,     {__index = function() return "4" end})
 setmetatable(gui_angle,     {__index = function() return 90 end})
 setmetatable(gui_filename,  {__index = function() return "building" end})
+setmetatable(gui_param2,    {__index = function() return "0" end})
 
 local axis_indices = {["X axis"]=1, ["Y axis"]=2, ["Z axis"]=3, ["Look direction"]=4}
 local axis_values = {"x", "y", "z", "?"}
@@ -132,11 +134,21 @@ local function handle_changes(name, identifier, fields, def)
 	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,
 })
 
@@ -144,7 +156,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,
 })
 
@@ -178,47 +191,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)))
@@ -255,7 +268,7 @@ worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
 
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-			minetest.chatcommands["/set"].func(name, n)
+			execute_worldedit_command("set", name, n)
 		end
 		return true
 	end
@@ -301,7 +314,7 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
 		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))
+			execute_worldedit_command(submit, name, n1 .. " " .. n2)
 		end
 		return true
 	end
@@ -350,7 +363,8 @@ worldedit.register_gui_handler("worldedit_gui_sphere_dome", function(name, field
 		end
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-			minetest.chatcommands["/"..submit].func(name, string.format("%s %s", gui_distance2[name], n))
+			execute_worldedit_command(submit, name,
+				gui_distance2[name] .. " " .. n)
 		end
 		return true
 	end
@@ -404,7 +418,7 @@ worldedit.register_gui_handler("worldedit_gui_cylinder", function(name, fields)
 		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)
+			execute_worldedit_command(submit, name, args)
 		end
 		return true
 	end
@@ -448,7 +462,9 @@ worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields)
 		end
 		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))
+			execute_worldedit_command(submit, name,
+				string.format("%s %s %s", axis_values[gui_axis1[name]],
+				gui_distance1[name], n))
 		end
 		return true
 	end
@@ -491,7 +507,9 @@ worldedit.register_gui_handler("worldedit_gui_spiral", function(name, fields)
 
 		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))
+			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
@@ -527,7 +545,8 @@ worldedit.register_gui_handler("worldedit_gui_copy_move", function(name, fields)
 		if fields.worldedit_gui_copy_move_move then
 			submit = "move"
 		end
-		minetest.chatcommands["/"..submit].func(name, string.format("%s %s", axis_values[gui_axis1[name]], gui_distance1[name]))
+		execute_worldedit_command(submit, name,
+			axis_values[gui_axis1[name]] .. " " .. gui_distance1[name])
 		return true
 	end
 	return ret
@@ -556,7 +575,8 @@ worldedit.register_gui_handler("worldedit_gui_stack", function(name, fields)
 		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
 	return ret
@@ -589,7 +609,8 @@ worldedit.register_gui_handler("worldedit_gui_stretch", function(name, fields)
 		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 ret
@@ -616,7 +637,8 @@ worldedit.register_gui_handler("worldedit_gui_transpose", function(name, fields)
 	if fields.worldedit_gui_transpose_submit then
 		copy_changes(name, fields, cg)
 
-		minetest.chatcommands["/transpose"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], axis_values[gui_axis2[name]]))
+		execute_worldedit_command("transpose", name,
+			axis_values[gui_axis1[name]] .. " " .. axis_values[gui_axis2[name]])
 		return true
 	end
 	return ret
@@ -642,7 +664,7 @@ worldedit.register_gui_handler("worldedit_gui_flip", function(name, fields)
 		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
 	return ret
@@ -670,7 +692,8 @@ worldedit.register_gui_handler("worldedit_gui_rotate", function(name, fields)
 		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
 	return ret
@@ -696,7 +719,8 @@ worldedit.register_gui_handler("worldedit_gui_orient", function(name, fields)
 		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
 	return ret
@@ -706,7 +730,7 @@ 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,
 })
 
@@ -714,7 +738,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,
 })
 
@@ -745,7 +769,7 @@ worldedit.register_gui_handler("worldedit_gui_suppress", function(name, fields)
 
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-			minetest.chatcommands["/suppress"].func(name, n)
+			execute_worldedit_command("suppress", name, n)
 		end
 		return true
 	end
@@ -779,7 +803,7 @@ worldedit.register_gui_handler("worldedit_gui_highlight", function(name, fields)
 
 		local n = worldedit.normalize_nodename(gui_nodename1[name])
 		if n then
-			minetest.chatcommands["/highlight"].func(name, n)
+			execute_worldedit_command("highlight", name, n)
 		end
 		return true
 	end
@@ -790,7 +814,7 @@ 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,
 })
 
@@ -814,11 +838,11 @@ worldedit.register_gui_handler("worldedit_gui_save_load", function(name, fields)
 		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
@@ -868,7 +892,7 @@ worldedit.register_gui_handler("worldedit_gui_cube", function(name, fields)
 		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)
+			execute_worldedit_command(submit, name, args)
 		end
 		return true
 	end
@@ -879,6 +903,34 @@ 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,
 })
+
+worldedit.register_gui_function("worldedit_gui_param2", {
+	name = "Set Param2",
+	privs = we_privs("param2"),
+	get_formspec = function(name)
+		local value = gui_param2[name] or "0"
+		return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_param2") ..
+			"textarea[0.5,1;5,2;;;Some values may break the node!]"..
+			string.format("field[0.5,2.5;2,0.8;worldedit_gui_param2_value;New Param2;%s]", minetest.formspec_escape(value)) ..
+			"field_close_on_enter[worldedit_gui_param2_value;false]" ..
+			"button_exit[3.5,2.5;3,0.8;worldedit_gui_param2_submit;Set Param2]"
+	end,
+})
+
+worldedit.register_gui_handler("worldedit_gui_param2", function(name, fields)
+	local cg = {
+		worldedit_gui_param2_value = gui_param2,
+	}
+	local ret = handle_changes(name, "worldedit_gui_param2", fields, cg)
+	if fields.worldedit_gui_param2_submit then
+		copy_changes(name, fields, cg)
+		worldedit.show_page(name, "worldedit_gui_param2")
+
+		execute_worldedit_command("param2", name, gui_param2[name])
+		return true
+	end
+	return ret
+end)

worldedit_gui/init.lua

@@ -80,6 +80,9 @@ if minetest.global_exists("unified_inventory") then -- unified inventory install
 	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)