Generate leaves with apples instead of apples

mods/default/README.txt

@@ -138,12 +138,16 @@ BlockMen (CC BY-SA 3.0):
   default_chest_lock.png
   default_chest_side.png
   default_chest_top.png
-  default_jungletree_top.png, base on Texture of Cisoun (WTFPL)
+  default_jungletree_top.png, based on texture of Cisoun (WTFPL)
   default_mineral_mese.png
   default_meselamp.png
+  default_apple.png, based on texture of celeron55 (CC-BY-SA 3.0)
+  default_leaves_with_apple.png, based on texture of Cisoun (WTFPL)
   bubble.png
   heart.png
   gui_*.png
+  leaves_with_apple.obj
+  torch_*.obj
 
 Neuromancer (CC BY-SA 2.0):
   default_cobble.png, based on texture by Brane praefect

mods/default/mapgen.lua

@@ -22,7 +22,7 @@ minetest.register_alias("mapgen_sandstone", "default:sandstone")
 
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
-minetest.register_alias("mapgen_apple", "default:apple")
+minetest.register_alias("mapgen_apple", "default:leaves_with_apple")
 minetest.register_alias("mapgen_jungletree", "default:jungletree")
 minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")

mods/default/models/leaves_with_apple.obj

@@ -0,0 +1,80 @@
+# Blender v2.76 (sub 0) OBJ File: 'leaves_with_apple.blend'
+# www.blender.org
+mtllib default_leaves_apple.mtl
+o Cube_Cube.001
+v -0.494900 0.507706 0.497315
+v -0.494900 0.507706 -0.498102
+v -0.494900 -0.497234 -0.498102
+v -0.494900 -0.497234 0.497315
+v 0.497295 0.507706 -0.498102
+v 0.497295 -0.497234 -0.498102
+v 0.497295 0.507706 0.497315
+v 0.497295 -0.497234 0.497315
+v 0.158101 0.160790 -0.112246
+v 0.158101 -0.131804 -0.112246
+v 0.158101 0.160790 0.180347
+v 0.158101 -0.131804 0.180347
+v -0.134493 0.160790 -0.112246
+v -0.134493 -0.131804 -0.112246
+v -0.134493 0.160790 0.180347
+v -0.134493 -0.131804 0.180347
+v -0.026551 0.159064 0.069418
+v -0.026551 0.279774 0.069418
+v -0.026551 0.159064 -0.002894
+v -0.026551 0.279774 -0.002894
+v 0.047132 0.159064 0.069418
+v 0.047132 0.279774 0.069418
+v 0.047132 0.159064 -0.002894
+v 0.047132 0.279774 -0.002894
+vt 0.499998 0.999901
+vt -0.000002 0.999897
+vt 0.000002 -0.000002
+vt 0.500002 0.000002
+vt 0.500000 1.000000
+vt 0.000000 1.000000
+vt 0.781250 0.875000
+vt 0.718750 0.875000
+vt 0.718750 0.687500
+vt 0.781250 0.687500
+vt 0.781172 0.687577
+vt 0.718828 0.687578
+vt 0.781250 0.874909
+vt 0.718841 0.874909
+vt 0.781250 0.812423
+vt 0.718750 0.812423
+vt 0.625000 0.687400
+vt 0.625000 0.187500
+vt 0.874900 0.187500
+vt 0.874900 0.687400
+vt 0.875000 0.187500
+vt 0.875000 0.687500
+vt 0.625000 0.687500
+vt 0.875000 0.687429
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 -0.000000 1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 2/4/2 5/5/2 6/6/2 3/3/2
+f 5/4/3 7/5/3 8/6/3 6/3/3
+f 7/4/4 1/5/4 4/6/4 8/3/4
+f 4/2/5 3/3/5 6/4/5 8/1/5
+f 2/4/6 1/1/6 7/2/6 5/3/6
+f 18/7/1 20/8/1 19/9/1 17/10/1
+f 20/7/2 24/8/2 23/9/2 19/10/2
+f 24/11/3 22/7/3 21/8/3 23/12/3
+f 22/11/4 18/13/4 17/14/4 21/12/4
+f 22/10/6 24/15/6 20/16/6 18/9/6
+usemtl None_NONE
+f 17/3/5 19/3/5 23/3/5 21/3/5
+usemtl None_torches_torch.png
+f 10/17/1 12/18/1 11/19/1 9/20/1
+f 12/20/2 16/17/2 15/18/2 11/19/2
+f 16/17/3 14/18/3 13/19/3 15/20/3
+f 14/18/4 10/19/4 9/20/4 13/17/4
+f 9/21/5 11/22/5 15/23/5 13/18/5
+f 14/17/6 16/18/6 12/21/6 10/24/6

mods/default/nodes/leaves.lua

@@ -47,7 +47,6 @@ default.register_leaves("default:jungleleaves", {
 	}
 })
 
-
 default.register_leaves("default:pine_needles", {
 	description = "Pine Needles",
 	tiles = {"default_pine_needles.png"},
@@ -71,3 +70,31 @@ default.register_leaves("default:acacia_leaves", {
 		}
 	}
 })
+
+
+-- Leaves with apple
+if core.setting_getbool("enable_shaders") and core.setting_getbool("enable_waving_leaves") == true then
+	default.register_leaves("default:leaves_with_apple", {
+		description = "Leaves",
+		tiles = {"default_apple.png^default_leaves.png"},
+		special_tiles = {"default_leaves_simple.png"},
+		drop = "default:apple",
+		after_place_node = function(...)
+		end,
+	})
+else
+	minetest.register_node("default:leaves_with_apple", {
+		description = "Leaves with Apple",
+		drawtype = "mesh",
+		mesh = "leaves_apple.obj",
+		tiles = {"default_leaves_with_apple.png^default_leaves.png"},
+		inventory_image = "default_leaves.png^default_apple.png",
+		paramtype = "light",
+		sunlight_propagates = true,
+		is_ground_content = false,
+		drop = "default:apple",
+		groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1, fuel = 2,
+	 	not_in_creative_inventory = 1},
+		sounds = default.node_sound_leaves_defaults(),
+	})
+end