Don't crash on nil-player in can_dig and check the right players for attachment in...

[xdecor.git] / recipes.lua

diff --git a/recipes.lua b/recipes.lua
index 116e23f103440cb4cd3b44bff53ef5f1df1c1887..33ea2c8fe5cc1dccb3c26fe35f686c3d8f664f5f 100644 (file)
--- a/recipes.lua
+++ b/recipes.lua
@@ -47,18 +47,10 @@ minetest.register_craft({
        }
 })
 
-minetest.register_craft({ 
-       output = "realchess:chessboard",
-       recipe = {
-               {"dye:black", "dye:white", "dye:black"},
-               {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
-       } 
-})
-
 minetest.register_craft({
-       output = "xdecor:cushion 3",
+       output = "xdecor:cactusbrick",
        recipe = {
-               {"wool:red", "wool:red", "wool:red"}
+               {"default:brick", "default:cactus"}
        }
 })
 
@@ -71,6 +63,14 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({ 
+       output = "realchess:chessboard",
+       recipe = {
+               {"dye:black", "dye:white", "dye:black"},
+               {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
+       } 
+})
+
 minetest.register_craft({
        output = "xdecor:chair",
        recipe = {
@@ -89,36 +89,32 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:cobble_wall_ln 6",
+       output = "xdecor:cobweb",
        recipe = {
-               {"default:cobble", "default:cobble", "default:cobble"},
-               {"default:cobble", "default:cobble", "default:cobble"}
+               {"farming:cotton", "", "farming:cotton"},
+               {"", "farming:cotton", ""},
+               {"farming:cotton", "", "farming:cotton"}
        }
 })
 
-minetest.register_craft({
-       output = "xdecor:crate",
-       recipe = {
-               {"group:wood", "group:wood", "group:stick"},
-               {"group:wood", "group:stick", "group:wood"},
-               {"group:stick", "group:wood", "group:wood"}
-       }
+minetest.register_craft({ 
+       output = "xdecor:crafting_guide",
+       type = "shapeless",
+       recipe = {"default:book"}
 })
 
 minetest.register_craft({
-       output = "xdecor:mossycobble_wall_ln 6",
+       output = "xdecor:cushion 3",
        recipe = {
-               {"default:mossycobble", "default:mossycobble", "default:mossycobble"},
-               {"default:mossycobble", "default:mossycobble", "default:mossycobble"}
+               {"wool:red", "wool:red", "wool:red"}
        }
 })
 
 minetest.register_craft({
-       output = "xdecor:cobweb",
+       output = "xdecor:cushion_block",
        recipe = {
-               {"farming:cotton", "", "farming:cotton"},
-               {"", "farming:cotton", ""},
-               {"farming:cotton", "", "farming:cotton"}
+               {"xdecor:cushion"},
+               {"xdecor:cushion"}
        }
 })
 
@@ -158,14 +154,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:flint_steel",
-       recipe = {
-               {"default:obsidian_shard", "default:steel_ingot"}
-       }
-})
-
-minetest.register_craft({
-       output = "xdecor:frame",
+       output = "xdecor:itemframe",
        recipe = {
                {"group:stick", "group:stick", "group:stick"},
                {"group:stick", "default:paper", "group:stick"},
@@ -214,15 +203,6 @@ minetest.register_craft({
                {"group:leaves"}
        }
 })
-
-minetest.register_craft({
-       output = "xdecor:japanese_door",
-       recipe = {
-               {"group:wood", "default:paper"},
-               {"default:paper", "group:wood"},
-               {"group:wood", "default:paper"}
-       }
-})
        
 minetest.register_craft({
        output = "xdecor:lantern",
@@ -233,6 +213,14 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = "xdecor:lever_off",
+       recipe = {
+               {"group:stick"},
+               {"group:stone"}
+       }
+})
+
 minetest.register_craft({
        output = "xdecor:mailbox",
        recipe = {
@@ -242,6 +230,13 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = "xdecor:moonbrick",
+       recipe = {
+               {"default:brick", "default:stone"}
+       }
+})
+
 minetest.register_craft({
        output = "xdecor:multishelf",
        recipe = {
@@ -262,26 +257,20 @@ minetest.register_craft({
 minetest.register_craft({
        output = "xdecor:painting_1",
        recipe = {
-               {"default:sign_wall", "dye:blue"}
+               {"default:sign_wall_wood", "dye:blue"}
        }
 })
 
 minetest.register_craft({
-       output = "xdecor:prison_door",
-       recipe = {
-               {"xpanes:bar", "xpanes:bar"},
-               {"xpanes:bar", "xpanes:bar"},
-               {"xpanes:bar", "xpanes:bar"}
-       }
+       output = "xdecor:pressure_stone_off",
+       type = "shapeless",
+       recipe = {"group:stone", "group:stone"}
 })
 
 minetest.register_craft({
-       output = "xdecor:prison_rust_door",
-       recipe = {
-               {"xpanes:rust_bar", "xpanes:rust_bar"},
-               {"xpanes:rust_bar", "xpanes:rust_bar"},
-               {"xpanes:rust_bar", "xpanes:rust_bar"}
-       }
+       output = "xdecor:pressure_wood_off",
+       type = "shapeless",
+       recipe = {"group:wood", "group:wood"}
 })
 
 minetest.register_craft({
@@ -292,24 +281,6 @@ minetest.register_craft({
                {"farming:string"}
        }
 })
-
-minetest.register_craft({
-       output = "xdecor:screen_door",
-       recipe = {
-               {"group:wood", "group:wood"},
-               {"xpanes:chainlink", "xpanes:chainlink"},
-               {"group:wood", "group:wood"}
-       }
-})
-
-minetest.register_craft({
-       output = "xdecor:slide_door",
-       recipe = {
-               {"default:paper", "default:paper"},
-               {"default:paper", "default:paper"},
-               {"group:wood", "group:wood"}
-       }
-})
        
 minetest.register_craft({
        output = "xdecor:stone_tile 2",
@@ -353,6 +324,15 @@ minetest.register_craft({
        } 
 })
 
+minetest.register_craft({
+       output = "xdecor:trampoline",
+       recipe = {
+               {"farming:string", "farming:string", "farming:string"},
+               {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+               {"default:steel_ingot", "", "default:steel_ingot"}
+       }
+})
+
 minetest.register_craft({
        output = "xdecor:tv",
        recipe = {
@@ -363,7 +343,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:worktable",
+       output = "xdecor:workbench",
        recipe = {
                {"group:wood", "group:wood"},
                {"group:wood", "group:wood"}
@@ -397,12 +377,3 @@ minetest.register_craft({
        }
 })
 
-minetest.register_craft({
-       output = "xdecor:woodglass_door",
-       recipe = {
-               {"default:glass", "default:glass"},
-               {"group:wood", "group:wood"},
-               {"group:wood", "group:wood"}
-       }
-})
-