Alias empty shelf if moreblocks is enabled (#108)

diff --git a/src/nodes.lua b/src/nodes.lua
index 969a8038338031bf2c3c5a531ef878e4c4576b4f..7bf1a0f5c5c093e225ba80a24f47efd6219aed45 100644 (file)
--- 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 cb7ad1927ca77a6c30ca5d6b97ae5117a325fc9f..928f31b635af2fe12c26d76b396bb52aa3527f12 100644 (file)
--- 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",