Merge branch 'github'

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 minetest.get_modpath("moreblocks") ~= nil then
-			if inv:get_stack("src", 1):get_name() ~= "moreblocks:dirt_compressed" then
+		if inv:get_stack("src", 1):get_name() ~= compressed_dirt 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 = {
-				{"group:dirt", "group:dirt", "group:dirt"},
-				{"group:dirt", "group:dirt", "group:dirt"},
-				{"group:dirt", "group:dirt", "group:dirt"}
+				{"default:dirt", "default:dirt", "default:dirt"},
+				{"default:dirt", "default:dirt", "default:dirt"},
+				{"default:dirt", "default:dirt", "default:dirt"}
 			}
 	})
 	minetest.register_node("claycrafter:compressed_dirt", {
@@ -47,21 +47,12 @@ minetest.register_node("claycrafter:glass_of_water", {
 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"}
+			{"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 = {
-			{"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"}
+			{"bucket:bucket_water", "bucket:bucket_empty"},
 		}
 })
 
@@ -69,7 +60,7 @@ 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"}
+			{"group:wood", "default:glass", "group:wood"},
+			{"default:stick", "bucket:bucket_water", "default:stick"}
 		}
 })