Merge branch 'lantern' of github.com:kilbith/homedecor_modpack

homedecor/crafts.lua

@@ -3030,6 +3030,15 @@ for _, color in ipairs(dlamp_colors) do
 	})
 end
 
+minetest.register_craft({
+	output = "homedecor:hanging_lantern 2",
+	recipe = {
+		{ "default:iron_lump", "default:iron_lump", "" },
+		{ "default:iron_lump", "homedecor:lattice_lantern_large", "" },
+		{ "default:iron_lump", "", "" },
+	},
+})
+
 if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
 	technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
 end

homedecor/lighting.lua

@@ -411,3 +411,20 @@ for _, color in ipairs(dlamp_colors) do
 		groups = {snappy=3},
 	})
 end
+
+local hl_cbox = {
+	type = "fixed",
+	fixed = { -0.25, -0.4, -0.2, 0.25, 0.5, 0.5 },
+}
+
+homedecor.register("hanging_lantern", {
+	description = S("Hanging Lantern"),
+	mesh = "homedecor_hanging_lantern.obj",
+	tiles = {"homedecor_hanging_lantern.png"},
+	inventory_image = "homedecor_hanging_lantern_inv.png",
+	wield_image = "homedecor_hanging_lantern_inv.png",
+	groups = {snappy=3},
+	light_source = 11,
+	selection_box = hl_cbox,
+	collision_box = hl_cbox,
+})