Merge remote-tracking branch 'upstream/master'

depends.txt

@@ -1,5 +0,0 @@
-default
-youngtrees?
-bushes?
-woodsoils?
-flowers?

mod.conf

@@ -0,0 +1,5 @@
+name = christmas_craft
+title = Christmas Craft
+description = Bring the joy of Christmas to Minetest. This mod adds Christmas related things such as presents, baubles , decorations and more, also the mod can also allows you to cover the grass with snow, and make things such as snowmen. You can even have a snowball fight!
+depends = default
+optional_depends = youngtrees,bushes,woodsoils,flowers,moretrees

mod_files/multi-node.lua

@@ -101,7 +101,7 @@ minetest.register_node("christmas_craft:glass_bauble",{
   },
   is_ground_content = true,
   paramtype = "light",
-  use_texture_alpha = true,
+  use_texture_alpha = "blend",
   groups = {crumbly=3},
 	sounds = default.node_sound_glass_defaults(),
   node_box = {

snow.lua

@@ -77,27 +77,56 @@ for _,woodsoil in pairs(woodsoils) do
 	end
 end
 
-local nodebox = {
+-- Replace leaves
-	type = "fixed",
+minetest.override_item("default:pine_needles", {
-	fixed = {
+	tiles = {"default_pine_needles.png^christmas_snow_leaves.png"}
-		{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+})
-	}
+minetest.override_item("default:pine_bush_needles", {
-}
+	tiles = {"default_pine_needles.png^christmas_snow_leaves.png"}
-local leavesoverride = {
+})
---	drawtype = "nodebox",
+minetest.override_item("default:bush_leaves", {
---	visual_scale = 1,
+	tiles = {"(default_leaves.png^[multiply:#c75000)^christmas_snow_leaves.png"}
---	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
+for _, leaves in pairs({"leaves", "aspen_leaves", "jungleleaves"}) do
-minetest.override_item("default:leaves", leavesoverride)
+	local tree_leaves = "default:"..leaves
-minetest.override_item("default:aspen_leaves", leavesoverride)
+	minetest.override_item(tree_leaves, {
-minetest.override_item("default:jungleleaves", leavesoverride)
+		tiles = {
-minetest.override_item("default:bush_leaves", leavesoverride)
+			"(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