1 files changed, 125 insertions, 50 deletions
diff --git a/moreblocks/crafting.lua b/moreblocks/crafting.lua
index 8741c53..b6432c7 100644
--- a/moreblocks/crafting.lua
+++ b/moreblocks/crafting.lua
@@ -12,12 +12,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "default:stick",
-	recipe = {{"default:sapling"},}
-})
-
-minetest.register_craft({
-	output = "default:stick",
-	recipe = {{"default:junglesapling"},}
+	recipe = {{"group:sapling"},}
 })
 
 minetest.register_craft({
@@ -35,43 +30,32 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:dirt_with_grass",
-	type = "shapeless",
-	recipe = {"default:mese", "default:dirt"},
-})
-
-minetest.register_craft({
 	output = "default:mossycobble",
 	type = "shapeless",
 	recipe = {"default:junglegrass", "default:cobble"},
 })
 
 minetest.register_craft({
-	output = "default:mossycobble",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "default:cobble"},
-})
-
-minetest.register_craft({
 	output = "moreblocks:wood_tile 9",
 	recipe = {
-		{"default:wood", "default:wood", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
 	}
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_flipped",
-	recipe = {{"moreblocks:wood_tile"},}
+	type = "shapeless",
+	output = "moreblocks:wood_tile",
+	recipe = {"moreblocks:wood_tile_flipped"}
 })
 
 minetest.register_craft({
 	output = "moreblocks:wood_tile_center 9",
 	recipe = {
-		{"default:wood", "default:wood", "default:wood"},
-		{"default:wood", "moreblocks:wood_tile", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "moreblocks:wood_tile", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
 	}
 })
 
@@ -84,7 +68,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_up",
+	output = "moreblocks:wood_tile_offset",
 	recipe = {
 		{"default:stick"},
 		{"moreblocks:wood_tile_center"},
@@ -92,25 +76,21 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_down",
-	recipe = {
-		{"moreblocks:wood_tile_center"},
-		{"default:stick"},
-	}
+	type = "shapeless",
+	output = "moreblocks:wood_tile_offset",
+	recipe = {"moreblocks:wood_tile_down"}
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_left",
-	recipe = {
-		{"default:stick", "moreblocks:wood_tile_center"},
-	}
+	type = "shapeless",
+	output = "moreblocks:wood_tile_offset",
+	recipe = {"moreblocks:wood_tile_left"}
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_right",
-	recipe = {
-		{"moreblocks:wood_tile_center", "default:stick"},
-	}
+	type = "shapeless",
+	output = "moreblocks:wood_tile_offset",
+	recipe = {"moreblocks:wood_tile_right"}
 })
 
 minetest.register_craft({
@@ -141,6 +121,33 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	output = "moreblocks:all_faces_pine_tree 8",
+	recipe = {
+		{"default:pine_tree", "default:pine_tree", "default:pine_tree"},
+		{"default:pine_tree", "", "default:pine_tree"},
+		{"default:pine_tree", "default:pine_tree", "default:pine_tree"},
+	}
+})
+
+minetest.register_craft({
+	output = "moreblocks:all_faces_acacia_tree 8",
+	recipe = {
+		{"default:acacia_tree", "default:acacia_tree", "default:acacia_tree"},
+		{"default:acacia_tree", "", "default:acacia_tree"},
+		{"default:acacia_tree", "default:acacia_tree", "default:acacia_tree"},
+	}
+})
+
+minetest.register_craft({
+	output = "moreblocks:all_faces_aspen_tree 8",
+	recipe = {
+		{"default:aspen_tree", "default:aspen_tree", "default:aspen_tree"},
+		{"default:aspen_tree", "", "default:aspen_tree"},
+		{"default:aspen_tree", "default:aspen_tree", "default:aspen_tree"},
+	}
+})
+
+minetest.register_craft({
 	output = "moreblocks:sweeper 4",
 	recipe = {
 		{"default:junglegrass"},
@@ -164,12 +171,20 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:split_stone_tile_alt",
+	output = "moreblocks:checker_stone_tile",
 	recipe = {
 		{"moreblocks:split_stone_tile"},
 	}
 })
 
+-- When approaching the below craft, loop back to cobblestone, which can then be used to craft stone tiles again
+minetest.register_craft({
+	output = "default:cobble",
+	recipe = {
+		{"moreblocks:checker_stone_tile"},
+	}
+})
+
 minetest.register_craft({
 	output = "moreblocks:grey_bricks 2",
 	type = "shapeless",
@@ -183,11 +198,33 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:empty_bookshelf",
+	output = "moreblocks:empty_shelf",
 	type = "shapeless",
 	recipe = {"moreblocks:sweeper", "default:bookshelf"},
 	replacements = {{"default:bookshelf", "default:book 3"}},
-	-- When obtaining an empty bookshelf, return the books used in it as well
+	-- When obtaining an empty shelf, return the books used in it as well
+})
+
+minetest.register_craft({
+	output = "moreblocks:empty_shelf",
+	type = "shapeless",
+	recipe = {"moreblocks:sweeper", "vessels:shelf"},
+	replacements = {{"vessels:shelf", "vessels:glass_bottle 3"}},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "default:bookshelf",
+	recipe = {"moreblocks:empty_shelf", "default:book", "default:book", "default:book"},
+})
+
+minetest.register_craft({
+	output = "moreblocks:empty_shelf",
+	recipe = {
+		{"group:wood", "group:wood", "group:wood"},
+		{"", "", ""},
+		{"group:wood", "group:wood", "group:wood"},
+	}
 })
 
 minetest.register_craft({
@@ -209,16 +246,16 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "moreblocks:plankstone 4",
 	recipe = {
-		{"default:stone", "default:wood"},
-		{"default:wood", "default:stone"},
+		{"group:stone", "group:wood"},
+		{"group:wood", "group:stone"},
 	}
 })
 
 minetest.register_craft({
 	output = "moreblocks:plankstone 4",
 	recipe = {
-		{"default:wood", "default:stone"},
-		{"default:stone", "default:wood"},
+		{"group:wood", "group:stone"},
+		{"group:stone", "group:wood"},
 	}
 })
 
@@ -382,12 +419,36 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	output = "moreblocks:trap_desert_stone",
+	type = "shapeless",
+	recipe = {"default:mese_crystal_fragment", "default:desert_stone"},
+})
+
+minetest.register_craft({
 	output = "moreblocks:trap_glass",
 	type = "shapeless",
 	recipe = {"default:mese_crystal_fragment", "default:glass"},
 })
 
 minetest.register_craft({
+	output = "moreblocks:trap_obsidian_glass",
+	type = "shapeless",
+	recipe = {"default:mese_crystal_fragment", "default:obsidian_glass"},
+})
+
+minetest.register_craft({
+	output = "moreblocks:trap_obsidian",
+	type = "shapeless",
+	recipe = {"default:mese_crystal_fragment", "default:obsidian"},
+})
+
+minetest.register_craft({
+	output = "moreblocks:trap_sandstone",
+	type = "shapeless",
+	recipe = {"default:mese_crystal_fragment", "default:sandstone"},
+})
+
+minetest.register_craft({
 	output = "moreblocks:cactus_brick",
 	type = "shapeless",
 	recipe = {"default:cactus", "default:brick"},
@@ -419,6 +480,20 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	output = "moreblocks:dirt_compressed",
+	recipe = {
+		{'default:dirt', 'default:dirt', 'default:dirt'},
+		{'default:dirt', 'default:dirt', 'default:dirt'},
+		{'default:dirt', 'default:dirt', 'default:dirt'},
+	}
+})
+
+minetest.register_craft({
+	output = "default:dirt 9",
+	recipe = {{"moreblocks:dirt_compressed"}},
+})
+
+minetest.register_craft({
 	output = "moreblocks:cobble_compressed",
 	recipe = {
 		{"default:cobble", "default:cobble", "default:cobble"},
@@ -435,15 +510,15 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	type = "cooking", output = "moreblocks:tar", recipe = "default:gravel",
+	type = "cooking", output = "moreblocks:tar", recipe = "default:pine_tree",
 })
 
 minetest.register_craft({
 	type = "shapeless",
 	output = "moreblocks:copperpatina",
-	recipe = {"bucket:bucket_water", "default:copperblock"},
+	recipe = {"group:water_bucket", "default:copperblock"},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"}
+		{"group:water_bucket", "bucket:bucket_empty"}
 	}
 })