Update to farming in upstream

README.txt

@@ -1,31 +1,6 @@
-===FARMING MOD for MINETEST-C55===
+===FARMING_PLUS MOD for MINETEST===
 by PilzAdam
 
-Extended Version
-
-Introduction: 
-This mod adds farming to Minetest.
-
-How to install:
-Unzip the archive an place it in minetest-base-directory/mods/minetest/
-if you have a windows client or a linux run-in-place client. If you have
-a linux system-wide instalation place it in ~/.minetest/mods/minetest/.
-If you want to install this mod only in one world create the folder
-worldmods/ in your worlddirectory.
-For further information or help see:
-http://wiki.minetest.com/wiki/Installing_Mods
-
-How to use the mod:
-Craft a wood/stone/steel hoe:
-material	material
-			stick
-			stick
-Dig dirt with it and turn it to soil. Water the soil and plant the seeds
-you get by digging dirt with the hoe. Wait until the seeds are seasoned
-and harvest them. When harvesting you will get the product and new seeds.
-For further information or help see:
-http://minetest.net/forum/viewtopic.php?id=2787
-
 License:
 Sourcecode: WTFPL (see below)
 Graphics: WTFPL (see below)

init.lua

@@ -1,6 +1,136 @@
+farming = {}
+
+function farming:add_plant(full_grown, names, interval, chance)
+	minetest.register_abm({
+		nodenames = names,
+		interval = interval,
+		chance = chance,
+		action = function(pos, node)
+			pos.y = pos.y-1
+			if minetest.env:get_node(pos).name ~= "farming:soil_wet" then
+				return
+			end
+			pos.y = pos.y+1
+			if not minetest.env:get_node_light(pos) then
+				return
+			end
+			if minetest.env:get_node_light(pos) < 8 then
+				return
+			end
+			local step = nil
+			for i,name in ipairs(names) do
+				if name == node.name then
+					step = i
+					break
+				end
+			end
+			if step == nil then
+				return
+			end
+			local new_node = {name=names[step+1]}
+			if new_node.name == nil then
+				new_node.name = full_grown
+			end
+			minetest.env:set_node(pos, new_node)
+		end
+}	)
+end
+
+function farming:generate_tree(pos, trunk, leaves, underground, replacements)
+	pos.y = pos.y-1
+	local nodename = minetest.env:get_node(pos).name
+	local ret = true
+	for _,name in ipairs(underground) do
+		if nodename == name then
+			ret = false
+			break
+		end
+	end
+	pos.y = pos.y+1
+	if not minetest.env:get_node_light(pos) then
+		return
+	end
+	if ret or minetest.env:get_node_light(pos) < 8 then
+		return
+	end
+	
+	node = {name = ""}
+	for dy=1,4 do
+		pos.y = pos.y+dy
+		if minetest.env:get_node(pos).name ~= "air" then
+			return
+		end
+		pos.y = pos.y-dy
+	end
+	node.name = trunk
+	for dy=0,4 do
+		pos.y = pos.y+dy
+		minetest.env:set_node(pos, node)
+		pos.y = pos.y-dy
+	end
+	
+	if not replacements then
+		replacements = {}
+	end
+	
+	node.name = leaves
+	pos.y = pos.y+3
+	for dx=-2,2 do
+		for dz=-2,2 do
+			for dy=0,3 do
+				pos.x = pos.x+dx
+				pos.y = pos.y+dy
+				pos.z = pos.z+dz
+				
+				if dx == 0 and dz == 0 and dy==3 then
+					if minetest.env:get_node(pos).name == "air" and math.random(1, 5) <= 4 then
+						minetest.env:set_node(pos, node)
+						for name,rarity in pairs(replacements) do
+							if math.random(1, rarity) == 1 then
+								minetest.env:set_node(pos, {name=name})
+							end
+						end
+					end
+				elseif dx == 0 and dz == 0 and dy==4 then
+					if minetest.env:get_node(pos).name == "air" and math.random(1, 5) <= 4 then
+						minetest.env:set_node(pos, node)
+						for name,rarity in pairs(replacements) do
+							if math.random(1, rarity) == 1 then
+								minetest.env:set_node(pos, {name=name})
+							end
+						end
+					end
+				elseif math.abs(dx) ~= 2 and math.abs(dz) ~= 2 then
+					if minetest.env:get_node(pos).name == "air" then
+						minetest.env:set_node(pos, node)
+						for name,rarity in pairs(replacements) do
+							if math.random(1, rarity) == 1 then
+								minetest.env:set_node(pos, {name=name})
+							end
+						end
+					end
+				else
+					if math.abs(dx) ~= 2 or math.abs(dz) ~= 2 then
+						if minetest.env:get_node(pos).name == "air" and math.random(1, 5) <= 4 then
+							minetest.env:set_node(pos, node)
+							for name,rarity in pairs(replacements) do
+								if math.random(1, rarity) == 1 then
+								minetest.env:set_node(pos, {name=name})
+								end
+							end
+						end
+					end
+				end
+				
+				pos.x = pos.x-dx
+				pos.y = pos.y-dy
+				pos.z = pos.z-dz
+			end
+		end
+	end
+end
+
 farming.seeds = {
-	["farming:wheat_seed"]=20,
-	["farming:cotton_seed"]=30,
 	["farming:pumpkin_seed"]=60,
 	["farming_plus:strawberry_seed"]=30,
 	["farming_plus:rhubarb_seed"]=30,
@@ -24,6 +154,11 @@ for lvl = 1, 6, 1 do
 	})
 end
 
