From 6fb072e5ffac7bd026da204a0dd017e8942c35ca Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 21 Oct 2014 18:53:04 +0100
Subject: [PATCH] Pine tree, pine needles, pine sapling and pinewood nodes,
 including textures by Splizard and Cisoun

---
 mods/default/README.txt                       |   7 +++
 mods/default/crafting.lua                     |  14 +++++
 mods/default/nodes.lua                        |  57 ++++++++++++++++++
 .../default/textures/default_pine_needles.png | Bin 0 -> 512 bytes
 .../default/textures/default_pine_sapling.png | Bin 0 -> 406 bytes
 mods/default/textures/default_pinetree.png    | Bin 0 -> 693 bytes
 .../default/textures/default_pinetree_top.png | Bin 0 -> 802 bytes
 mods/default/textures/default_pinewood.png    | Bin 0 -> 455 bytes
 mods/stairs/init.lua                          |   8 +++
 9 files changed, 86 insertions(+)
 create mode 100644 mods/default/textures/default_pine_needles.png
 create mode 100644 mods/default/textures/default_pine_sapling.png
 create mode 100644 mods/default/textures/default_pinetree.png
 create mode 100644 mods/default/textures/default_pinetree_top.png
 create mode 100644 mods/default/textures/default_pinewood.png

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 4cdd426..695d3b1 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -34,6 +34,9 @@ Cisoun's WTFPL texture pack:
   default_tree_top.png
   default_water.png
 
+Cisoun's conifers mod (WTFPL):
+  default_pine_needles.png
+
 Originating from G4JC's Almost MC Texture Pack:
   default_torch.png
   default_torch_on_ceiling.png
@@ -94,6 +97,7 @@ Splizard (CC BY-SA 3.0):
   default_snow.png
   default_snow_side.png
   default_ice.png
+  default_pine_sapling.png
 
 Zeg9 (CC BY-SA 3.0):
   default_coal_block.png
@@ -104,6 +108,9 @@ Zeg9 (CC BY-SA 3.0):
 
 paramat (CC BY-SA 3.0):
   wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0)
+  default_pinetree.png
+  default_pinetree_top.png
+  default_pinewood.png
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index eb15004..448e3e9 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -14,6 +14,13 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:pinewood 4',
+	recipe = {
+		{'default:pinetree'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -800,3 +807,10 @@ minetest.register_craft({
 	recipe = "default:grass_1",
 	burntime = 2,
 })
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:pine_sapling",
+	burntime = 10,
+})
+
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 34f2917..3466191 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -1478,3 +1478,60 @@ minetest.register_node("default:snowblock", {
 		dug = {name="default_snow_footstep", gain=0.75},
 	}),
 })
