Add //fixliquid chatcommand

Author: MoNTE48

ChatCommands.md

@@ -234,7 +234,7 @@ Can also create shapes other than cylinders, e.g. cones (see documentation above
     //cylinder y 10 10 0 walls:cobble
     //cylinder x 6 0 5 Dirt
     //cylinder z 20 10 20 default:desert_stone
-    
+
 ### `//hollowpyramid x/y/z/? <height> <node>`
 
 Add hollow pyramid centered at WorldEdit position 1 along the given axis with height `<height>` composed of `<node>`.
@@ -345,6 +345,12 @@ Fixes the lighting in the current WorldEdit region.
 
     //fixlight
 
+### `//fixliquid`
+
+Fixes the liquids in the current WorldEdit region.
+
+    //fixliquid
+
 ### `//drain`
 
 Removes any fluid node within the current WorldEdit region.
@@ -447,11 +453,11 @@ This mode can be left with `//mtschemprob finish`. `//mtschemprob get` will disp
 Clears all objects within the WorldEdit region.
 
     //clearobjects
-    
+
 ### `//shift x/y/z/?/up/down/left/right/front/back [+/-]<amount>`
 
 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`). 
+The shifting axis can be absolute (`x/y/z`) or relative (`up/down/left/right/front/back`).
 
 		//shift left 5
 
@@ -461,22 +467,22 @@ 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]`
 
 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 [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 using `h`
 or vertically in the y axis using `v`.
 
 		//outset v 5
-		
+
 ### `//inset [h/v] <amount>`
 
 Contracts the selection in all directions by `<amount>`. If specified,

worldedit/manipulations.lua

@@ -624,13 +624,25 @@ function worldedit.fixlight(pos1, pos2)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
 
 	local vmanip = minetest.get_voxel_manip(pos1, pos2)
+	vmanip:calc_lighting()
 	vmanip:write_to_map()
-	vmanip:update_map() -- this updates the lighting
 
 	return worldedit.volume(pos1, pos2)
 end
 
 
+--- Attempts to fix the liquid in a region.
+-- @return The number of nodes updated.
+function worldedit.fixliquid(pos1, pos2)
+	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+	local vmanip = minetest.get_voxel_manip(pos1, pos2)
+	vmanip:update_liquids()
+	vmanip:write_to_map()
+
+	return worldedit.volume(pos1, pos2)
+end
+
 --- Clears all objects in a region.
 -- @return The number of objects cleared.
 function worldedit.clear_objects(pos1, pos2)

worldedit_commands/init.lua

@@ -328,7 +328,7 @@ worldedit.register_command("help", {
 		else
 			local def = worldedit.registered_commands[param]
 			if not def then
-				return false, S("Command not available: ") .. param
+				return false, S("Command not available: @1", param)
 			else
 				return true, format_help_line(param, def)
 			end
@@ -1236,6 +1236,18 @@ worldedit.register_command("fixlight", {
 	end,
 })
 
+worldedit.register_command("fixliquid", {
+	params = "",
+	description = S("Fix the liquids in the current WorldEdit region"),
+	privs = {worldedit=true},
+	require_pos = 2,
+	nodes_needed = check_region,
+	func = function(name)
+		local count = worldedit.fixliquid(worldedit.pos1[name], worldedit.pos2[name])
+		worldedit.player_notify(name, S("@1 nodes updated", count))
+	end,
+})
+
 worldedit.register_command("drain", {
 	params = "",
 	description = S("Remove any fluid node within the current WorldEdit region"),

worldedit_commands/locale/template.txt

@@ -28,7 +28,7 @@ Get help for WorldEdit commands=
 You are not allowed to use any WorldEdit commands.=
 Available commands: @1@nUse '//help <cmd>' to get more information, or '//help all' to list everything.=
 Available commands:@n=
-Command not available: =
+Command not available: @1=
 Enable or disable node inspection=
 inspector: inspection enabled for @1, currently facing the @2 axis=
 inspector: inspection disabled=
@@ -100,6 +100,7 @@ invalid usage: angle must be multiple of 90=
 Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)=
 @1 nodes oriented=
 Fix the lighting in the current WorldEdit region=
+Fix the liquids in the current WorldEdit region=
 @1 nodes updated=
 Remove any fluid node within the current WorldEdit region=
 Remove any plant, tree or foliage-like nodes in the selected region=

worldedit_commands/locale/worldedit_commands.de.tr

@@ -39,7 +39,7 @@ Get help for WorldEdit commands=Hilfe für WorldEdit-Befehle erhalten
 You are not allowed to use any WorldEdit commands.=Ihnen ist nicht erlaubt WorldEdit-Befehle zu nutzen.
 Available commands: @1@nUse '//help <cmd>' to get more information, or '//help all' to list everything.=Verfügbare Befehle: @1@n„//help <Befehl>“ benutzen, um mehr Informationen zu erhalten, oder „//help all“, um alles aufzulisten.
 Available commands:@n=Verfügbare Befehle:@n
-Command not available: =Befehl nicht verfügbar: 
+Command not available: @1=Befehl nicht verfügbar: @1
 Enable or disable node inspection=Inspizieren von Blöcken ein- oder ausschalten
 inspector: inspection enabled for @1, currently facing the @2 axis=Inspektur: für @1 aktiviert, aktuell der @2-Achse zugewandt
 inspector: inspection disabled=Inspektur: deaktiviert
@@ -111,6 +111,7 @@ invalid usage: angle must be multiple of 90=Ungültige Verwendung: Winkel muss e
 Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)=
 @1 nodes oriented=
 Fix the lighting in the current WorldEdit region=Belichtung im aktuellen WorldEdit-Gebiet korrigieren
+Fix the liquids in the current WorldEdit region=Fixierung der Flüssigkeiten in der aktuellen WorldEdit-Gebiet
 @1 nodes updated=@1 Blöcke verändert
 Remove any fluid node within the current WorldEdit region=Alle flüssigen Blöcke im WorldEdit-Gebiet entfernen
 Remove any plant, tree or foliage-like nodes in the selected region=Alle Pflanzen, Baum oder Laub-ähnliche Blöcke im WorldEdit-Gebiet entfernen

worldedit_commands/locale/worldedit_commands.ru.tr

@@ -16,7 +16,7 @@ Get help for WorldEdit commands=Вывести информацию об исп
 You are not allowed to use any WorldEdit commands.=У вас нет привилегий, чтобы использовать команды WorldEdit.
 Available commands: @1@nUse '//help <cmd>' to get more information, or '//help all' to list everything.=Доступные команды: @1@nИспользуйте '//help <cmd>' для получения информации по команде или '//help all' для вывода подсказок по всем командам.
 Available commands:@n=Доступные команды:@n
-Command not available: =Команда не найдена:
+Command not available: @1=Команда не найдена: @1
 Enable or disable node inspection=Включить/отключить инспекцию блоков
 inspector: inspection enabled for @1, currently facing the @2 axis=inspector: инспекция включена для @1, текущий взор в направлении оси @2
 inspector: inspection disabled=inspector: инспекция отключена
@@ -88,6 +88,7 @@ invalid usage: angle must be multiple of 90=недопустимое испол
 Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)=Повернуть блоки в текущем WorldEdit-регионе вокруг оси Y на угол <angle> (шаг - 90 градусов)
 @1 nodes oriented=повёрнуто @1 нод(а/ы)
 Fix the lighting in the current WorldEdit region=Исправить освещение в текущем WorldEdit-регионе
+Fix the liquids in the current WorldEdit region=Исправить плавучие жидкости в текущем WorldEdit-регионе
 @1 nodes updated=обновлено @1 нод(а/ы)
 Remove any fluid node within the current WorldEdit region=Удалить любые жидкости в текущем WorldEdit-регионе
 Remove any plant, tree or foliage-like nodes in the selected region=Удалить любые растения, деревья или листье-подобные ноды в текущем WorldEdit-регионе