+minetest.register_alias("farming:cotton", "farming:cotton_3")
+minetest.register_alias("farming:wheat_harvested", "farming:wheat")
+minetest.register_alias("farming:dough", "farming:flour")
+
+
 -- ========= RUBBER =========
 dofile(minetest.get_modpath("farming_plus").."/rubber.lua")
 
@@ -50,3 +185,9 @@ dofile(minetest.get_modpath("farming_plus").."/carrots.lua")
 
 -- ========= COCOA =========
 dofile(minetest.get_modpath("farming_plus").."/cocoa.lua")
+
+-- ========= PUMPKIN =========
+dofile(minetest.get_modpath("farming_plus").."/pumpkin.lua")
+
+-- ========= WEED =========
+dofile(minetest.get_modpath("farming_plus").."/weed.lua")

pumpkin.lua

@@ -0,0 +1,482 @@
+minetest.register_craftitem(":farming:pumpkin_seed", {
+	description = "Pumpkin Seed",
+	inventory_image = "farming_pumpkin_seed.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local above = minetest.env:get_node(pointed_thing.above)
+		if above.name == "air" then
+			above.name = "farming:pumpkin_1"
+			minetest.env:set_node(pointed_thing.above, above)
+			itemstack:take_item(1)
+			return itemstack
+		end
+	end
+})
+
+minetest.register_node(":farming:pumpkin_1", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	drawtype = "nodebox",
+	drop = "",
+	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png"},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
+		},
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
+		},
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2, not_in_creative_inventory=1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node(":farming:pumpkin_2", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	drawtype = "nodebox",
+	drop = "",
+	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png"},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.35, -0.5, -0.35, 0.35, 0.2, 0.35}
+		},
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.35, -0.5, -0.35, 0.35, 0.2, 0.35}
+		},
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2, not_in_creative_inventory=1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node(":farming:pumpkin", {
+	description = "Pumpkin",
+	paramtype2 = "facedir",
+	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png"},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+	
+	on_punch = function(pos, node, puncher)
+		local tool = puncher:get_wielded_item():get_name()
+		if tool and tool == "default:sword_wood" or tool == "default:sword_stone" or tool == "default:sword_steel" then
+			node.name = "farming:pumpkin_face"
+			minetest.env:set_node(pos, node)
+			puncher:get_inventory():add_item("main", ItemStack("farming:pumpkin_seed"))
+			if math.random(1, 5) == 1 then
+				puncher:get_inventory():add_item("main", ItemStack("farming:pumpkin_seed"))
+			end
+		end
+	end
+})
+
+farming:add_plant("farming:pumpkin", {"farming:pumpkin_1", "farming:pumpkin_2"}, 80, 20)
+
+minetest.register_node(":farming:pumpkin_face", {
+	description = "Pumpkin",
+	paramtype2 = "facedir",
+	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face.png"},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node(":farming:pumpkin_face_light", {
+	description = "Pumpkin",
+	paramtype2 = "facedir",
+	light_source = LIGHT_MAX-2,
+	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face_light.png"},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:pumpkin_face_light",
+	recipe = {"farming:pumpkin_face", "default:torch"}
+})
+
+-- ========= BIG PUMPKIN =========
+minetest.register_node(":farming:big_pumpkin", {
+	description = "Big Pumpkin",
+	paramtype2 = "facedir",
+	tiles = {"farming_pumpkin_big_side.png"},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-1, -0.5, -1, 1, 1.5, 1}
+		}
+	},
+	groups = {choppy=1, oddly_breakable_by_hand=1, flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+	
+	after_place_node = function(pos, placer)
+		for dx=-1,1 do
+			for dy=0,1 do
+				for dz=-1,1 do
+					pos.x = pos.x+dx
+					pos.y = pos.y+dy
+					pos.z = pos.z+dz
+					if dx ~= 0 or dy ~= 0 or dz ~= 0 then
+						if minetest.env:get_node(pos).name ~= "air" then
+							pos.x = pos.x-dx
+							pos.y = pos.y-dy
+							pos.z = pos.z-dz
+							minetest.env:remove_node(pos)
+							minetest.after(0.1, function(placer)
+								local inv = placer:get_inventory()
+								local index = placer:get_wield_index()
+								inv:set_stack("main", index, ItemStack("farming:big_pumpkin"))
+							end, placer)
+							return
+						end
+					end
+					pos.x = pos.x-dx
+					pos.y = pos.y-dy
+					pos.z = pos.z-dz
+				end
+			end
+		end
+		for dy=0,1 do
+			pos.y = pos.y+dy
+			pos.z = pos.z+1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_side", param2=2})
+			pos.x = pos.x-1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_corner", param2=2})
+			pos.x = pos.x+1
+			pos.z = pos.z-2
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_side", param2=4})
+			pos.x = pos.x+1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_corner", param2=4})
+			pos.z = pos.z+1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_side", param2=3})
+			pos.z = pos.z+1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_corner", param2=3})
+			pos.z = pos.z-1
+			pos.x = pos.x-2
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_side", param2=1})
+			pos.z = pos.z-1
+			minetest.env:set_node(pos, {name="farming:big_pumpkin_corner", param2=1})
+			pos.z = pos.z+1
+			pos.x = pos.x+1
+			pos.y = pos.y-dy
+		end
+		pos.y = pos.y+1
+		minetest.env:set_node(pos, {name="farming:big_pumpkin_top"})
+	end,
+	
+	after_destruct = function(pos, oldnode)
+		for dx=-1,1 do
+			for dy=0,1 do
+				for dz=-1,1 do
+					pos.x = pos.x+dx
+					pos.y = pos.y+dy
+					pos.z = pos.z+dz
+					local name = minetest.env:get_node(pos).name
+					if string.find(name, "farming:big_pumpkin") then
+						minetest.env:remove_node(pos)
+					end
+					pos.x = pos.x-dx
+					pos.y = pos.y-dy
+					pos.z = pos.z-dz
+				end
+			end
+		end
+	end
+})
+
+minetest.register_node(":farming:big_pumpkin_side", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	tiles = {"farming_pumpkin_big_top_side.png", "farming_pumpkin_big_side.png"},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, 0, 0.5, 0.5, 0.5}
+		}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{0, 0, 0, 0, 0, 0}
+		}
+	},
+	groups = {not_in_creative_inventory=1},
+})
+minetest.register_node(":farming:big_pumpkin_corner", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	tiles = {"farming_pumpkin_big_top_corner.png", "farming_pumpkin_big_side.png"},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, 0, 0, 0.5, 0.5}
+		}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{0, 0, 0, 0, 0, 0}
+		}
+	},
+	groups = {not_in_creative_inventory=1},
+})
+
+minetest.register_node(":farming:big_pumpkin_top", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = {"farming_pumpkin_big_top.png"},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{0, 0, 0, 0, 0, 0}
+		}
+	},
+	groups = {not_in_creative_inventory=1},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:big_pumpkin",
+	recipe = {"bucket:bucket_water", "farming:pumpkin"},
+	replacements = {
+		{"bucket:bucket_water", "bucket:bucket_empty"}
+	}
+})
+
+-- ========= SCARECROW =========
+local box1 = {
+	{-1, -8, -1, 1, 8, 1},
+}
+
+local box2 = {
+	{-1, -8, -1, 1, 8, 1},
+	{-12, -8, -1, 12, -7, 1},
+	{-5, -2, -5, 5, 8, 5}
+}
+
+for j,list in ipairs(box1) do
+	for i,int in ipairs(list) do
+		list[i] = int/16
+	end
+	box1[j] = list
+end
+
+for j,list in ipairs(box2) do
+	for i,int in ipairs(list) do
+		list[i] = int/16
+	end
+	box2[j] = list
+end
+
+minetest.register_node(":farming:scarecrow", {
+	description = "Scarecrow",
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	tiles = {"farming_scarecrow_top.png", "farming_scarecrow_top.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_front.png"},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = box2
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-12/16, -1.5, -0.5, 12/16, 0.5, 0.5}
+		}
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
+	
+	after_place_node = function(pos, placer)
+		local node = minetest.env:get_node(pos)
+		local param2 = node.param2
+		pos.y = pos.y+1
+		if minetest.env:get_node(pos).name ~= "air" then
+			pos.y = pos.y-1
+			minetest.env:remove_node(pos)
+			minetest.after(0.1, function(placer)
+				local inv = placer:get_inventory()
+				local index = placer:get_wield_index()
+				inv:set_stack("main", index, ItemStack("farming:scarecrow"))
+			end, placer)
+			return
+		end
+		minetest.env:set_node(pos, node)
+		pos.y = pos.y-1
+		node.name = "farming:scarecrow_bottom"
+		minetest.env:set_node(pos, node)
+	end,
+	
+	after_destruct = function(pos, oldnode)
+		pos.y = pos.y-1
+		if minetest.env:get_node(pos).name == "farming:scarecrow_bottom" then
+			minetest.env:remove_node(pos)
+		end
+	end
+})
+
+minetest.register_node(":farming:scarecrow_bottom", {
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	tiles = {"default_wood.png"},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = box1
+	},
+	groups = {not_in_creative_inventory=1},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{0, 0, 0, 0, 0, 0}
+		}
+	}
+})
+
+minetest.register_craft({
+	output = "farming:scarecrow",
+	recipe = {
+		{"", "farming:pumpkin_face", "",},
+		{"default:stick", "default:stick", "default:stick",},
+		{"", "default:stick", "",}
+	}
+})
+
+minetest.register_node(":farming:scarecrow_light", {
+	description = "Scarecrow",
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	light_source = LIGHT_MAX-2,
+	tiles = {"farming_scarecrow_top.png", "farming_scarecrow_top.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_front_light.png"},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = box2
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-12/16, -1.5, -0.5, 12/16, 0.5, 0.5}
+		}
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
+	
+	after_place_node = function(pos, placer)
+		local node = minetest.env:get_node(pos)
+		local param2 = node.param2
+		pos.y = pos.y+1
+		if minetest.env:get_node(pos).name ~= "air" then
+			pos.y = pos.y-1
+			minetest.env:remove_node(pos)
+			minetest.after(0.1, function(placer)
+				local inv = placer:get_inventory()
+				local index = placer:get_wield_index()
+				inv:set_stack("main", index, ItemStack("farming:scarecrow_light"))
+			end, placer)
+			return
+		end
+		minetest.env:set_node(pos, node)
+		pos.y = pos.y-1
+		node.name = "farming:scarecrow_bottom"
+		minetest.env:set_node(pos, node)
+	end,
+	
+	after_destruct = function(pos, oldnode)
+		pos.y = pos.y-1
+		if minetest.env:get_node(pos).name == "farming:scarecrow_bottom" then
+			minetest.env:remove_node(pos)
+		end
+	end
+})
+
+minetest.register_craft({
+	output = "farming:scarecrow_light",
+	recipe = {
+		{"", "farming:pumpkin_face_light", "",},
+		{"default:stick", "default:stick", "default:stick",},
+		{"", "default:stick", "",}
+	}
+})
+
+--===============
+minetest.register_craftitem(":farming:pumpkin_bread", {
+	description = "Pumpkin Bread",
+	inventory_image = "farming_bread_pumpkin.png",
+	stack_max = 1,
+	on_use = minetest.item_eat(8)
+})
+
+minetest.register_craftitem(":farming:pumpkin_flour", {
+	description = "Pumpkin Flour",
+	inventory_image = "farming_cake_mix_pumpkin.png",
+})
+minetest.register_alias("farming:pumpkin_cake_mix", "farming:pumpkin_flour")
+
+minetest.register_craft({
+	output = "farming:pumpkin_flour",
+	type = "shapeless",
+	recipe = {"farming:flour", "farming:pumpkin"}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "farming:pumpkin_bread",
+	recipe = "farming:pumpkin_flour",
+	cooktime = 10
+})
+
+
+-- ========= FUEL =========
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:pumpkin_seed",
+	burntime = 1
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:pumpkin",
+	burntime = 5
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:pumpkin_face",
+	burntime = 5
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:pumpkin_face_light",
+	burntime = 7
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:big_pumpkin",
+	burntime = 10
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:scarecrow",
+	burntime = 5
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:scarecrow_light",
+	burntime = 5
+})

weed.lua

@@ -0,0 +1,40 @@
+minetest.register_node(":farming:weed", {
+	description = "Weed",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	drawtype = "plantlike",
+	tiles = {"farming_weed.png"},
+	inventory_image = "farming_weed.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -0.5+4/16, 0.5}
+		},
+	},
+	groups = {snappy=3, flammable=2},
+	sounds = default.node_sound_leaves_defaults()
+})
+
+minetest.register_abm({
+	nodenames = {"farming:soil_wet", "farming:soil"},
+	interval = 50,
+	chance = 10,
+	action = function(pos, node)
+		if minetest.env:find_node_near(pos, 4, {"farming:scarecrow", "farming:scarecrow_light"}) ~= nil then
+			return
+		end
+		pos.y = pos.y+1
+		if minetest.env:get_node(pos).name == "air" then
+			node.name = "farming:weed"
+			minetest.env:set_node(pos, node)
+		end
+	end
+})
+
+-- ========= FUEL =========
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:weed",
+	burntime = 1
+})