Merge remote-tracking branch 'upstream/master'

README.md

@@ -1,32 +1,19 @@
 # claycrafter
 Minetest clay crafter mod. Adds a way to craft clay out of compressed dirt.
 
-Dependencies: 
+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
+#####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
-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.
+#####License for Media
 
-This program is distributed in the hope that it will be useful,
-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
+Textures by Dragonop (CC-BY-SA 4.0)

claycrafter.lua

@@ -200,10 +200,13 @@ 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() ~= "claycrafter:compressed_dirt" then
+		if inv:get_stack("src", 1):get_name() ~= compressed_dirt then
 			cookable = false
 		end
 		

init.lua

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

items.lua

@@ -1,8 +1,12 @@
-minetest.register_node("claycrafter:compressed_dirt", {
+if minetest.get_modpath("moreblocks") then
+	minetest.register_alias("claycrafter:compressed_dirt", "moreblocks:dirt_compressed")
+else
+	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}
-})
+	})
+end
 
 minetest.register_node("claycrafter:glass_of_water", {
 	description = ("Glass of Water"),

mod.conf

@@ -1,4 +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

@@ -1,11 +1,13 @@
-minetest.register_craft({
+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",