From bdb6c217aee656e74a543eaa9d53ca338a8615cf Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Sat, 20 Feb 2016 12:13:32 +0100
Subject: [PATCH] added sticks and twigs

---
 mods/classes/init.lua                         |  16 +++----
 mods/default/craft.lua                        |  43 +++++++++++++++---
 mods/default/craftitems.lua                   |  10 ++++
 mods/default/nodes.lua                        |  11 ++++-
 mods/default/textures/default_frame.png       | Bin 365 -> 386 bytes
 .../default/textures/default_frame_detail.png | Bin 0 -> 412 bytes
 mods/default/textures/default_glass.png       | Bin 331 -> 306 bytes
 mods/default/textures/default_stick.png       | Bin 0 -> 246 bytes
 mods/default/textures/default_twig.png        | Bin 0 -> 277 bytes
 mods/fishing/init.lua                         |   6 +--
 mods/torch/init.lua                           |   2 +-
 11 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 mods/default/textures/default_frame_detail.png
 create mode 100644 mods/default/textures/default_stick.png
 create mode 100644 mods/default/textures/default_twig.png

diff --git a/mods/classes/init.lua b/mods/classes/init.lua
index dc3da2f..0ae4fbc 100644
--- a/mods/classes/init.lua
+++ b/mods/classes/init.lua
@@ -154,7 +154,7 @@ classes.register_weapon("spear",2, 12, {
 	recipe = {
 		{"", "default:flint", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -189,7 +189,7 @@ classes.register_weapon("hoe",2, 20, {
 	recipe = {
 		{"", "furnace:iron_rod", "default:blade"},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -202,7 +202,7 @@ classes.register_weapon("pitchfork",15, 30, {
 	recipe = {
 		{"furnace:iron_rod", "furnace:iron_rod", "furnace:iron_rod"},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -213,8 +213,8 @@ classes.register_weapon("stick",2, 30, {
 	damage = 9,
 	class = "thief",
 	recipe = {
-		{"", "default:log_3", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -225,9 +225,9 @@ classes.register_weapon("long_stick",20, 60, {
 	damage = 20,
 	class = "thief",
 	recipe = {
-		{"", "default:log_3", ""},
-		{"", "default:log_3", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
+		{"", "default:stick", ""},
+		{"", "default:stick", ""},
 	}
 })
 
diff --git a/mods/default/craft.lua b/mods/default/craft.lua
index 3362d1b..2498c19 100644
--- a/mods/default/craft.lua
+++ b/mods/default/craft.lua
@@ -42,6 +42,20 @@ minetest.register_node("default:workbench_v2", {
 
 -- wood
 
+minetest.register_craft({
+	output = "default:twig 3",
+	recipe = {
+		{"group:leaves"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:stick",
+	recipe = {
+		{"default:twig"},
+	}
+})
+
 minetest.register_craft({
 	output = "default:wood 3",
 	recipe = {
@@ -57,7 +71,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:wood",
+	output = "default:stick 4",
 	recipe = {
 		{"default:log_3"},
 	}
@@ -71,6 +85,23 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:frame 2",
+	recipe = {
+		{"default:stick", "default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:ladder",
+	recipe = {
+		{"default:stick", "", "default:stick"},
+		{"default:string_strong", "default:stick", "default:string_strong"},
+		{"default:stick", "", "default:stick"},
+	}
+})
+
 -- stone
 
 minetest.register_craft({
@@ -155,7 +186,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "default:log_1", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -164,7 +195,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "default:stone_item", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -173,7 +204,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "furnace:iron_plate", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -182,7 +213,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "furnace:iron_rod", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
 
@@ -191,6 +222,6 @@ minetest.register_craft({
 	recipe = {
 		{"default:blade", "furnace:iron_plate", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index a006db2..6189a9f 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -44,6 +44,16 @@ minetest.register_craftitem("default:string_strong", {
 	inventory_image = "default_string_strong.png",
 })
 
+minetest.register_craftitem("default:stick", {
+	description = "Stick",
+	inventory_image = "default_stick.png",
+})
+
+minetest.register_craftitem("default:twig", {
+	description = "Twig",
+	inventory_image = "default_twig.png",
+})
+
 minetest.register_craftitem("default:coin", {
 	description = "Coin",
 	inventory_image = "default_coin.png",
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index f2a162b..284edcf 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -61,6 +61,13 @@ minetest.register_node("default:leaves_1", {
 	groups = {crumbly = 3, leaves = 1},
 	walkable = false,
 	climbable = true,
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"default:sapling 2"},rarity = 3},
+			{items = {'default:leaves_1'}},
+		}
+	},
 })
 
 minetest.register_node("default:leaves_2", {
@@ -501,8 +508,8 @@ minetest.register_node("default:straw", {
 
 minetest.register_node("default:frame", {
 	description = "Frame",
-	tiles = {"default_frame.png"},
-	drawtype = "allfaces",
+	tiles = {"default_frame.png", "default_frame_detail.png"},
+	drawtype = "glasslike_framed_optional",
 	paramtype = "light",
 	groups = {choppy = 3},
 })
diff --git a/mods/default/textures/default_frame.png b/mods/default/textures/default_frame.png
index eef7d5d7954453f1e9971613d49cec8a60ec50cb..2bb9697486ad6dd8c80e1ec450b13e16163b9d10 100644
GIT binary patch
delta 296
zcmV+@0oVTR0)hjOBo78+OGiWi{{a60|De66laV1G2?7)f4H7h~s9BLoD1YinL_t(o
z!^PJz4uUWg#_<m#i6QBrSMw4~dKLx~FG1qTsAw=G4mco9z@oH$@3m96-=DSvFS(wN
zJtD3R0Nn0v6kIp$5C8xw&k}C%@q7UQw)-8rTKDDz#&tMd*zl?>%)YC&*{2dmU6qCT
z`uR$wag}FKc_tHJ!{^tW#(%`w0@mUz0WLUsfGbWK;DeI|_~Il1A$V{=C>|6*fqMr~
z;a&lhxN`tC?i9d*uMXhCR|Rn5e*?Jjp8*p1Vt^EG4UojY0;KWDTrmG_mcSR^fD}GC
ufzP;Pon%A;##zmF9qa+Ri8CDoz#Am|u+VA!wg~_L002ovPDHLkU;%>aS%EYF

delta 301
zcmV+|0n+}01MLEkBqa%ONLh0L01FcU01FcV0GgZ_00007bV*G`2jBq#3@9CF4aDG)
zTPT0$Nkl<ZSi{BFK@Ng25QX7KBZ(nlp;z+~tn@4_OuPh%C$pl#n7F_NsnRM++nH%E
z@cm3#bh6`q+auvw0KoauCBb#u4FLd97CAe3y*&T`%k>KPlYURYoXzf#ap6r}y{_8e
z0H7pB-PBcYzTQ1b8ZV37x^5+nyVtBz;%t2Zb8(gcADleE7bgt}!N~$bagu--JUSp2
zj|!l`g9E7Wpa4qTJAfMZ3gEzJ2XNuD0yy!%0o?e{0113DKnnjFAc=njNaNOC;69rr
z@X3Eb3b!UOUYFcWMkHX2Pi--50lH1I9Rt7<x@O1F$xwyC00000NkvXXu0mjfFL`}~

diff --git a/mods/default/textures/default_frame_detail.png b/mods/default/textures/default_frame_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..84132e0ac097547571dbea081b3bffad326b59c5
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pIsNrX#8SMsb*4Nyq3#5JPCIX^cyHLrxhxhOTUBsE2$
zJhLQ2!QIn0AiR-JoPmLn#nZ(xB;xSZa6`Uk10EZ9Cnpb{52o`jwDzW#q$R&${~^WW
z!O_|1w=zIFYSN8}RF{qKiwfUx+rHb*%kW9Z@oGs6_r85=w`ayNG93Fi=b312bbfdf
zbHmBaEDRH-wOVj;&zr`&=GBuV)j}C}i7(lWDi#bEZng?NkZ0N9Ip?J7!bX_~?JP;2
zKaL26FS;P{=#DQ(qM4_2e~(3%*0Q)o+PBY5yda%i!x7@^F7`#%;>)g0rV`#4%%^ka
zZoEH5AT(kBZyRrc+lIb9U-VRK{vN51alY!d<W^T``@~lkVWujprukf*vg%gR)%KJB
zc5dNW{6hI^YpRZR=7+uWBicTiTK6n@lkRg?xbRqa>c;7RUIGJ+!PC{xWt~$(69Av3
Bo?!q0

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_glass.png b/mods/default/textures/default_glass.png
index 7d1f4c81f548bb53e361ef9b7189b4879d608436..abe8e2b903cd6ac02ea1f5945fa09f740687ae39 100644
GIT binary patch
delta 195
zcmV;!06hQ80<r>-QwS6a0xRq`Jf4wTD1VwsL_t(o!(+Vv=GA`&8i0=<KN6*mg%rj7
z{QN{afLOIGFvkAQTt+$ZhYa)pk6y|%1hg&s&%nUIzyuSdm*wboF)<7<U?MecY2ttZ
z4}nn!3>5hI@#AO|j5=VDIDpvNa9D)^%+n(~4e;~xj~2zFQ80oX0BZ)0wh2caz%Yc|
xU7{C2wu=$gJH}QelbSfmF@up--E(3c2>?<0GmDP)8{_~0002ovPDHLkV1gslRPX=*

delta 220
zcmV<203-jh0?PuBQwRwOHV4J=l97>HD1Wm_L_t(o!|hi=3IZ_<oD}aldUL<zNBoB1
zH~ffC5%;#@B`=7lK+%HjA?`vlr&2;Q&4e~X_t#V501@em+l>S>GxZW+W?Sk{0swHk
zoanHBcogG{^t?<sp05f3#WtOiH&N#*SQ%whTNeT=fwm(-SOOxF5+s3*5D*a!S4jc8
zbnG5r=6s4%g1`i9Y%d=(e9nY{n{ZyHza_16k-6iRK^-+Lt#7?*@YY#MUiQ4#w!Z=U
WsyK~WNvp#E0000<MNUMnLSTYq)?cOo

diff --git a/mods/default/textures/default_stick.png b/mods/default/textures/default_stick.png
new file mode 100644
index 0000000000000000000000000000000000000000..d38d67d7861e6fb9a73d2fae16a153241726de98
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}!+2@Kwke+Xy-MK}vQ
zB8wRqxP?KOkzv*x37{Z*iKnkC`vWEsE;)s{lXrLng(OQ{BTAg}b8}PkN*J7rQWHy3
zQxwWGOEMJPJ$(bh8~Mb6isC$7978NlCnrd7T$m#GXTR3L-}cNvAZ$6S{?8A_=f;y(
z@60_I<~E7vz_OVc%mtZhrx<ExaY{LO7{@VpT<p2bkYt){+8}aPf^EVo$)gNKCWm<y
i!i{b8C#;^S#lVnI5*<;%YT*d9iNVv=&t;ucLK6VraYnfS

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_twig.png b/mods/default/textures/default_twig.png
new file mode 100644
index 0000000000000000000000000000000000000000..47af72056b12923f558c5f805f753bc8f152f8d2
GIT binary patch
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}!+2@Kwke+Xy-MK}vQ
zB8wRqxP?KOkzv*x37{Z*iKnkC`vWEsE=803)7?NuN|v}rlsM<-=BDPAFgO>bCYGe8
zD3oWGWGJ|M`UZqI@`(c#)q1)(hFF|VPFSFxaf;(#{L}}3<s*AK^R^{!o~xyoa4_|E
zzr4M~EwP-`l!SzYhMRY`C1@vyHhr(><Ktrkg0@|f*^-eR8(W*3n;#zUmoI33m9{4J
z$ZMvQhBx^$x;yyxtYXPu!{{EOp!9pT4s%DTk+ABlPOnwY4#rCv7-kr{%-6c{at_cT
N44$rjF6*2UngDN(S?mA+

literal 0
HcmV?d00001

diff --git a/mods/fishing/init.lua b/mods/fishing/init.lua
index dd65ce7..84a8e04 100644
--- a/mods/fishing/init.lua
+++ b/mods/fishing/init.lua
@@ -19,9 +19,9 @@ minetest.register_craftitem("fishing:fishing_rod", {
 minetest.register_craft({
 	output = "fishing:fishing_rod",
 	recipe = {
-		{"default:log_3", "default:string", ""},
-		{"default:log_3", "default:string", ""},
-		{"default:log_3", "default:string", ""},
+		{"default:stick", "default:string", ""},
+		{"default:stick", "default:string", ""},
+		{"default:stick", "default:string", ""},
 	}
 })
 
diff --git a/mods/torch/init.lua b/mods/torch/init.lua
index dfad0bf..67590bf 100644
--- a/mods/torch/init.lua
+++ b/mods/torch/init.lua
@@ -60,6 +60,6 @@ minetest.register_craft({
 	recipe = {
 		{"", "default:coal_lump", ""},
 		{"", "default:string_strong", ""},
-		{"", "default:log_3", ""},
+		{"", "default:stick", ""},
 	}
 })