Add bushes and fix woodsoils support

depends.txt

@@ -1,4 +1,8 @@
 default
 youngtrees?
-woodsoil?
+bushes?
+woodsoils?
 flowers?
+moreplants?
+moreflowers?
+bakedclay?

snow.lua

@@ -58,6 +58,25 @@ minetest.override_item(
 		sounds = data.sounds,
 })
 
+-- Replace woodsoils
+local woodsoils = {
+	"woodsoils:grass_with_leaves_1",
+	"woodsoils:grass_with_leaves_2",
+	"woodsoils:dirt_with_leaves_1",
+	"woodsoils:dirt_with_leaves_2"
+}
+
+for _,woodsoil in pairs(woodsoils) do
+	if minetest.registered_nodes[woodsoil] then
+		minetest.override_item(
+			woodsoil, {
+				tiles = { "default_snow.png", "default_dirt.png", "grass_w_snow_side.png" },
+				sounds = data.sounds
+		})
+		add_drop(minetest.registered_nodes[woodsoil])
+	end
+end
+
 local nodebox = {
 	type = "fixed",
 	fixed = {
@@ -65,12 +84,13 @@ local nodebox = {
 	}
 }
 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
+--	drawtype = "nodebox",
+--	visual_scale = 1,
+--	tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"},
+	tiles = {"christmas_craft_leaves_side.png"},
+--	paramtype = "light",
+--	node_box = nodebox,
+--	selection_box = nodebox
 }
 
 -- replace leaves
@@ -94,25 +114,37 @@ if minetest.registered_items["youngtrees:youngtree_top"] then
 	minetest.override_item("youngtrees:youngtree_middle", {tiles = {"christmas_youngtree16xb.png"}})
 end
 
--- Replace woodsoils
-if minetest.registered_items["woodsoils:grass_with_leaves_1"] then
-	minetest.override_item("woodsoils:grass_with_leaves_1", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}})
-	add_drop(minetest.registered_items["woodsoils:grass_with_leaves_1"])
-end
-
-if minetest.registered_items["woodsoils:grass_with_leaves_2"] then
-	minetest.override_item("woodsoils:grass_with_leaves_2", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}})
-	add_drop(minetest.registered_items["woodsoils:grass_with_leaves_2"])
-end
-
-if minetest.registered_items["woodsoils:dirt_with_leaves_1"] then
-	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"}})
-	add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_1"])
-end
-
-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"}})
-	add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_2"])
+-- Replace bushes
+if minetest.registered_items["bushes:BushLeaves1"] then
+	minetest.override_item("bushes:BushLeaves1", {tiles = {"christmas_bushes_leaves.png"}})
+	minetest.override_item("bushes:BushLeaves2", {tiles = {"christmas_bushes_leaves.png"}})
+	minetest.override_item("bushes:bushbranches1",
+	  {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}})
+	minetest.override_item("bushes:bushbranches3",
+	  {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}})
+	minetest.override_item("bushes:bushbranches2", {
+		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:bushbranches4", {
+		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