+
+minetest.register_node("default:pine_needles",{
+	description = "Pine Needles",
+	drawtype = "allfaces_optional",
+	visual_scale = 1.3,
+	tiles = {"default_pine_needles.png"},
+	waving = 1,
+	paramtype = "light",
+	groups = {snappy=3,leafdecay=3,leaves=1},
+	drop = {
+		max_items = 1,
+		items = {
+			{
+				-- player will get sapling with 1/20 chance
+				items = {"default:pine_sapling"},
+				rarity = 20,
+			},
+			{
+				-- player will get leaves only if he get no saplings,
+				-- this is because max_items is 1
+				items = {"default:pine_needles"},
+			}
+		}
+	},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:pine_sapling", {
+	description = "Pine Sapling",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tiles = {"default_pine_sapling.png"},
+	inventory_image = "default_pine_sapling.png",
+	wield_image = "default_pine_sapling.png",
+	paramtype = "light",
+	walkable = false,
+	groups = {snappy=2,dig_immediate=3},
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_node("default:pinetree", {
+	description = "Pine Tree",
+	tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"},
+	paramtype2 = "facedir",
+	is_ground_content = false,
+	groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+	on_place = minetest.rotate_node
+})
+
+minetest.register_node("default:pinewood", {
+	description = "Pinewood Planks",
+	tiles = {"default_pinewood.png"},
+	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
diff --git a/mods/default/textures/default_pine_needles.png b/mods/default/textures/default_pine_needles.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b007be759433464dbc2de2652ff6c56571c6e21
GIT binary patch
literal 512
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Lvyco{eymdpQO
zU|`@Z@Q5sCVBi)8VMc~ob0ioT7#DcDIEGl9E}gu$@0Ec->-if+W?@Wg6ipU7Eo$rf
zUeB<qwkc%cO^;<CPALYK<u$4qUA&hyrStjw*~U}eU$fy=W^|}5k&*KEUTu8%vcWmC
zuiAwn*JmY5C&c_qTb*so-s$`I$+`6op&32<mVbI7!LX$H2HOqi&KqnyPRreW`|ld#
z)7_@a`TtxuzvQ**!jHc*6Zlo1ZR74eo7w%YOx;MEd+toj&WMLf|L660^!s<KDi=MU
zHNT&O;WP7GNwyEue42VrM_P5|HgNSWzxaKNWv<|DhQ_CQ)h)*+Ynha!J?ol%S?sdG
zrO$$fyvi#-y@*I}`>p3BDz)%qNNo1E`1>0Def9Orw(}ja|Midc;u;;68N1(HEEm+Y
zVf-!bQ+~7A#bc66>-XsgrWs7Nox)&n_|nWo!OlX<(|@jReRiSZ*N-h7xifZZ1WpZ^
z)i&|hyRB18{=F+x=bY6x@y)`Pb3EFiFCuNuyB`T!mHGR!K~U-1n>*$>KRzkvHNpCN
ze*5HebKb@5bA4Bt8t-+cJUdRvf8jE&*n8{@6Cxv*g#O>&81k;D!pis$fBK<y4HGst
S9c5r(VDNPHb6Mw<&;$T@J?0Yt

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_pine_sapling.png b/mods/default/textures/default_pine_sapling.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd8167a25dd52a3c8d84417984165294e2962fa3
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Jl0j2P51jp|w%
z7#KJUJR*x37`TN&n2}-D90>*n2KEw9Usv`!>{8649P%w^6Brm6l|5Y?Lo80O4f6Is
zlpru?{gz8yYg?~XC>XlkTC(8Ml@J!b7YF6voz3WB=YMr`_Az#;AR)OvcFt*90rJ(q
zHd*hs-u#*Izg&Cv{P(j?M$CKJ&ceE_mYw0kH`zsVo}Zt|!n!EwLb+G*?5B~fZudoI
zE!&{Z+tB40v%jlkc6s;Y-mkCNE=K)j{d++vX0H3f<Mxt4+Q+{fpK;Xr*QAx}d>UA5
ze=aUOuA(>3WtVc?UJjF-N4*zXnCA3J&o(Rkq##ziNORW0?S2((8`BNv_8u>1`fVo2
z+bFp36jy=ew)J^}>HXXiCT~~z?h8)Jt}b3DeA(S6Lr2Oo`0ObQju_Ls4K6b(*B1Z3
z)2iZ<FZL|j_u(|{*O7)1lZ;>RyPxn7vbw8LURNxwy79fRM99(IcIH1B7#J8lUHx3v
IIVCg!080p-AOHXW

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_pinetree.png b/mods/default/textures/default_pinetree.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a2a8b21790d8d00048847a4a6a9547e6c8a0858
GIT binary patch
literal 693
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N|
z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ETD!pE#7l&{Td%D}*6
z>gnPbVsYAbvUi_OC=cu5efQ6-c~!T8cUexu-}NjiDlgWZ*;Q}sk&yFJL+1Fj`*nYh
zUUA=6t6bsk)j3D0)-UPQpP$Fy*Zlh<{QR}bQ(pB$mGdNy{j|Es+9L5{?d9hwYh80?
z1rJ+4{qs-lct^S1bD54y$B$SZeC86Wpwe#T>Y}mqLUsDNlbep3ES_?#?#+!^F;AHm
zeCK4!dQ|X^kK^3NhD^8jlUa`l{O8Zzx-o|_;dBJsDxGI@ax5=CPx;nY+!rLZH|*PU
z_Un}o=LTgZ-aKTz^cr8oEXl3D0;zo`ojeUMygHiEn|$A4N|4lIv%WonS%<H&{4Q^O
zB6G2N-Rq{U4h}9B=glqM=SWz(AKR6gy_%zmYsD?5<yV3>-i$0>aBj0aKhI$o1LJ2#
zL4FK6(mK&PJF<N=3+ClN+IBgLS<Fw?&@Jw|t9Gx1^6|RI_VefKNNX%;N=%xwK40#4
zpOt~}softxRus(D|Fx&}r+{SchWC>4pM4WJnkIZZ^3mc%<?&7f_v5U`U$58S^O?h~
zQanWTIkVxf-K?zZHc#klUcY~TMV*c1d2_o8165gehNau0_1r4sb8eU2KNxfDYt=`K
zvaFR;t_1{EtzTn#qWam-$CF?0;ZU4VylkuE>bGSH64^Yrc5k@0==!NS!XbvnK^z?%
zTf>5UdJJdO8l8P7%5wO)PiFI$+yt+4lJAvPo!TAJ_t+tHX4-e17xlak1oxWG5^Pdm
x-obQyV`36Z;g*X5&-0BAtlnRLNb^6#L&t=U=^8(GFfcGMc)I$ztaD0e0sw~EG;06=

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_pinetree_top.png b/mods/default/textures/default_pinetree_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e2f8647645e47ea52f0014e6d638b7751cc6f8f
GIT binary patch
literal 802
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N|
z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ETD!pE$|_<E|#YX%0U
zMV>B>Ar_}|C;Mk>hsw0gH-3J`NA2X3C7Ibl(NQ0`!VmT<tYZ;>6n4E%KV0uGm(mWQ
zmfZq-{vG5FiheUyCHLJ)AGPANbMoSj+OKxkh}+M*&%FM}m&yFf|2qstqozv)e|-Pv
zYIf|uyP6IC_vU@ReCvbXLWwysk1osD+Am#eEx`Bt)P_C#)LL53792UdEip#p-7lV0
zAJ^^IYyKSEEn~a)&{o-d?*z15pIIJcpAxj>Q?1Li$$sZ{RR8NaZ~vPqS!>EQ)x}xo
zKSqadxjpM{m1~&ag4>t%u5+kPtn{0`#AE8D@0_2_*ICTZo~M7Cxv{3!(P887<fA_x
zHI+m-HB`I_JUYcCO(jS$dC9-O=`6zM^v+#0KYQ?C+4Y8U7s1Yb%Xj_m{rHC|Jpbcd
zRYA#n(Orv;TLjpvbASJ6@>jiB{VVHuUBt!hw#g!gkIq&Q%Bk(Yol~%_O@&b=@jlZ8
ziD1J^s_WLC^fx(tlV_>OxovCefA&3l$ag)baGNWKV}b6yN;mc5Eqa~|Dfg3S&pW$m
zQFc~}+QzH42d(Au>XzQV?vl><VXx}1j`Kl1EBV;p$@65Y&Gc(u64_@e+SyPOWE872
z!H9LDV2t;dc@j2<WMeeedizu#_#E5+eclDrA9lyXqj$x&uPr+>FGk4O|9%9U)E;{Q
z&19{(>L8&#$`$R~tB*bBP7+vgaKe_7p7UuQOE*kSG??vF@T08%+SA4duTxJ~&rPkc
zIr=tw)$Qpg0v)Y11iX}-j+pWuow&@x*0s;=#_y{K8x2KwhkbZ+I-kSW`Gu9+=VY$6
zfis=FJeR5W=<5eg<}`H6+h2ch?M)jYpI@`&ueH5fov(RZIVEtxmzD)>F4>+n&hKpk
zy>^||u8Xl%i2bzVSgzHxZ@V6~ib-t#b>H%T`Kfm1dZs{w^tZ*W$<+)D3=E#GelF{r
G5}E)pVQQ)X

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_pinewood.png b/mods/default/textures/default_pinewood.png
new file mode 100644
index 0000000000000000000000000000000000000000..4225296140912185e1d3f163fad29247a1449315
GIT binary patch
literal 455
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8
z1_lQ95>H=O_Iunc;u5-t{xc*nFfgWhx;TbtoNo<^_B#|HU~4=#TU36Fslx~N-oQu8
zr3(z#9qZk}ZT@ijq!}|-91PgPx@N)4+~fV;Ty~c6&+VQSrt#g4o5!rMLenkie!5YF
zLub*fy(_XxmDlf;R%2sknD_XnyRK|%QbOI76*rs29;ZZPztQC0*R&w1onZ}2pNHPU
zjhSmp84if7Pg^`U-9I2(HDE$h5ohcM<)oafL(X2ixwZ*Cxy*A<jiLW!Jio-VXkX7q
zcKmF{yb?OsFT9(RB<Xeb?Td3~z3eWn%iezJyY?M<2BrnuuBxaqEai=pTYtTY&E~W5
zvD7Il@08!2zn!|rHvRt=^}x+rBQ7QzZ4L1F$HTBeNcN{!{F@JE8eU&#{P~*uoJn<V
zPx40RkB9xt`t~pVI3vtliD7c!f7{BAGXIW~H&Rq>maXpIT(53*+u^A>=QiohiUOf|
zTYr{Zd3~+iN+&2cVc9``>psmlD&DKNUtJNK^8KlkSiAq49jh2Te*MyCU|?YIboFyt
I=akR{0G9o^jQ{`u

literal 0
HcmV?d00001

diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index afd89bd..c7df28c 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -288,3 +288,11 @@ stairs.register_stair_and_slab("stonebrick", "default:stonebrick",
 		"Stone Brick Stair",
 		"Stone Brick Slab",
 		default.node_sound_stone_defaults())
+
+stairs.register_stair_and_slab("pinewood", "default:pinewood",
+		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
+		{"default_pinewood.png"},
+		"Pinewood Stair",
+		"Pinewood Slab",
+		default.node_sound_wood_defaults())
+