From eca5b6e13c6b08bed05919425ed5a435f462b5f1 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Tue, 28 Feb 2017 19:33:34 +0000
Subject: [PATCH] added support for (0.4.15 dev)'s new leafdecay functions

---
 README.md  |  1 +
 init.lua   |  6 +++---
 leaves.lua | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 mapgen.lua |  4 ++--
 4 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 017d119..b639793 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6)
  - Added bonemeal support for moretree's saplings
  - Added settings.conf file example so that settings remain after mod update
  - Added support for Real Torch so that torches near water drop an unlit torch
+ - Added support for new leafdecay functions (0.4.15 dev)
 
 ### 1.21
 
diff --git a/init.lua b/init.lua
index ae054b5..0bdecd9 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[
 
-	Minetest Ethereal Mod (16th January 2017)
+	Minetest Ethereal Mod (28th February 2017)
 
 	Created by ChinChow
 
@@ -72,8 +72,9 @@ dofile(path .. "/onion.lua")
 dofile(path .. "/crystal.lua")
 dofile(path .. "/water.lua")
 dofile(path .. "/dirt.lua")
-dofile(path .. "/leaves.lua")
+dofile(path .. "/food.lua")
 dofile(path .. "/wood.lua")
+dofile(path .. "/leaves.lua")
 dofile(path .. "/sapling.lua")
 dofile(path .. "/strawberry.lua")
 dofile(path .. "/fishing.lua")
@@ -82,7 +83,6 @@ dofile(path .. "/sealife.lua")
 dofile(path .. "/fences.lua")
 dofile(path .. "/gates.lua")
 dofile(path .. "/mapgen.lua")
-dofile(path .. "/food.lua")
 dofile(path .. "/compatibility.lua")
 dofile(path .. "/stairs.lua")
 dofile(path .. "/lucky_block.lua")
diff --git a/leaves.lua b/leaves.lua
index 0848c2a..38e7c3c 100644
--- a/leaves.lua
+++ b/leaves.lua
@@ -46,7 +46,6 @@ minetest.override_item("default:pine_needles", {
 -- default acacia tree leaves
 minetest.override_item("default:acacia_leaves", {
 	drawtype = leaftype,
---	tiles = {"moretrees_acacia_leaves.png"},
 	inventory_image = "default_acacia_leaves.png",
 	wield_image = "default_acacia_leaves.png",
 	visual_scale = 1.4,
@@ -386,3 +385,62 @@ minetest.register_craft({
 	recipe = "ethereal:bush3",
 	burntime = 1,
 })
+
+-- compatibility check for new mt version with leafdecay function
+if minetest.registered_nodes["default:dirt_with_rainforest_litter"] then
+
+default.register_leafdecay({
+	trunks = {"default:tree"},
+	leaves = {"default:apple", "default:leaves", "ethereal:orange", "ethereal:orange_leaves"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:willow_trunk"},
+	leaves = {"ethereal:willow_twig"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:redwood_trunk"},
+	leaves = {"ethereal:redwood_leaves"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:frost_tree"},
+	leaves = {"ethereal:frost_leaves"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:yellow_trunk"},
+	leaves = {"ethereal:yellowleaves", "ethereal:golden_apple"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:palm_trunk"},
+	leaves = {"ethereal:palmleaves", "ethereal:coconut"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:banana_trunk"},
+	leaves = {"ethereal:bananaleaves", "ethereal:banana"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:birch_trunk"},
+	leaves = {"ethereal:birch_leaves"},
+	radius = 3
+})
+
+default.register_leafdecay({
+	trunks = {"ethereal:bamboo"},
+	leaves = {"ethereal:bamboo_leaves"},
+	radius = 1
+})
+
+end
diff --git a/mapgen.lua b/mapgen.lua
index c0eb4c0..80b7bff 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -597,9 +597,9 @@ minetest.override_item("default:coral_brown", {groups = {crumbly = 3}})
 		deco_type = "schematic",
 		place_on = {"default:sand"},
 		noise_params = {
-			offset = -0.1,
+			offset = -0.15,
 			scale = 0.1,
-			spread = {x = 200, y = 200, z = 200},
+			spread = {x = 100, y = 100, z = 100},
 			seed = 7013,
 			octaves = 3,
 			persist = 1,