Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

fixes #24

building_blocks/init.lua

@@ -5,3 +5,6 @@ dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
 dofile(modpath.."/recipes.lua")
+
+minetest.log("action", "[building_blocks] loaded.")
+

computer/init.lua

@@ -97,3 +97,5 @@ dofile(MODPATH.."/computers.lua")
 dofile(MODPATH.."/printers.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
+
+minetest.log("action", "[computer] loaded.")

computer/tetris.lua

@@ -1,4 +1,3 @@
-
 local S = homedecor.gettext
 
 local shapes = {
@@ -220,10 +219,10 @@ local function step(pos, fields)
 	if fields then
 		if fields.new then
 			new_game(pos)
-		else
+		elseif t then
 			key(fields)
 		end
-	else
+	elseif t then
 		run = tick()
 	end
 

fake_fire/init.lua

@@ -3,7 +3,80 @@ local S = homedecor.gettext
 
 screwdriver = screwdriver or {}
 
-local function start_smoke(pos, node, clicker, chimney)
+local function fire_particles_on(pos) -- 3 layers of fire
+	local meta = minetest.get_meta(pos)
+	local id = minetest.add_particlespawner({ -- 1 layer big particles fire
+		amount = 9,
+		time = 0,
+		minpos = {x = pos.x - 0.2, y = pos.y - 0.4, z = pos.z - 0.2},
+		maxpos = {x = pos.x + 0.2, y = pos.y - 0.1, z = pos.z + 0.2},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 0.7, z= 0},
+		minexptime = 0.5,
+		maxexptime = 0.7,
+		minsize = 2,
+		maxsize = 5,
+		collisiondetection = false,
+		vertical = true,
+		texture = "fake_fire_particle_anim_fire.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.8,},
+	})
+	meta:set_int("layer_1", id)
+
+	local id = minetest.add_particlespawner({ -- 2 layer smol particles fire
+		amount = 1,
+		time = 0,
+		minpos = {x = pos.x - 0.1, y = pos.y, z = pos.z - 0.1},
+		maxpos = {x = pos.x + 0.1, y = pos.y + 0.4, z = pos.z + 0.1},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 1, z= 0},
+		minexptime = 0.4,
+		maxexptime = 0.6,
+		minsize = 0.5,
+		maxsize = 0.7,
+		collisiondetection = false,
+		vertical = true,
+		texture = "fake_fire_particle_anim_fire.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.7,},
+	})
+	meta:set_int("layer_2", id)
+
+	local id = minetest.add_particlespawner({ --3 layer smoke
+		amount = 1,
+		time = 0,
+		minpos = {x = pos.x - 0.1, y = pos.y - 0.2, z = pos.z - 0.1},
+		maxpos = {x = pos.x + 0.2, y = pos.y + 0.4, z = pos.z + 0.2},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 1, z= 0},
+		minexptime = 0.6,
+		maxexptime = 0.8,
+		minsize = 2,
+		maxsize = 4,
+		collisiondetection = true,
+		vertical = true,
+		texture = "fake_fire_particle_anim_smoke.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.9,},
+	})
+	meta:set_int("layer_3", id)
+end
+
+local function fire_particles_off(pos)
+	local meta = minetest.get_meta(pos)
+	local id_1 = meta:get_int("layer_1");
+	local id_2 = meta:get_int("layer_2");
+	local id_3 = meta:get_int("layer_3");
+	minetest.delete_particlespawner(id_1)
+	minetest.delete_particlespawner(id_2)
+	minetest.delete_particlespawner(id_3)
+end
+
+local function start_fire_effects(pos, node, clicker, chimney)
 	local this_spawner_meta = minetest.get_meta(pos)
 	local id = this_spawner_meta:get_int("smoky")
 	local s_handle = this_spawner_meta:get_int("sound")
@@ -41,7 +114,7 @@ local function start_smoke(pos, node, clicker, chimney)
 				max_hear_distance = 5,
 				loop = true
 			})
-			this_spawner_meta:set_int("smoky", id)
+			fire_particles_on(pos)
 			this_spawner_meta:set_int("sound", s_handle)
 		end
 	end
@@ -83,7 +156,7 @@ minetest.register_node("fake_fire:ice_fire", {
 		aspect_w=16, aspect_h=16, length=1.5}},
 	},
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		start_smoke(pos, node, clicker)
+		start_fire_effects(pos, node, clicker)
 		return itemstack
 	end,
 	on_destruct = function (pos)
