From 70f7e64371baba78d97d38fe38b7e7fbed2142d7 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sun, 10 May 2020 23:29:49 +0100 Subject: [PATCH] =?UTF-8?q?worldedit=20=E2=86=92=20worldeditadditions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldeditadditions/ellipsoid.lua | 2 +- worldeditadditions/floodfill.lua | 2 +- worldeditadditions/overlay.lua | 4 ++-- worldeditadditions/torus.lua | 2 +- worldeditadditions_commands/commands/ellipsoid.lua | 4 ++-- worldeditadditions_commands/commands/floodfill.lua | 2 +- worldeditadditions_commands/commands/torus.lua | 4 ++-- worldeditadditions_commands/depends.txt | 1 + 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/worldeditadditions/ellipsoid.lua b/worldeditadditions/ellipsoid.lua index 3c86fe6..3577cfc 100644 --- a/worldeditadditions/ellipsoid.lua +++ b/worldeditadditions/ellipsoid.lua @@ -1,7 +1,7 @@ --- Overlap command. Places a specified node on top of -- @module worldeditadditions.overlay -function worldedit.ellipsoid(position, radius, target_node, hollow) +function worldeditadditions.ellipsoid(position, radius, target_node, hollow) -- position = { x, y, z } local hollow_inner_radius = { x = radius.x - 1, diff --git a/worldeditadditions/floodfill.lua b/worldeditadditions/floodfill.lua index 608decf..79af1e2 100644 --- a/worldeditadditions/floodfill.lua +++ b/worldeditadditions/floodfill.lua @@ -43,7 +43,7 @@ end ------------------------------------------------------------------------------- -function worldedit.floodfill(start_pos, radius, replace_node) +function worldeditadditions.floodfill(start_pos, radius, replace_node) -- Calculate the area we want to modify local pos1 = vector.add(start_pos, { x = radius, y = 0, z = radius }) local pos2 = vector.subtract(start_pos, { x = radius, y = radius, z = radius }) diff --git a/worldeditadditions/overlay.lua b/worldeditadditions/overlay.lua index 6cfb7ba..9c77348 100644 --- a/worldeditadditions/overlay.lua +++ b/worldeditadditions/overlay.lua @@ -12,8 +12,8 @@ function worldeditadditions.overlay(pos1, pos2, target_node) local node_id_air = minetest.get_content_id("air") local node_id_target = minetest.get_content_id(target_node) - minetest.log("action", "pos1: " .. worldeditadditions.vector.tostring(pos1)) - minetest.log("action", "pos2: " .. worldeditadditions.vector.tostring(pos2)) + -- minetest.log("action", "pos1: " .. worldeditadditions.vector.tostring(pos1)) + -- minetest.log("action", "pos2: " .. worldeditadditions.vector.tostring(pos2)) -- z y x is the preferred loop order, but that isn't really possible here diff --git a/worldeditadditions/torus.lua b/worldeditadditions/torus.lua index 259f2aa..df4734f 100644 --- a/worldeditadditions/torus.lua +++ b/worldeditadditions/torus.lua @@ -1,7 +1,7 @@ --- Overlap command. Places a specified node on top of -- @module worldeditadditions.overlay -function worldedit.torus(position, major_radius, minor_radius, target_node, hollow) +function worldeditadditions.torus(position, major_radius, minor_radius, target_node, hollow) -- position = { x, y, z } local total_radius = major_radius + minor_radius local inner_minor_radius = minor_radius - 2 diff --git a/worldeditadditions_commands/commands/ellipsoid.lua b/worldeditadditions_commands/commands/ellipsoid.lua index 7d64b83..7eedf11 100644 --- a/worldeditadditions_commands/commands/ellipsoid.lua +++ b/worldeditadditions_commands/commands/ellipsoid.lua @@ -44,7 +44,7 @@ worldedit.register_command("ellipsoid", { end, func = function(name, target_node, radius) local start_time = os.clock() - local replaced = worldedit.ellipsoid(worldedit.pos1[name], radius, target_node, false) + local replaced = worldeditadditions.ellipsoid(worldedit.pos1[name], radius, target_node, false) local time_taken = os.clock() - start_time minetest.log("action", name .. " used //ellipsoid at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s") @@ -67,7 +67,7 @@ worldedit.register_command("hollowellipsoid", { end, func = function(name, target_node, radius) local start_time = os.clock() - local replaced = worldedit.ellipsoid(worldedit.pos1[name], radius, target_node, true) + local replaced = worldeditadditions.ellipsoid(worldedit.pos1[name], radius, target_node, true) local time_taken = os.clock() - start_time minetest.log("action", name .. " used //hollowellipsoid at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s") diff --git a/worldeditadditions_commands/commands/floodfill.lua b/worldeditadditions_commands/commands/floodfill.lua index 36fbd1b..1d361a1 100644 --- a/worldeditadditions_commands/commands/floodfill.lua +++ b/worldeditadditions_commands/commands/floodfill.lua @@ -36,7 +36,7 @@ worldedit.register_command("floodfill", { end, func = function(name, replace_node, radius) local start_time = os.clock() - local nodes_replaced = worldedit.floodfill(worldedit.pos1[name], radius, replace_node) + local nodes_replaced = worldeditadditions.floodfill(worldedit.pos1[name], radius, replace_node) local time_taken = os.clock() - start_time if nodes_replaced == false then diff --git a/worldeditadditions_commands/commands/torus.lua b/worldeditadditions_commands/commands/torus.lua index cbb5885..355e3d0 100644 --- a/worldeditadditions_commands/commands/torus.lua +++ b/worldeditadditions_commands/commands/torus.lua @@ -42,7 +42,7 @@ worldedit.register_command("torus", { end, func = function(name, target_node, major_radius, minor_radius) local start_time = os.clock() - local replaced = worldedit.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, false) + local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, false) local time_taken = os.clock() - start_time minetest.log("action", name .. " used //torus at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s") @@ -65,7 +65,7 @@ worldedit.register_command("hollowtorus", { end, func = function(name, target_node, major_radius, minor_radius) local start_time = os.clock() - local replaced = worldedit.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, true) + local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, true) local time_taken = os.clock() - start_time minetest.log("action", name .. " used //hollowtorus at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s") diff --git a/worldeditadditions_commands/depends.txt b/worldeditadditions_commands/depends.txt index a81bd47..4802a24 100644 --- a/worldeditadditions_commands/depends.txt +++ b/worldeditadditions_commands/depends.txt @@ -1,3 +1,4 @@ worldeditadditions worldedit_commands worldedit +bonemeal?