From 4f9b05be4e2102e5b872389544349bae3023007f Mon Sep 17 00:00:00 2001
From: Richard Qian <richwiki101@gmail.com>
Date: Mon, 5 Dec 2016 16:15:34 -0600
Subject: [PATCH] Rename empty bookshelf to empty shelf

This to account for the fact that vessel shelves can now be used here. Additionally, really loop back to cobblestone in relationship to the stone tile and its variants.
---
 aliases.lua                                    |   1 +
 crafting.lua                                   |  17 +++++++++--------
 nodes.lua                                      |   6 +++---
 ...ookshelf.png => moreblocks_empty_shelf.png} | Bin
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename textures/{moreblocks_empty_bookshelf.png => moreblocks_empty_shelf.png} (100%)

diff --git a/aliases.lua b/aliases.lua
index f079b62..de425f9 100644
--- a/aliases.lua
+++ b/aliases.lua
@@ -60,6 +60,7 @@ minetest.register_alias("moreblocks:wood_tile_flipped","moreblocks:wood_tile")
 minetest.register_alias("moreblocks:wood_tile_down","moreblocks:wood_tile_up")
 minetest.register_alias("moreblocks:wood_tile_left","moreblocks:wood_up")
 minetest.register_alias("moreblocks:wood_tile_right","moreblocks:wood_up")
+minetest.register_alias("moreblocks:empty_bookshelf","moreblocks:empty_shelf")
 
 -- ABM for horizontal trees (fix facedir):
 local horizontal_tree_convert_facedir = {7, 12, 9, 18}
diff --git a/crafting.lua b/crafting.lua
index e097b66..6867f7a 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -153,9 +153,9 @@ minetest.register_craft({
 	}
 })
 
--- When approaching the below craft, loop back to the 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 = "moreblocks:stone_tile",
+	output = "default:cobble",
 	recipe = {
 		{"moreblocks:split_stone_tile_alt"},
 	}
@@ -174,34 +174,35 @@ 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_bookshelf",
+	output = "moreblocks:empty_shelf",
 	type = "shapeless",
 	recipe = {"moreblocks:sweeper", "vessels:shelf"},
 	replacements = {{"vessels:shelf", "vessels:glass_fragments 4"}},
+	-- When obtaining an empty shelf, return four glass_fragment pieces
 })
 
 minetest.register_craft({
 	type = "shapeless",
 	output = "default:bookshelf",
-	recipe = {"moreblocks:empty_bookshelf", "default:book", "default:book", "default:book"},
+	recipe = {"moreblocks:empty_shelf", "default:book", "default:book", "default:book"},
 })
 
 minetest.register_craft({
 	type = "shapeless",
 	output = "vessels:shelf",
-	recipe = {"moreblocks:empty_bookshelf", "group:vessel", "group:vessel", "group:vessel"},
+	recipe = {"moreblocks:empty_shelf", "group:vessel", "group:vessel", "group:vessel"},
 })
 
 minetest.register_craft({
-	output = "moreblocks:empty_bookshelf",
+	output = "moreblocks:empty_shelf",
 	recipe = {
 		{"group:wood", "group:wood", "group:wood"},
 		{"", "", ""},
diff --git a/nodes.lua b/nodes.lua
index b62cff3..351cfb6 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -186,11 +186,11 @@ local nodes = {
 		"default_stone.png^moreblocks_cactus_checker.png^[transformR90"},
 		sounds = sound_stone,
 	},
-	["empty_bookshelf"] = {
-		description = S("Empty Bookshelf"),
+	["empty_shelf"] = {
+		description = S("Empty Shelf"),
 		paramtype2 = "facedir",
 		tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
-		"default_wood.png", "moreblocks_empty_bookshelf.png", "moreblocks_empty_bookshelf.png"},
+		"default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"},
 		groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
 		is_ground_content = false,
 		sounds = sound_wood,
diff --git a/textures/moreblocks_empty_bookshelf.png b/textures/moreblocks_empty_shelf.png
similarity index 100%
rename from textures/moreblocks_empty_bookshelf.png
rename to textures/moreblocks_empty_shelf.png