@@ -97,42 +170,54 @@ minetest.register_node("fake_fire:ice_fire", {
 
 minetest.register_alias("fake_fire:fake_fire", "fire:permanent_flame")
 
+local sbox = {
+	type = 'fixed',
+	fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16},
+}
+
 minetest.register_node("fake_fire:fancy_fire", {
-		inventory_image = "fancy_fire_inv.png",
-		description = S("Fancy Fire"),
-		drawtype = "mesh",
-		mesh = "fancy_fire.obj",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {dig_immediate=3},
-		sunlight_propagates = true,
-		light_source = 14,
-		walkable = false,
-		damage_per_second = 4,
-		on_rotate = screwdriver.rotate_simple,
-		tiles = {
-		{name="fake_fire_animated.png",
-		animation={type='vertical_frames', aspect_w=16, aspect_h=16, length=1}}, {name='fake_fire_logs.png'}},
-		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-			start_smoke(pos, node, clicker)
-			return itemstack
-		end,
-		on_destruct = function (pos)
-			stop_smoke(pos)
-			minetest.sound_play("fire_extinguish", {
-				pos = pos, max_hear_distance = 5
-			})
-		end,
-		drop = {
-			max_items = 3,
-			items = {
-				{
-					items = { "default:torch", "default:torch", "building_blocks:sticks" },
-					rarity = 1,
-				}
+	inventory_image = "fancy_fire_inv.png",
+	description = S("Fancy Fire"),
+	drawtype = "mesh",
+	mesh = "fancy_fire.obj",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {oddly_breakable_by_hand=3, flammable=0},
+	sunlight_propagates = true,
+	light_source = 13,
+	walkable = false,
+	buildable_to = false,
+	damage_per_second = 3,
+	selection_box = sbox,
+	tiles = {
+		"basic_materials_concrete_block.png",
+		"default_junglewood.png",
+		"fake_fire_empty_tile.png"
+	},
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		fire_particles_on(pos)
+		return itemstack
+	end,
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		fire_particles_on(pos)
+	end,
+	on_destruct = function(pos, oldnode, oldmetadata, digger)
+		fire_particles_off(pos)
+		minetest.sound_play("fire_extinguish", {
+			pos = pos, max_hear_distance = 5
+		})
+	end,
+	drop = {
+		max_items = 3,
+		items = {
+			{
+				items = { "default:torch", "default:torch", "building_blocks:sticks" },
+				rarity = 1,
 			}
 		}
-	})
+	}
+})
 
 -- EMBERS
 minetest.register_node("fake_fire:embers", {
@@ -168,7 +253,7 @@ for _, mat in ipairs(materials) do
 		},
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			local chimney = 1
-			start_smoke(pos, node, clicker, chimney)
+			start_fire_effects(pos, node, clicker, chimney)
 			return itemstack
 		end,
 		on_destruct = function (pos)
@@ -209,8 +294,24 @@ minetest.register_craft({
 })
 
 -- ALIASES
+
 minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire")
 minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
 minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
 minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
 minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
+
+-- OTHER
+
+minetest.register_lbm({
+	name = "fake_fire:reload_particles",
+	label = "restart fire particles on reload",
+	nodenames = {"fake_fire:fancy_fire"},
+	run_at_every_load = true,
+	action = function(pos, node)
+		fire_particles_off(pos)
+		fire_particles_on(pos)
+	end
+})
+
+minetest.log("action", "[fake_fire] loaded.")

homedecor_3d_extras/init.lua

@@ -121,3 +121,6 @@ if minetest.get_modpath("doors") then
 	end
 
 end
+
+minetest.log("action", "[homedecor_3d_extra] loaded.")
+

homedecor_common/init.lua

@@ -77,6 +77,6 @@ dofile(modpath.."/mt_game_beds_functions.lua")
 dofile(modpath.."/sit.lua")
 dofile(modpath.."/crafts.lua")
 
-if minetest.settings:get_bool("log_mod") then
+if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "[HomeDecor API] " .. S("Loaded!"))
 end

homedecor_doors_and_gates/init.lua

@@ -620,8 +620,8 @@ minetest.register_craft( {
 	type = "shapeless",
         output = "doors:homedecor_closet_mahogany 2",
         recipe = {
-			"doors:homedecor_closet_oak_a",
-			"doors:homedecor_closet_oak_a",
+			"doors:homedecor_closet_oak",
+			"doors:homedecor_closet_oak",
 			"dye:brown"
         },
 })
@@ -643,7 +643,7 @@ minetest.register_craft( {
 	output = "doors:homedecor_basic_panel",
 	recipe = {
 		{ "dye:white", "dye:white", "" },
-		{ "doors:homedecor_wood_plain_a", "basic_materials:brass_ingot", "" },
+		{ "doors:homedecor_wood_plain", "basic_materials:brass_ingot", "" },
 		{ "", "", "" },
 	},
 })

homedecor_exterior/depends.txt

@@ -2,6 +2,7 @@ homedecor_common
 default
 dye
 creative
+basic_materials
 moreblocks?
 building_blocks?
 bucket?

homedecor_exterior/init.lua

@@ -349,7 +349,7 @@ minetest.register_craft({
 	recipe = {
 		{ "","homedecor:fence_chainlink","" },
 		{ "default:steel_ingot","fake_fire:embers","default:steel_ingot" },
-		{ "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" }
+		{ "basic_materials:steel_bar","default:steel_ingot","basic_materials:steel_bar" }
 	},
 })
 

homedecor_fences/depends.txt

@@ -2,4 +2,4 @@ homedecor_common
 default
 basic_materials
 dye
-basic_signs?
+signs_lib?

homedecor_fences/init.lua

@@ -264,7 +264,7 @@ homedecor.register("fence_wrought_iron_2_corner", {
 })
 
 -- insert the old wood signs-on-metal-fences into signs_lib's conversion LBM
-if minetest.get_modpath("basic_signs") then
+if minetest.get_modpath("signs_lib") then
 	table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_brass_with_sign")
 	signs_lib.old_fenceposts["homedecor:fence_brass_with_sign"] = "homedecor:fence_brass"
 	signs_lib.old_fenceposts_replacement_signs["homedecor:fence_brass_with_sign"] = "default:sign_wall_wood_onpole"
@@ -272,8 +272,6 @@ if minetest.get_modpath("basic_signs") then
 	table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_wrought_iron_with_sign")
 	signs_lib.old_fenceposts["homedecor:fence_wrought_iron_with_sign"] = "homedecor:fence_wrought_iron"
 	signs_lib.old_fenceposts_replacement_signs["homedecor:fence_wrought_iron_with_sign"] = "default:sign_wall_wood_onpole"
-
-	signs_lib.allowed_poles["homedecor:pole_brass"] = true
 end
 
 -- crafting

homedecor_lighting/init.lua

@@ -1895,3 +1895,4 @@ if minetest.get_modpath("darkage") then
 	end
 end
 
+minetest.log("action", "[homedecor_lightning] loaded.")

homedecor_misc/depends.txt

@@ -5,3 +5,4 @@ unifieddyes
 building_blocks?
 technic?
 bucket?
+signs_lib?

homedecor_misc/init.lua

@@ -130,21 +130,22 @@ for _, f in ipairs(flowers_list) do
 end
 
 homedecor.register("pole_brass", {
-    description = S("Brass Pole"),
+	description = S("Brass Pole"),
 	mesh = "homedecor_round_pole.obj",
-    tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
-    inventory_image = "homedecor_pole_brass_inv.png",
-    wield_image = "homedecor_pole_brass_inv.png",
-    selection_box = {
-            type = "fixed",
-            fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
-    },
-    collision_box = {
-            type = "fixed",
-            fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
-    },
-    groups = {snappy=3},
-    sounds = default.node_sound_wood_defaults(),
+	tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
+	inventory_image = "homedecor_pole_brass_inv.png",
+	wield_image = "homedecor_pole_brass_inv.png",
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
+	},
+	groups = {snappy=3},
+	sounds = default.node_sound_wood_defaults(),
+	check_for_pole = true
 })
 
 homedecor.register("pole_wrought_iron", {
@@ -919,7 +920,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "homedecor:sportbench",
 	recipe = {
-		{ "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" },
+		{ "stairs:slab_steelblock","basic_materials:steel_bar","stairs:slab_steelblock" },
 		{ "default:steel_ingot","wool:black","default:steel_ingot" },
 		{ "default:steel_ingot","wool:black","default:steel_ingot" }
 	},

homedecor_seating/depends.txt

@@ -2,3 +2,4 @@ default
 wool
 homedecor_common
 unifieddyes
+basic_materials

homedecor_seating/init.lua

@@ -76,3 +76,5 @@ dofile(modpath.."/longsofas.lua")
 dofile(modpath.."/sofas.lua")
 dofile(modpath.."/armchairs.lua")
 dofile(modpath.."/misc.lua")
+
+minetest.log("action", "[homedecor_seating] loaded.")

homedecor_seating/misc.lua

@@ -212,7 +212,7 @@ minetest.register_craft( {
         recipe = {
 			{ "group:wood", "group:wood", "group:wood" },
 			{ "group:wood", "group:wood", "group:wood" },
-			{ "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" }
+			{ "basic_materials:steel_bar", "", "basic_materials:steel_bar" }
         },
 })
 
@@ -316,7 +316,7 @@ minetest.register_craft({
 	recipe = {
 		{ "", "", "wool:black" },
 		{ "", "wool:black", "default:steel_ingot" },
-		{ "group:stick", "homedecor:pole_wrought_iron", "group:stick" }
+		{ "group:stick", "basic_materials:steel_bar", "group:stick" }
 	},
 })
 
@@ -325,7 +325,7 @@ minetest.register_craft({
 	recipe = {
 		{ "dye:black", "building_blocks:sticks", "group:wool" },
 		{ "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" },
-		{ "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" }
+		{ "building_blocks:sticks", "basic_materials:steel_bar", "building_blocks:sticks" }
 	},
 })
 

inbox/init.lua

@@ -126,3 +126,5 @@ function inbox.get_inbox_insert_formspec(pos)
 		"listring[]"
 	return formspec
 end
+
+minetest.log("action", "[inbox] loaded.")

itemframes/init.lua

@@ -300,3 +300,5 @@ if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
 end
+
+minetest.log("action", "[itemframes] loaded.")

modpack.conf

@@ -0,0 +1 @@
+min_minetest_version = 5.2.0

plasmascreen/init.lua

@@ -186,3 +186,5 @@ minetest.register_craft({
 		{'group:stick', 'default:coal_lump', 'group:stick'},
 	}
 })
+
+minetest.log("action", "[plasmascreen] loaded.")