From c0837e414401f70483e53556da5942cdbe0efdc1 Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Sat, 9 Apr 2016 13:41:47 +0200
Subject: [PATCH] added apple

---
 mods/farming/init.lua                   |  34 +++++++++++++++++++-----
 mods/farming/textures/farming_apple.png | Bin 0 -> 314 bytes
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 mods/farming/textures/farming_apple.png

diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 0300194..08c277b 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -53,7 +53,6 @@ minetest.override_item("default:plant_grass", {drop = {
 	max_items = 1,
 	items = {
 		{items = {'farming:sugarcane'},rarity = 20},
-		{items = {'farming:wheat_seeds'},rarity = 5},
 		{items = {'default:plant_grass'}},
 	}
 }})
@@ -62,7 +61,6 @@ minetest.override_item("default:plant_grass_2", {drop = {
 	max_items = 1,
 	items = {
 		{items = {'farming:wheat_seeds'},rarity = 5},
-		{items = {'farming:sugarcane'},rarity = 20},
 		{items = {'default:plant_grass'}},
 	}
 }})
@@ -71,7 +69,6 @@ minetest.override_item("default:plant_grass_3", {drop = {
 	max_items = 1,
 	items = {
 		{items = {'farming:wheat_seeds'},rarity = 5},
-		{items = {'farming:sugarcane'},rarity = 20},
 		{items = {'default:plant_grass'}},
 	}
 }})
@@ -80,7 +77,6 @@ minetest.override_item("default:plant_grass_4", {drop = {
 	max_items = 1,
 	items = {
 		{items = {'farming:wheat_seeds'},rarity = 5},
-		{items = {'farming:sugarcane'},rarity = 20},
 		{items = {'default:plant_grass'}},
 	}
 }})
@@ -89,13 +85,24 @@ minetest.override_item("default:plant_grass_5", {drop = {
 	max_items = 1,
 	items = {
 		{items = {'farming:wheat_seeds'},rarity = 5},
-		{items = {'farming:sugarcane'},rarity = 20},
 		{items = {'default:plant_grass'}},
 	}
 }})
 
 -- other plants
 
+minetest.register_node("farming:apple", {
+	description = "Apple",
+	tiles = {"farming_apple.png"},
+	drawtype = "plantlike",
+	paramtype = "light",
+	inventory_image = "farming_apple.png",
+	groups = {crumbly=3},
+	walkable = false,
+	on_use = minetest.item_eat(2),
+})
+
+
 minetest.register_node("farming:sugarcane", {
 	description = "Sugarcane",
 	tiles = {"farming_sugarcane.png"},
@@ -108,7 +115,7 @@ minetest.register_node("farming:sugarcane", {
 
 minetest.register_abm({
 	nodenames = {"farming:sugarcane"},
-	neighbors = {"default:dirt", "default:grass"},
+	neighbors = {"default:dirt", "default:grass", "default:sand"},
 	interval = 10.0,
 	chance = 5,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -117,6 +124,21 @@ minetest.register_abm({
 	end,
 })
 
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:sand"},
+	sidelen = 16,
+	fill_ratio = 0.04,
+	biomes = {
+		"beach"
+	},
+	spawn_by = "default:water_source",
+	num_spawn_by = 1,
+	y_min = 0,
+	y_max = 31000,
+	decoration = "farming:sugarcane",
+})
+
 minetest.register_node("farming:cactus", {
 	description = "Cactus",
 	tiles = {"farming_cactus_top.png", "farming_cactus_top.png", "farming_cactus.png"},
diff --git a/mods/farming/textures/farming_apple.png b/mods/farming/textures/farming_apple.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cc77d307b507a70b0ffdfc1106aa00dc8c9c620
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN3n!Nz-)4iKQ-MN~C9V-A&iT2ysd*&~&PAz-C8;S2
z<(VZJ3hti10pX2&;y^`<JY5_^EKZ-D<jr;1fXBtXlX<6$;_a~Mr}VCWTDnL73s<X7
z(n7r`=Re)tsuylnCft+oJP;YB^E&Bg4aZcU(`!`g%lc+9oL;lN&_!X5l0fZ#xqImX
zR$TUb-Te!X*WOm@_{qZPu-;RG!Ns)s&DE)A1lT6DE>G-8yYhF}JDv?)A-88|Z#h$C
z_{?AipW*L==4;Pda~!_4{aWA3sOd4vXU{#f|H@=h>h`y6-ev=!YZ*LU{an^LB{Ts5
D5Il3e

literal 0
HcmV?d00001