Add christmas_craft support to fir leaves bright and apple

depends.txt

@@ -1,4 +1,6 @@
 default
 youngtrees?
-woodsoil?
+bushes?
+woodsoils?
 flowers?
+moretrees?

snow.lua

@@ -58,26 +58,75 @@ minetest.override_item(
 		sounds = data.sounds,
 })
 
-local nodebox = {
+-- Replace woodsoils
-	type = "fixed",
+local woodsoils = {
-	fixed = {
+	"woodsoils:grass_with_leaves_1",
-		{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	"woodsoils:grass_with_leaves_2",
-	}
+	"woodsoils:dirt_with_leaves_1",
-}
+	"woodsoils:dirt_with_leaves_2"
-local leavesoverride = {
-	drawtype = "nodebox",
-	visual_scale = 1,
-	tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"},
-	paramtype = "light",
-	node_box = nodebox,
-	selection_box = nodebox
 }
 
--- replace leaves
+for _,woodsoil in pairs(woodsoils) do
-minetest.override_item("default:leaves", leavesoverride)
+	if minetest.registered_nodes[woodsoil] then
-minetest.override_item("default:aspen_leaves", leavesoverride)
+		minetest.override_item(
-minetest.override_item("default:jungleleaves", leavesoverride)
+			woodsoil, {
-minetest.override_item("default:bush_leaves", leavesoverride)
+				tiles = { "default_snow.png", "default_dirt.png", "grass_w_snow_side.png" },
+				sounds = data.sounds
+		})
+		add_drop(minetest.registered_nodes[woodsoil])
+	end
+end
+
+-- Replace leaves
+minetest.override_item("default:pine_needles", {
+	tiles = {"default_pine_needles.png^christmas_snow_leaves.png"}
+})
+minetest.override_item("default:pine_bush_needles", {
+	tiles = {"default_pine_needles.png^christmas_snow_leaves.png"}
+})
+minetest.override_item("default:bush_leaves", {
+	tiles = {"(default_leaves.png^[multiply:#c75000)^christmas_snow_leaves.png"}
+})
+
+for _, leaves in pairs({"leaves", "aspen_leaves", "jungleleaves"}) do
+	local tree_leaves = "default:"..leaves
+	minetest.override_item(tree_leaves, {
+		tiles = {
+			"(default_"..leaves..".png^[multiply:#c75000)^christmas_snow_leaves.png"
+	}})
+end
+
+if minetest.get_modpath("moretrees") then
+	-- replace moretrees leaves adding snow and brown mask
+	for _, leaves in pairs({"beech", "apple_tree", "oak", "birch", "poplar", "willow", "rubber_tree"}) do
+		local tree_leaves = "moretrees:"..leaves.."_leaves"
+		minetest.override_item(tree_leaves, {
+			tiles = {
+				"(moretrees_"..leaves.."_leaves.png^[multiply:#c75000)^christmas_snow_leaves.png"
+		}})
+	end
+
+	-- replace moretrees leaves adding snow				
+	for _, leaves in pairs({"sequoia", "palm", "date_palm", "spruce", "cedar", "fir"}) do
+		local tree_leaves = "moretrees:"..leaves.."_leaves"
+		minetest.override_item(tree_leaves, {
+			tiles = {
+				"moretrees_"..leaves.."_leaves.png^christmas_snow_leaves.png"
+		}})
+	end
+
+	-- fir with bright needles
+	minetest.override_item("moretrees:fir_leaves_bright", {
+		tiles = {
+			"moretrees_fir_leaves_bright.png^christmas_snow_leaves.png"
+	}})
+end
+
+-- Replace apple by the snow version
+minetest.override_item("default:apple", {
+	tiles = {"snow_apple.png"},
+	inventory_image = "snow_apple.png"
+})
 
 -- replace grass
 for i=1,5 do
@@ -94,25 +143,37 @@ if minetest.registered_items["youngtrees:youngtree_top"] then
 	minetest.override_item("youngtrees:youngtree_middle", {tiles = {"christmas_youngtree16xb.png"}})
 end
 
--- Replace woodsoils
+-- Replace bushes
-if minetest.registered_items["woodsoils:grass_with_leaves_1"] then
+if minetest.registered_items["bushes:BushLeaves1"] then
-	minetest.override_item("woodsoils:grass_with_leaves_1", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}})
+	minetest.override_item("bushes:BushLeaves1", {tiles = {"christmas_bushes_leaves.png"}})
-	add_drop(minetest.registered_items["woodsoils:grass_with_leaves_1"])
+	minetest.override_item("bushes:BushLeaves2", {tiles = {"christmas_bushes_leaves.png"}})
-end
+	minetest.override_item("bushes:bushbranches1",
-
+	  {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}})
-if minetest.registered_items["woodsoils:grass_with_leaves_2"] then
+	minetest.override_item("bushes:bushbranches3",
-	minetest.override_item("woodsoils:grass_with_leaves_2", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}})
+	  {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}})
-	add_drop(minetest.registered_items["woodsoils:grass_with_leaves_2"])
+	minetest.override_item("bushes:bushbranches2", {
-end
+		tiles = {
-
+			"christmas_bushes_leaves.png",
-if minetest.registered_items["woodsoils:dirt_with_leaves_1"] then
+			"christmas_bushes_branches_center.png",
-	minetest.override_item("woodsoils:dirt_with_leaves_1", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png^woodsoils_ground_cover_side.png"}})
+			"christmas_bushes_branches_left.png",
-	add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_1"])
+			"christmas_bushes_branches_right.png",
-end
+			"christmas_bushes_branches_center.png",
-
+			"christmas_bushes_branches_right.png"
-if minetest.registered_items["woodsoils:dirt_with_leaves_2"] then
+	}})
-	minetest.override_item("woodsoils:dirt_with_leaves_2", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png^woodsoils_ground_cover_side.png"}})
+	minetest.override_item("bushes:bushbranches4", {
-	add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_2"])
+		tiles = {
+			"christmas_bushes_leaves.png",
+			"christmas_bushes_branches_center.png",
+			"christmas_bushes_branches_left.png",
+			"christmas_bushes_branches_right.png",
+			"christmas_bushes_branches_center.png",
+			"christmas_bushes_branches_right.png"
+	}})
+	minetest.override_item("bushes:youngtree2_bottom", {
+		tiles = {"christmas_bushes_youngtree2trunk.png"},
+		inventory_image = "christmas_bushes_youngtree2trunk_inv.png",
+		wield_image = "christmas_bushes_youngtree2trunk_inv.png"									
+	})
 end
 
 -- replace flowers