From 94b155bc231bb42b8a18a8d5afa82ae0011ce39b Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Fri, 18 Aug 2017 18:06:36 +0100
Subject: [PATCH] separate cotton/string items

---
 README.txt                  |   5 ++++-
 cotton.lua                  |  39 ++++++++++++++++++++++++++++++------
 textures/farming_cotton.png | Bin 166 -> 316 bytes
 textures/farming_string.png | Bin 0 -> 166 bytes
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 textures/farming_string.png

diff --git a/README.txt b/README.txt
index 277e245..1c26be0 100644
--- a/README.txt
+++ b/README.txt
@@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 Changelog:
 
-1.27 - Added meshoptions to api and wheat plants, added farming.rarity setting to spawn more/less crops on map
+1.27 - Added meshoptions to api and wheat plants, added farming.rarity setting to spawn more/less crops on map, have separate cotton/string items (4x cotton = 1x wool, 2x cotton = 2x string)
 1.26 - Added support for [toolranks] mod when using hoe's
 1.25 - Added check for farming.conf setting file to disable specific crops globally (inside mod folder) or world specific (inside world folder)
 1.24 - Added Hemp which can be crafted into fibre, paper, string, rope and oil.
@@ -61,6 +61,9 @@ Created by PilzAdam (License: WTFPL):
   farming_soil_wet_side.png
   farming_string.png
 
+Created by Napiophelios (CC BY-SA 3.0):
+  farming_cotton.png
+
 Created by Calinou (License: CC BY-SA):
   farming_tool_bronzehoe.png
   farming_tool_steelhoe.png
diff --git a/cotton.lua b/cotton.lua
index eef6425..5241b2c 100644
--- a/cotton.lua
+++ b/cotton.lua
@@ -24,19 +24,46 @@ minetest.register_node("farming:seed_cotton", {
 minetest.register_craftitem("farming:cotton", {
 	description = S("Cotton"),
 	inventory_image = "farming_cotton.png",
+	groups = {flammable = 4},
 })
 
-minetest.register_alias("farming:string", "farming:cotton")
+minetest.register_craftitem("farming:string", {
+	description = S("String"),
+	inventory_image = "farming_string.png",
+	groups = {flammable = 2},
+})
 
 -- cotton to wool
 minetest.register_craft({
 	output = "wool:white",
 	recipe = {
-		{"farming:string", "farming:string"},
-		{"farming:string", "farming:string"},
+		{"farming:cotton", "farming:cotton"},
+		{"farming:cotton", "farming:cotton"},
 	}
 })
 
+-- cotton to string
+minetest.register_craft({
+	output = "farming:string 2",
+	recipe = {
+		{"farming:cotton"},
+		{"farming:cotton"},
+	}
+})
+
+-- can be used as fuel
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:string",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:cotton",
+	burntime = 1,
+})
+
 -- cotton definition
 local crop_def = {
 	drawtype = "plantlike",
@@ -105,9 +132,9 @@ crop_def.tiles = {"farming_cotton_8.png"}
 crop_def.groups.growing = 0
 crop_def.drop = {
 	items = {
-		{items = {"farming:string"}, rarity = 1},
-		{items = {"farming:string"}, rarity = 2},
-		{items = {"farming:string"}, rarity = 3},
+		{items = {"farming:cotton"}, rarity = 1},
+		{items = {"farming:cotton"}, rarity = 2},
+		{items = {"farming:cotton"}, rarity = 3},
 		{items = {"farming:seed_cotton"}, rarity = 1},
 		{items = {"farming:seed_cotton"}, rarity = 2},
 		{items = {"farming:seed_cotton"}, rarity = 3},
diff --git a/textures/farming_cotton.png b/textures/farming_cotton.png
index e2bbfd7af486b64c658bcc7c6101b22ca95ab7e7..8aa50e4e38c75bce9f41cbee1ed6535adb7c7f9c 100644
GIT binary patch
delta 300
zcmZ3+xQA(iWIZzj1A~Sxe=v}$3-AeX1=8t3ve^;Jxsl45aXJOD8W~B3SxJW3$;P?K
z23cw5Ica9OX{LEVGTl5s-7G)DyfDZ1^&1d)`}Xa-ckkZ52ZIkF@cPrIj~_pN_yhu<
zKY#x81q8kV!MAVUzkmPv^Jo3fU%!3>!5=XA`*+o}`G<f`U@Qsp3ubV5b|VeQ$?<e?
z43UtWdoY@>$v}klz+>jX%2nYTLpB_LCHif@qmYK$KgskD%6%UkXBkHe85=Ij(pH*q
zEPLs#tw&tWOrCbnzN6FRS5fT$vL=W8uUAjqRXmYY-#P90WwT=$tg14XY;L}3WKDZo
f75>OO@IgLvd<I8UlFiZ>pv4THu6{1-oD!M<@%x*6

delta 149
zcmdnPw2X0rWIY2ASj||l7f3Oc1o;IsFqBO`YXRiNd%8G=NJz3CT*%vCz`%0gc0H3=
z0$0}(IjxBvLbC)`&9??=WmxfiH-p;^W`_%^416&UUo{BGzj08P<492YUYwu1&SAsB
uDkis!0ec!E(s{TO4u~*3@n8pO`@nqP-XMGaG`@3>L0nH)KbLh*2~7ZC129Vf

diff --git a/textures/farming_string.png b/textures/farming_string.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2bbfd7af486b64c658bcc7c6101b22ca95ab7e7
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAm`Z~Df*BafCZDwc^5Q*R977}|
zSr0DcZ7^V9IdHq4Ni2b@Yl)oJL=T}^0;}d*gS0ZNc)pv#?FO^M1yu&Vn1`<#1mxd1
zsLOFAD19%^&t2!R;b0Y$+r@xA4H4-)+zAIn7@l~rgS35MzHe`kJ%8G{#~_}ktDnm{
Hr-UW|pV=_A

literal 0
HcmV?d00001