From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 10 Jul 2019 18:27:30 +0000 (-0400)
Subject: Alias empty shelf if moreblocks is enabled (#108)
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=f78fce959c778aa777f4a3a63a7278259ba0607d;p=xdecor.git

Alias empty shelf if moreblocks is enabled (#108)
---

diff --git a/src/nodes.lua b/src/nodes.lua
index 969a803..7bf1a0f 100644
--- a/src/nodes.lua
+++ b/src/nodes.lua
@@ -95,11 +95,15 @@ register_storage("cabinet_half", "Half Wooden Cabinet", {
 		 "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png"}
 })
 
-register_storage("empty_shelf", "Empty Shelf", {
-	on_rotate = screwdriver.rotate_simple,
-	tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
-		 "default_wood.png", "default_wood.png^xdecor_empty_shelf.png"}
-})
+if minetest.get_modpath("moreblocks") then
+	minetest.register_alias("xdecor:empty_shelf", "moreblocks:empty_shelf")
+else
+	register_storage("empty_shelf", "Empty Shelf", {
+		on_rotate = screwdriver.rotate_simple,
+		tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
+			 "default_wood.png", "default_wood.png^xdecor_empty_shelf.png"}
+	})
+end
 
 register_storage("multishelf", "Multi Shelf", {
 	on_rotate = screwdriver.rotate_simple,
diff --git a/src/recipes.lua b/src/recipes.lua
index cb7ad19..928f31b 100644
--- a/src/recipes.lua
+++ b/src/recipes.lua
@@ -95,14 +95,16 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "xdecor:empty_shelf",
-	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"", "", ""},
-		{"group:wood", "group:wood", "group:wood"}
-	}
-})
+if not minetest.get_modpath("moreblocks") then
+	minetest.register_craft({
+		output = "xdecor:empty_shelf",
+		recipe = {
+			{"group:wood", "group:wood", "group:wood"},
+			{"", "", ""},
+			{"group:wood", "group:wood", "group:wood"}
+		}
+	})
+end
 
 minetest.register_craft({
 	output = "xdecor:enderchest",