Merge remote-tracking branch 'upstream/master'

Modifies all crafting recipes to use groups instead of fixed items, including adding a new crafting recipe to craft glasses of water using water sources

Special thanks to @mruncreative for showing insterest and inspiring me to do this changes (Resolves #14)

README.md

@@ -1,19 +1,31 @@
 # claycrafter
-Minetest clay crafter mod. Adds a way to craft clay out of compressed dirt.
+Minetest clay crafter mod. 
+Adds a way for players to obtain clay other than mining, out of a common material: dirt. It adds three new nodes:
 
-Dependencies:
+**Claycrafter:** Used to convert compressed dirt into clay.
+
+**Compressed dirt:** Just 9 dirt, compressed, useful for saving storage space, too!  
+(Not present if moreblocks is installed, use moreblocks:dirt_compressed instead)
+
+**Glass of water:** Used as fuel for the Claycrafter. Placeable.
+
+For extra info look at the [Forum Thread](https://forum.minetest.net/viewtopic.php?f=11&t=13992)
+
+
+##### Dependencies:
 Default  
 Vessels  
-Bucket
-moreblocks (optional)
 
-claycrafter.lua is derivated from furnace.lua (minetest_game) by PilzAdam and Amaz1. 
-Edited by everamzah to work for this mod.
-
-#####License for Code 
+##### Optional dependencies:  
+moreblocks  
 
+##### License for Code  
 Dragonop (LGPLv3)  
 
-#####License for Media
+##### License for Media  
+Textures created or modified by Dragonop (CC-BY-SA 4.0)  
+Glass of water derived from the Drinking Glass texture from the vessels mod made by Thomas-S which is distributed as (CC-BY-SA 3.0)  
+Compressed dirt derived from the minetest's game default dirt texture made by Neuromancer and later modified by random-geek which is distributed as (CC-BY-SA 3.0)  
+Arrow textures by Blockmen, from minetest game's default, distributed under (CC-BY-SA 3.0)  
 
-Textures by Dragonop (CC-BY-SA 4.0)
+##### Special thanks to everamzah

init.lua

@@ -3,7 +3,6 @@ local modpath = minetest.get_modpath("claycrafter")
 -- TODO: Investigate function to automatically get mod name.
 
 dofile(modpath .. "/items.lua")
-dofile(modpath .. "/recipes.lua")
 dofile(modpath .. "/claycrafter.lua")
 
 minetest.log("action", "[claycrafter] loaded.")

items.lua

@@ -1,13 +1,31 @@
-if minetest.get_modpath("moreblocks") then
-	minetest.register_alias("claycrafter:compressed_dirt", "moreblocks:dirt_compressed")
+--compressed dirt
+local moreblocks = minetest.get_modpath("moreblocks")
+
+if moreblocks ~= nil then
+	minetest.register_alias("claycrafter:compressed_dirt","moreblocks:dirt_compressed")
 else
+	minetest.register_craft({
+			output = "claycrafter:compressed_dirt",
+			recipe = {
+				{"group:dirt", "group:dirt", "group:dirt"},
+				{"group:dirt", "group:dirt", "group:dirt"},
+				{"group:dirt", "group:dirt", "group:dirt"}
+			}
+	})
 	minetest.register_node("claycrafter:compressed_dirt", {
 		description = "Compressed Dirt",
 		tiles = {"claycrafter_compressed_dirt.png"},
-		groups = {crumbly = 1, oddly_breakable_by_hand = 1, soil = 1, cracky =1}
+		groups = {crumbly = 1, oddly_breakable_by_hand = 1, soil = 1, cracky =1},
+		sounds = default.node_sound_dirt_defaults(),
 	})
+	minetest.register_craft({
+		output = "default:dirt 9",
+		recipe = {{"claycrafter:compressed_dirt"}}
+	})
+	minetest.register_alias("moreblocks:dirt_compressed","claycrafter:compressed_dirt")
 end
 
+--nodes
 minetest.register_node("claycrafter:glass_of_water", {
 	description = ("Glass of Water"),
 	drawtype = "plantlike",
@@ -15,6 +33,7 @@ minetest.register_node("claycrafter:glass_of_water", {
 	inventory_image = "claycrafter_glass_of_water_inv.png",
 	wield_image = "claycrafter_glass_of_water.png",
 	paramtype = "light",
+	use_texture_alpha = "blend",
 	is_ground_content = false,
 	walkable = false,
 	sunlight_propagates = true,
@@ -23,3 +42,34 @@ minetest.register_node("claycrafter:glass_of_water", {
 	on_use = minetest.item_eat(0,"vessels:drinking_glass"),	
 	sounds = default.node_sound_glass_defaults(),
 })
+
+--recipes
+minetest.register_craft({
+		output = "claycrafter:glass_of_water 8",
+		recipe = {
+			{"group:vessel", "group:vessel", "group:vessel"},
+			{"group:vessel", "group:water_bucket", "group:vessel"},
+			{"group:vessel", "group:vessel", "group:vessel"}
+		},
+		replacements = {
+			{"group:water_bucket", "bucket:bucket_empty"},
+		}
+})
+
+minetest.register_craft({
+		output = "claycrafter:glass_of_water 8",
+		recipe = {
+			{"group:vessel", "group:vessel", "group:vessel"},
+			{"group:vessel", "group:water", "group:vessel"},
+			{"group:vessel", "group:vessel", "group:vessel"}
+		}
+})
+
+minetest.register_craft({
+		output = "claycrafter:claycrafter",
+		recipe = {
+			{"group:wood", "default:steel_ingot", "group:wood"},
+			{"group:wood", "group:glass", "group:wood"},
+			{"group:stick", "group:water_bucket", "group:stick"}
+		}
+})

mod.conf

@@ -1,5 +1,5 @@
 name = claycrafter
 description = This mod introduces the Claycrafter, which converts Compressed Dirt to Clay using Glasses of Water.
-depends = vessels, default, bucket
+depends = vessels, default
 optional_depends = moreblocks
 author = Dragonop

recipes.lua

@@ -1,36 +0,0 @@
-if not minetest.get_modpath("moreblocks") then
-	minetest.register_craft({
-		output = "claycrafter:compressed_dirt",
-		recipe = {
-			{"default:dirt", "default:dirt", "default:dirt"},
-			{"default:dirt", "default:dirt", "default:dirt"},
-			{"default:dirt", "default:dirt", "default:dirt"}
-		}
-	})
-end
-
-minetest.register_craft({
-		output = "default:dirt 9",
-		recipe = {{"claycrafter:compressed_dirt"}}
-})
-
-minetest.register_craft({
-		output = "claycrafter:glass_of_water 8",
-		recipe = {
-			{"vessels:drinking_glass", "vessels:drinking_glass", "vessels:drinking_glass"},
-			{"vessels:drinking_glass", "bucket:bucket_water", "vessels:drinking_glass"}, 
-			{"vessels:drinking_glass", "vessels:drinking_glass", "vessels:drinking_glass"}
-		},
-		replacements = {
-			{"bucket:bucket_water", "bucket:bucket_empty"},
-		}
-})
-
-minetest.register_craft({
-		output = "claycrafter:claycrafter",
-		recipe = {
-			{"group:wood", "default:steel_ingot", "group:wood"},
-			{"group:wood", "default:glass", "group:wood"},
-			{"default:stick", "bucket:bucket_water", "default:stick"}
-		}
-})