From f9311b2b15b2a63845d551be6aaab1d056262fe1 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 10 Dec 2016 21:43:38 +0100
Subject: Move wand.lua to worldedit_commands

---
 worldedit/init.lua          |  1 -
 worldedit/wand.lua          | 34 ----------------------------------
 worldedit_commands/init.lua |  1 +
 worldedit_commands/wand.lua | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 worldedit/wand.lua
 create mode 100644 worldedit_commands/wand.lua

diff --git a/worldedit/init.lua b/worldedit/init.lua
index 343a1e4..0305c4d 100644
--- a/worldedit/init.lua
+++ b/worldedit/init.lua
@@ -36,7 +36,6 @@ load_module(path .. "/visualization.lua")
 load_module(path .. "/serialization.lua")
 load_module(path .. "/code.lua")
 load_module(path .. "/compatibility.lua")
-load_module(path .. "/wand.lua")
 load_module(path .. "/cuboid.lua")
 
 
diff --git a/worldedit/wand.lua b/worldedit/wand.lua
deleted file mode 100644
index faf9402..0000000
--- a/worldedit/wand.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-minetest.register_tool("worldedit:wand", {
-	description = "WorldEdit Wand tool, Left-click to set 1st position, right-click to set 2nd",
-	inventory_image = "worldedit_wand.png",
-	stack_max = 1, -- there is no need to have more than one
-	liquids_pointable = true, -- ground with only water on can be selected as well
-	-- the tool_capabilities are completely irrelevant here - no need to dig
-	tool_capabilities = {
-		full_punch_interval = 1.0,
-		max_drop_level = 0,
-		groupcaps={
-			fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-			snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-			choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
-		}
-	},
-
-	on_use = function(itemstack, placer, pointed_thing)
-		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
-			local name = placer:get_player_name()
-			worldedit.pos1[name] = pointed_thing.under
-			worldedit.mark_pos1(name)
-		end
-		return itemstack -- nothing consumed, nothing changed
-	end,
-
-	on_place = function(itemstack, placer, pointed_thing) -- Left Click
-		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
-			local name = placer:get_player_name()
-			worldedit.pos2[name] = pointed_thing.under
-			worldedit.mark_pos2(name)
-		end
-		return itemstack -- nothing consumed, nothing changed
-	end,
-})
diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index b9313cc..088191c 100644
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -12,6 +12,7 @@ end
 
 dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")
 dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")
+dofile(minetest.get_modpath("worldedit_commands") .. "/wand.lua")
 local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")
 
 local function get_position(name) --position 1 retrieval function for when not using `safe_region`
diff --git a/worldedit_commands/wand.lua b/worldedit_commands/wand.lua
new file mode 100644
index 0000000..79d9eb2
--- /dev/null
+++ b/worldedit_commands/wand.lua
@@ -0,0 +1,34 @@
+minetest.register_tool(":worldedit:wand", {
+	description = "WorldEdit Wand tool, Left-click to set 1st position, right-click to set 2nd",
+	inventory_image = "worldedit_wand.png",
+	stack_max = 1, -- there is no need to have more than one
+	liquids_pointable = true, -- ground with only water on can be selected as well
+	-- the tool_capabilities are completely irrelevant here - no need to dig
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level = 0,
+		groupcaps={
+			fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+			snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+			choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
+		}
+	},
+
+	on_use = function(itemstack, placer, pointed_thing)
+		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
+			local name = placer:get_player_name()
+			worldedit.pos1[name] = pointed_thing.under
+			worldedit.mark_pos1(name)
+		end
+		return itemstack -- nothing consumed, nothing changed
+	end,
+
+	on_place = function(itemstack, placer, pointed_thing) -- Left Click
+		if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then
+			local name = placer:get_player_name()
+			worldedit.pos2[name] = pointed_thing.under
+			worldedit.mark_pos2(name)
+		end
+		return itemstack -- nothing consumed, nothing changed
+	end,
+})
-- 
cgit v1.2.3