From 780df105ea4ef467fccccc928217fca9efea1d93 Mon Sep 17 00:00:00 2001
From: Foz <fozolo@gmail.com>
Date: Fri, 22 Apr 2016 21:47:04 -0400
Subject: [PATCH] Stop assuming stair and slab aliases are required.

Only make aliases automatically for stairs and slabs from MTG stairs mod. Let other mods worry about aliasing themselves.  Fixes minetest-mods/moreblocks#45
---
 depends.txt                  |  9 +++++----
 stairsplus/registrations.lua | 11 +++++++++--
 stairsplus/slabs.lua         |  1 -
 stairsplus/stairs.lua        |  1 -
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/depends.txt b/depends.txt
index 74e8624..e8ecf06 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,4 +1,5 @@
-default
-intllib?
-farming?
-wool?
+default
+intllib?
+stairs?
+farming?
+wool?
diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua
index 0fc6785..cca9fa6 100644
--- a/stairsplus/registrations.lua
+++ b/stairsplus/registrations.lua
@@ -67,7 +67,10 @@ for _, name in pairs(default_nodes) do
 		ndef.tiles = {ndef.tiles[1]}
 	end
 
-	stairsplus:register_all("moreblocks", name, nodename, ndef)
+	mod = "moreblocks"
+	stairsplus:register_all(mod, name, nodename, ndef)
+	minetest.register_alias_force("stairs:stair_" .. name, mod .. ":stair_" .. name)
+	minetest.register_alias_force("stairs:slab_"  .. name, mod .. ":slab_"  .. name)
 end
 
 -- farming registrations
@@ -78,7 +81,11 @@ if minetest.get_modpath("farming") then
 		local nodename = mod .. ":" .. name
 		local ndef = table.copy(minetest.registered_nodes[nodename])
 		ndef.sunlight_propagates = true
-		stairsplus:register_all("moreblocks", name, nodename, ndef)
+
+		mod = "moreblocks"
+		stairsplus:register_all(mod, name, nodename, ndef)
+		minetest.register_alias_force("stairs:stair_" .. name, mod .. ":stair_" .. name)
+		minetest.register_alias_force("stairs:slab_"  .. name, mod .. ":slab_"  .. name)
 	end
 end
 
diff --git a/stairsplus/slabs.lua b/stairsplus/slabs.lua
index ea9dbc5..8432c7e 100644
--- a/stairsplus/slabs.lua
+++ b/stairsplus/slabs.lua
@@ -101,7 +101,6 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 		end
 		minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def)
 	end
-	minetest.register_alias("stairs:slab_" .. subname, modname .. ":slab_" .. subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
diff --git a/stairsplus/stairs.lua b/stairsplus/stairs.lua
index 0291e7d..be5ac26 100644
--- a/stairsplus/stairs.lua
+++ b/stairsplus/stairs.lua
@@ -141,7 +141,6 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 		end
 		minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def)
 	end
-	minetest.register_alias("stairs:stair_" .. subname, modname .. ":stair_" .. subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}