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
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00jUI
z00}^+ANT+O010qNS#tmY3ljhU3ljkVnw%H_00E#$L_t(I%XO2zj_NQFh0oY>HdX?x
zAvB>vqK1n1e*mg|f>fc|NT%@0AyIa2fhIE1-fEPI=kJ>{l<(F&4I=?Sd2}2aPfM#a
z!_zR%HuWoURM(ng8(>`iW~*yG2Z>Gn<j$`^RcMU9r}F3+0HlN12G~Q1*ao=E9^LK!
z)&b?aHKz~!*EiBis?hlTnP3kk=C%us&1sA7b|*3`3!RxciCEzx|DKPCk57vwBXZ}O
zpN|Lt^8=k32Jn_lf{e>qI*M(83XP}H_p~`}5!(QP<t}@K#*->EbY|v?o6{E4Fw*l8
zF%2WB^5|G+hWjo;6&j)OR9$QKU*9N?j(>lqw+_TV`u+vctSkhWyX?_-5h*+Y`xi`i
z*@Hw#k|c%qm%x@Vl|7UIFvHTBVG)UOIm`UjwdT-x`uMbnZJ4<zQI%AhhLQU2wUu=K
z?sg{$nud|=p@hy1D^=)OJkLkOQmSeD(=bwXt=YJoL*vOFN{~C(Z-<l4obFt{MeccJ
zUrNk(YhDshp{5F5-Uk4XSy`l2|F?lu?s9lKGyD%{!mfajv4X__0000<MNUMnLSTY;
CJ?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
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv06_pU
z048ZNeuV%4010qNS#tmY3ljhU3ljkVnw%H_000McNliru+y@#16$l@M&0qik0V7F7
zK~y-)tx`)*!e9`bue8z%t%cTjATdVTq@dE&R0Iy_!5{9;Xp9FB>e-vd2O3fm9*zeI
zmMTymd-}3FyF0V<0skI{YoG6$$ylE0hXe(-eFp&0_8p>}=g*l01)^fmcS>`c<ynPB
z-xQjruqO?Gia}hzigcTIi<6D@>ITtT{RREdB3zwEp~pWNQY**w$C$-K`jV-xOn?P_
z`J-{iBrcvrx+7k_2sCWsjnISwoQ@ltHgWPG7JZ^AnxVH&cm}a&F`bRacLMu15e<P6
zp~?zyIkvBE5oeDJ7&PsvO}<lNYkPC96VpdbXe=5zQ_ada2wXMYfJB&it#kj}g(O68
z7Uo+`;g&1wSut3WGw2UT$Vd`8-6(f{a~mbG?-LkQ#k)Q?`2YX_07*qoM6N<$f=dXV
AAOHXW

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
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n@
z11b`4D+M(G00K2hL_t(I%RQ4zjx1FS1;f7I%&h8uunnecfc>uoBqZpr%({OwNMLN~
zC>+O@-+ukY)JL{`BX~zjiJT&RPGZXZ`N!{k{`?c?>m=n3C&GE27{>WJ(FKGU=&jS|
zWUWPQ9TCGj<^298$B1_x=NyRA$HY0o=0sH>B!@ahL@1@uduPtcvc)u`l*WGS*qU7B
z0-*N^0&3!L?hXjfv4Ckt?~?_@5dRNtwXtjgV9Qtrsx0Q5Y&p^AWcH48j#3)ER`%xy
z*LmTcQfgt@!aJqb4uF~&wM`IZj>$qvG0^J8XpLjvK$KD%qc)DbQEJ211p9Y|<Q&m^
zuIqxeKtMz|&o?<ooESMr#=2>1s|bP$sM-Rj)Kan8S#zMyvmXx(!$dGM<}y-F04y6U
zTP(P1Oet`lZ{oJoS_2kN9Wh2;*F`Ih7$e7i<3FFDEE_1Gf?;BuuWugvjyf<i%DeIL
zcyOIB`n-kt5E*T-?-?KSO<)LukoLs!ILLX&i7-dU1;^{JFTC>zMtK)h73Tvn`nv@M
zuCtJigRj58cz!%N&o@4JFeM!a0HwBDE=GA@Y}<C<!Cc1mdhs}RYN?dgP*HlXtU1Vg
z=K153>%0gdkaMQBL96X{U>Iu*+PkpUqSwlt6I3xXQV56$wN_G0j4_yfGR^K41jENn
zX@j(FU`oyz?;@(oyHt+jKvkJ$_bljt4d4;IHJTBEC#Q%4$FX5z1aY*{Q0H$lz^lK1
b!YTg%;Xz=CmniwT00000NkvXXu0mjfhT1f1

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
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n@
z11bUQl|<_R00N>(L_t(I%WacSYb#Y8hMzO%%uFW9<fLh9Qd?T^3Rl68Ag%-#;#Svw
zFIO)83L>}?gu4*D{=o}UTkMr2ZSKiTCUa)a9~VI@>brawKc3$MulV$n4<rAGF%?>u
z7*p}@{MBn+{@p2nkKUg1)7tP(p%|Q8;?o>GKc%fZ5Dxpwu)Mw|goMp-#Lc#0Tqy4P
z3}sA3x7U39!Mhwiy~4E}-tG`8Mdmrd2b5Bz@_j^>lTOaKd;W~iKl=h>DwNhGqiWCb
zTUWH(n%#OuR!*SX(=OKtC6Refo1{pUlJ^PoH?BCJYo0IL1A%;fK|rzlW5xL5f^=9y
zfOzat#gs&5BvKJ$r2hS91QX6K&e1o`!NGRdfOkX@iN2@0`;GDZ0#|SGoh1<&-dl>J
zGlUQadu{vpf=?yUd-`g}epu1BJ!2HZ#hV}!Y<-X0Y;d-QBmo>@-vW>rQ!&yduC2*W
zG{e~pr4-J#tbh5A=HU+4Y;m?l2tjZy-g!nRbF?l=0A$}|o1V?GqHAhoCb88$!8;yq
zex=*jL}vl;y(RjH&r*!34hQZZ3~45rPKTsfjx`mDfP7LiT`Z6?1(6Y4OZ1)?Ji;AZ
zD6LCOd%*KukN2L?HTXWqS6jMWhpl$Zo?H?`Pv2Mu8oWOcDPt;Ldr}g-BY20md&cJr
zVi2gokhFA+&t^!au$5sjn?i8-c8}KOf#B<9%X^(=cs#}JTdLca$WcK$C=f~_Lc}!<
z#gV2sJw=X2*!$JNfiV@kR`Bf0ZwO68=sHI8V+yTNnL<iQrYDRqFHw^TF-C5`f5ENU
zJQ7U$njhAN?yGMp$0KA>p!9^GhD2*gd_(U%QA)baD}G!(AYJmf#%((0_PXMQ78tYo
g-#Pzx%7+7g0#Pt$?Q?}=djJ3c07*qoM6N<$f-zxgssI20

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
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vs1Q!@B!v6qZ0004INkl<ZD9?pbTTa4I5Ir-UYZV`~
zH9+u3jZxyK8*nkM#*MfOH{q9(n3$-+P_zZCpy_SLk4p+ZIbY{K=5b~Y-CmvpAgC!u
zQr~AXSU`z#n!TuMbtA968zu$=0G{LdM=c#?VqkuhsM&%R<78NC>?sSrf}moD0IUR#
zNG_qVX{~htz!a}$qn&3@P-`Vnkb-gvU9cl!Y-++oO1lcS66Dhi-X;K#$zKl`=37lk
z;yw=sGYuFl*U;{qVi`)!?dZ<UN<PxAYq!$(E8HId0-(0lBqac)4PG9v*MbH-^E1X}
zlqBvW?$6t0ygg_Cv?o!swOG+(GPO`h{tN)H5*_(UU+nNUC`$F1{Pk_;0wtY{W3fZ=
z!%jAizoqe*RyQI5lTrUYd5CsTh{@PwB|N69i?e?xI@>_yHwm^Ivmp>wZngPz)a%xF
xIxJFcV5Y$jJB}&rBulHe)u>%$_vJzshfl1yssKp(`Y!+g002ovPDHLkV1kzYxs3n-

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())
+