Merge remote-tracking branch 'upstream/master'

Fix bug where claycrafter won't turn off. Fixes issue #9

README.md

@@ -12,22 +12,8 @@ Edited by everamzah to work for this mod.
 
 #####License for Code 
 
-Copyright (C) 2016 Dragonop <joaco-mono@hotmail.com>
+Dragonop (LGPLv3)
 
-This program is free software; you can redistribute it and/or modify
+#####License for Media
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Textures by Dragonop (CC-BY-SA 4.0)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####License for Textures, Models and Sounds
-
-CC-BY-SA 3.0 UNPORTED. Created by Dragonop

claycrafter.lua

@@ -233,7 +233,7 @@ minetest.register_abm({
 			end
 		else
 			-- Furnace ran out of fuel
-			if cookable then
+			if cookable and inv:room_for_item("dst", ItemStack({name = "default:clay", count = 4})) then
 				-- We need to get new fuel
 				local fueltime = minetest.get_item_group(inv:get_stack("fuel", 1):get_name(), "h2o")
 				
@@ -244,16 +244,13 @@ minetest.register_abm({
 					src_time = 0
 				else
 					-- Take fuel from fuel list
-
+					if inv:room_for_item("vessels", ItemStack({name = "vessels:drinking_glass"}))
-					if inv:room_for_item("dst", ItemStack({name = "default:clay", count = 4}))
-					and inv:room_for_item("vessels", ItemStack({name = "vessels:drinking_glass"}))
 					then
 						inv:remove_item("fuel", inv:get_stack("fuel", 1):get_name())
 						inv:add_item("vessels", {name = "vessels:drinking_glass"})
 					else 
 						swap_node(pos, "claycrafter:claycrafter_active")
 					end
-
 					fuel_totaltime = fueltime
 					fuel_time = 0
 					
@@ -274,7 +271,7 @@ minetest.register_abm({
 		local item_percent = 0
 		if cookable then
 			item_percent =  math.floor(src_time / cooktime * 100)
-			item_state = "In use"
+			item_state = "Yes"
 		else
 			if srclist[1]:is_empty() then
 				item_state = "Empty"

depends.txt

@@ -1,4 +0,0 @@
-vessels
-default
-bucket
-moreblocks?

description.txt

@@ -1 +0,0 @@
-Craft clay out of compressed dirt.

items.lua

@@ -8,8 +8,18 @@ else
 	})
 end
 
-minetest.register_craftitem("claycrafter:glass_of_water", {
+minetest.register_node("claycrafter:glass_of_water", {
-		description = "Glass of Water",
+	description = ("Glass of Water"),
-		inventory_image = "claycrafter_glass_of_water.png",
+	drawtype = "plantlike",
-		groups = {h2o = 1, vessel = 1}, -- How much time to convert 1 compressed dirt to 4 clay
+	tiles = {"claycrafter_glass_of_water.png"},
+	inventory_image = "claycrafter_glass_of_water_inv.png",
+	wield_image = "claycrafter_glass_of_water.png",
+	paramtype = "light",
+	is_ground_content = false,
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {type = "fixed",fixed = {-0.25, -0.5, -0.25, 0.25, 0, 0.25}	},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1, h2o = 3}, -- How much time to convert 1 compressed dirt to 4 clay
+	on_use = minetest.item_eat(0,"vessels:drinking_glass"),	
+	sounds = default.node_sound_glass_defaults(),
 })

mod.conf

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

recipes.lua

@@ -9,6 +9,11 @@ if not minetest.get_modpath("moreblocks") then
 	})
 end
 
+minetest.register_craft({
+		output = "default:dirt 9",
+		recipe = {{"claycrafter:compressed_dirt"}}
+})
+
 minetest.register_craft({
 		output = "claycrafter:glass_of_water 8",
 		recipe = {