From fb1b620316efb943566fee5412a713b2fa3545e7 Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Tue, 8 Sep 2015 09:24:01 +0200
Subject: [PATCH] add placeholders as not-buildable_to nodes, that can be set
 to prevent other nodes to build or expanded into expansions

this fixes #292
---
 homedecor/handlers/expansion.lua    | 21 ++++++++++++++++++++-
 homedecor/handlers/registration.lua | 10 +++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/homedecor/handlers/expansion.lua b/homedecor/handlers/expansion.lua
index 75b40ebb..1c44bdcb 100644
--- a/homedecor/handlers/expansion.lua
+++ b/homedecor/handlers/expansion.lua
@@ -23,6 +23,19 @@ homedecor.fdir_to_fwd = {
 	{ -1,  0 },
 }
 
+local placeholder_node = "homedecor:expansion_placeholder"
+minetest.register_node(placeholder_node, {
+	description = "Expansion placeholder (you hacker you!)",
+	groups = { not_in_creative_inventory=1 },
+	drawtype = "airlike",
+	paramtype = "light",
+	walkable = false,
+	selection_box = { type = "fixed", fixed = { 0, 0, 0, 0, 0, 0 } },
+	is_ground_content = false,
+	sunlight_propagates = true,
+	buildable_to = false,
+})
+
 -- selects which node was pointed at based on it being known, and either clickable or buildable_to
 local function select_node(pointed_thing)
 	local pos = pointed_thing.under
@@ -52,7 +65,13 @@ local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2)
 		local fdir = fdir or minetest.dir_to_facedir(placer:get_look_dir())
 		minetest.set_node(pos, { name = node1, param2 = fdir })
 		node2 = node2 or "air" -- this can be used to clear buildable_to nodes even though we are using a multinode mesh
-		minetest.set_node(pos2, { name = node2, param2 = (node2 ~= "air" and fdir) or nil })
+		-- do not assume by default, as we still might want to allow overlapping in some cases
+		local has_facedir = node2 ~= "air"
+		if node2 == "placeholder" then
+			has_facedir = false
+			node2 = placeholder_node
+		end
+		minetest.set_node(pos2, { name = node2, param2 = (has_facedir and fdir) or nil })
 
 		-- call after_place_node of the placed node if available
 		local ctrl_node_def = minetest.registered_nodes[node1]
diff --git a/homedecor/handlers/registration.lua b/homedecor/handlers/registration.lua
index a1402521..b25378fa 100644
--- a/homedecor/handlers/registration.lua
+++ b/homedecor/handlers/registration.lua
@@ -1,5 +1,6 @@
 homedecor = homedecor or {}
 local S = homedecor.gettext
+local placeholder_node = "homedecor:expansion_placeholder"
 
 --wrapper around minetest.register_node that sets sane defaults and interprets some specialized settings
 function homedecor.register(name, original_def)
@@ -59,7 +60,8 @@ function homedecor.register(name, original_def)
 		def.after_dig_node = def.after_dig_node or function(pos, oldnode, oldmetadata, digger)
 			if expand.top and expand.forward ~= "air" then
 				local top_pos = { x=pos.x, y=pos.y+1, z=pos.z }
-				if minetest.get_node(top_pos).name == expand.top then
+				local node = minetest.get_node(top_pos).name
+				if node == expand.top or node == placeholder_node then
 					minetest.remove_node(top_pos)
 				end
 			end
@@ -69,13 +71,15 @@ function homedecor.register(name, original_def)
 
 			if expand.right and expand.forward ~= "air" then
 				local right_pos = { x=pos.x+homedecor.fdir_to_right[fdir+1][1], y=pos.y, z=pos.z+homedecor.fdir_to_right[fdir+1][2] }
-				if minetest.get_node(right_pos).name == expand.right then
+				local node = minetest.get_node(right_pos).name
+				if node == expand.right or node == placeholder_node then
 					minetest.remove_node(right_pos)
 				end
 			end
 			if expand.forward and expand.forward ~= "air" then
 				local forward_pos = { x=pos.x+homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+homedecor.fdir_to_fwd[fdir+1][2] }
-				if minetest.get_node(forward_pos).name == expand.forward then
+				local node = minetest.get_node(forward_pos).name
+				if node == expand.forward or node == placeholder_node then
 					minetest.remove_node(forward_pos)
 				end
 			end