From a73ba9aeb8a5efe6882bc055ed6d6b7eda48c7a6 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Tue, 21 May 2013 10:52:36 -0400
Subject: [PATCH] retired the cotton plants, aliased them to farming cotton
 since that mod is now part of minetest_game

---
 flowers_plus/init.lua | 57 +++++++++----------------------------------
 1 file changed, 11 insertions(+), 46 deletions(-)

diff --git a/flowers_plus/init.lua b/flowers_plus/init.lua
index 685002b..23fcb94 100644
--- a/flowers_plus/init.lua
+++ b/flowers_plus/init.lua
@@ -1,33 +1,21 @@
--- This file supplies a few additional flowers and some related crafts
+-- This file supplies a few additional plants and some related crafts
 -- for the plantlife modpack.  Last revision:  2013-04-24
 
 local SPAWN_DELAY = 1000
 local SPAWN_CHANCE = 200
 local flowers_seed_diff = 329
 
--- register cotton plant
+-- Cotton plants are now provided by the default "farming" mod.
+-- old cotton plants -> farming cotton stage 8
+-- cotton wads -> string (can be crafted into wool blocks)
+-- potted cotton plants -> potted white dandelions
 
-minetest.register_node(":flowers:cotton_plant", {
-	description = flowerdesc,
-	drawtype = "plantlike",
-	tiles = { "flowers_cotton_plant.png" },
-	inventory_image = "flowers_cotton_plant.png",
-	wield_image = "flowers_cotton_plant.png",
-	sunlight_propagates = true,
-	paramtype = "light",
-	walkable = false,
-	buildable_to = true,
-	groups = { snappy = 3,flammable=2, flower=1, flora=1, attached_node=1 },
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 },
-	},	
-	buildable_to = true,
-})
-
-minetest.register_alias("flowers:flower_cotton", "flowers:cotton_plant")
-minetest.register_alias("flowers:flower_cotton_pot", "flowers:potted_cotton_plant")
+minetest.register_alias("flowers:cotton_plant", "farming:cotton_8") 
+minetest.register_alias("flowers:flower_cotton", "farming:cotton_8")
+minetest.register_alias("flowers:flower_cotton_pot", "flowers:potted_dandelion_white")
+minetest.register_alias("flowers:potted_cotton_plant", "flowers:potted_dandelion_white")
+minetest.register_alias("flowers:cotton", "farming:string")
+minetest.register_alias("flowers:cotton_wad", "farming:string")
 
 -- register the various rotations of waterlilies
 
@@ -148,7 +136,6 @@ local flowers_list = {
 	{ "White Dandelion",	"dandelion_white"},
 	{ "Blue Geranium",	"geranium"},
 	{ "Viola",		"viola"},
-	{ "Cotton Plant",	"cotton_plant"},
 }
 
 for i in ipairs(flowers_list) do
@@ -273,26 +260,4 @@ minetest.register_craft( {
 	},
 })
 
-minetest.register_alias("flowers:cotton", "flowers:cotton_wad")
-
-minetest.register_craftitem(":flowers:cotton_wad", {
-	description = "Cotton wad",
-	image = "flowers_cotton_wad.png",
-})
-
-minetest.register_craft({
-	output = "flowers:cotton_wad 3",
-	recipe ={
-		{"flowers:cotton_plant"},
-	}
-})
-
-minetest.register_craft({
-	output = "wool:white 2",
-	recipe = {
-		{'flowers:cotton_wad', 'flowers:cotton_wad', ''},
-		{'flowers:cotton_wad', 'flowers:cotton_wad', ''},
-	}
-})
-
 print("[Flowers] Loaded.")