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

@@ -2,11 +2,15 @@
 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:
 
- Claycrafter: Used to convert compressed dirt into clay.
+**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)
+**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)
 
- Glass of water: Used as fuel for the Claycrafter. Placeable.
 
 ##### Dependencies:
 Default  
@@ -15,18 +19,13 @@ Vessels
 ##### Optional dependencies:  
 moreblocks  
 
-Special thanks to everamzah
-
 ##### License for Code  
-
 Dragonop (LGPLv3)  
 
 ##### 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)  
+
+##### Special thanks to everamzah

claycrafter.lua

@@ -200,20 +200,15 @@ minetest.register_abm({
 		--
 		-- Cooking
 		--
-	
+		local compressed_dirt = "claycrafter:compressed_dirt"
+		if minetest.get_modpath("moreblocks") then
+			compressed_dirt = "moreblocks:dirt_compressed"
+		end
 		local cooktime = minetest.get_item_group(inv:get_stack("fuel", 1):get_name(), "h2o")
 		local cookable = true
-		
+		if inv:get_stack("src", 1):get_name() ~= compressed_dirt then
-		
-		if minetest.get_modpath("moreblocks") ~= nil then
-			if inv:get_stack("src", 1):get_name() ~= "moreblocks:dirt_compressed" then
 			cookable = false
 		end
-		else
-			if inv:get_stack("src", 1):get_name() ~= "claycrafter:compressed_dirt" then
-				cookable = false
-			end
-		end
 		
 		-- Check if we have enough fuel to burn
 		if fuel_time < fuel_totaltime then

init.lua

@@ -4,3 +4,5 @@ local modpath = minetest.get_modpath("claycrafter")
 
 dofile(modpath .. "/items.lua")
 dofile(modpath .. "/claycrafter.lua")
+
+minetest.log("action", "[claycrafter] loaded.")

items.lua

@@ -7,9 +7,9 @@ else
 	minetest.register_craft({
 			output = "claycrafter:compressed_dirt",
 			recipe = {
-				{"default:dirt", "default:dirt", "default:dirt"},
+				{"group:dirt", "group:dirt", "group:dirt"},
-				{"default:dirt", "default:dirt", "default:dirt"},
+				{"group:dirt", "group:dirt", "group:dirt"},
-				{"default:dirt", "default:dirt", "default:dirt"}
+				{"group:dirt", "group:dirt", "group:dirt"}
 			}
 	})
 	minetest.register_node("claycrafter:compressed_dirt", {
@@ -33,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,
@@ -46,12 +47,21 @@ minetest.register_node("claycrafter:glass_of_water", {
 minetest.register_craft({
 		output = "claycrafter:glass_of_water 8",
 		recipe = {
-			{"vessels:drinking_glass", "vessels:drinking_glass", "vessels:drinking_glass"},
+			{"group:vessel", "group:vessel", "group:vessel"},
-			{"vessels:drinking_glass", "bucket:bucket_water", "vessels:drinking_glass"}, 
+			{"group:vessel", "group:water_bucket", "group:vessel"},
-			{"vessels:drinking_glass", "vessels:drinking_glass", "vessels:drinking_glass"}
+			{"group:vessel", "group:vessel", "group:vessel"}
 		},
 		replacements = {
-			{"bucket:bucket_water", "bucket:bucket_empty"},
+			{"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"}
 		}
 })
 
@@ -59,7 +69,7 @@ minetest.register_craft({
 		output = "claycrafter:claycrafter",
 		recipe = {
 			{"group:wood", "default:steel_ingot", "group:wood"},
-			{"group:wood", "default:glass", "group:wood"},
+			{"group:wood", "group:glass", "group:wood"},
-			{"default:stick", "bucket:bucket_water", "default:stick"}
+			{"group:stick", "group:water_bucket", "group:stick"}
 		}
 })