fix https://github.com/mt-mods/homedecor_modpack/issues/17

building_blocks/alias.lua

@@ -8,9 +8,16 @@ if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
 end
 
 if minetest.get_modpath("moreblocks") then
-	minetest.register_alias_force("moreblocks:tar", "building_blocks:Tar")
 	stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar")
 	stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble")
+	for _, i in ipairs(stairsplus.shapes_list) do
+		local class = i[1]
+		local cut = i[2]
+		minetest.unregister_item("moreblocks:"..class.."tar"..cut)
+		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
+	end
+	minetest.unregister_item("moreblocks:tar")
+	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
 	stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")
 
 	if minetest.get_modpath("gloopblocks") then

building_blocks/init.lua

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

building_blocks/node_stairs.lua

@@ -1,4 +1,9 @@
 local S = minetest.get_translator("building_blocks")
+local stairs_compat
+
+if minetest.get_modpath("stairs") and not minetest.get_modpath("moreblocks") then
+	stairs_compat = dofile(minetest.get_modpath("building_blocks") .. "/stairs_compat.lua")
+end
 
 local function building_blocks_stairs(nodename, def)
 	minetest.register_node(nodename, def)
@@ -11,6 +16,9 @@ local function building_blocks_stairs(nodename, def)
 		minetest.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
 		minetest.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer")
 	end
+	if stairs_compat then
+		stairs_compat(nodename, def)
+	end
 end
 
 building_blocks_stairs("building_blocks:grate", {

building_blocks/stairs_compat.lua

@@ -0,0 +1,54 @@
+local stairtable = {
+    {
+        "slab",
+        {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+    },
+    {
+        "stair",
+        {
+            {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
+            {-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
+        },
+    },
+    {
+        "stair_inner",
+        {
+            {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
+            {-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
+            {-0.5, 0.0, -0.5, 0.0, 0.5, 0.0},
+        },
+    },
+    {
+        "stair_outer",
+        {
+            {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
+            {-0.5, 0.0, 0.0, 0.0, 0.5, 0.5},
+        },
+    },
+}
+
+local function register(name, def)
+    for _, sdef in pairs(stairtable) do
+        local split = name:split(":")
+        local ndef = table.copy(def)
+        local item_name = ":" .. sdef[1] .. "_" .. split[2]
+
+        ndef.description = def.description .. " " .. string.gsub(sdef[1], "_", " ")
+        ndef.paramtype, ndef.paramtype2 = "light", "facedir"
+        ndef.drawtype = "nodebox"
+        ndef.node_box = {
+            type = "fixed",
+            fixed = sdef[2],
+        }
+
+        minetest.register_node(split[1] .. item_name, ndef)
+        minetest.register_alias("stairs" .. item_name, split[1] .. item_name)
+    end
+end
+
+minetest.log(
+    "action",
+    "[building_blocks]: depreciated legacy support for stairs loaded, please use moreblocks for stair support"
+)
+
+return register

fake_fire/init.lua

@@ -333,5 +333,3 @@ minetest.register_lbm({
 		fire_particles_on(pos)
 	end
 })
-
-minetest.log("action", "[fake_fire] loaded.")

homedecor_3d_extras/init.lua

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

homedecor_bathroom/init.lua

@@ -106,7 +106,7 @@ homedecor.register("towel_rod", {
 	walkable = false,
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,dig_tree=2},
 	_sound_def = {
-		key = "node_sound_default",
+		key = "node_sound_defaults",
 	},
 	crafts = {
 		{
@@ -274,7 +274,7 @@ homedecor.register("toilet_paper", {
 	walkable = false,
 	groups = {snappy=3,oddly_breakable_by_hand=3, dig_stone = 2},
 	_sound_def = {
-		key = "node_sound_default",
+		key = "node_sound_defaults",
 	},
 	crafts = {
 		{

homedecor_books/init.lua

@@ -194,7 +194,7 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 		meta:set_string("infotext", fields.title)
 	end
 	minetest.log("action", S("@1 has written in a book (title: \"@2\"): \"@3\" at location @4",
-			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:get_pos())))
+			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos())))
 
 	player_current_book[player_name] = nil
 	return true

homedecor_climate_control/init.lua

@@ -47,13 +47,13 @@ local add_mesh_desk_fan_entity = function(pos)
 	local param2 = minetest.get_node(pos).param2
 	local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan")
 	if param2 == 0 then
-		entity:set_yaw(3.142) -- 180 degrees
+		entity:setyaw(3.142) -- 180 degrees
 	elseif minetest.get_node(pos).param2 == 1 then
-		entity:set_yaw(3.142/2) -- 90 degrees
+		entity:setyaw(3.142/2) -- 90 degrees
 	elseif minetest.get_node(pos).param2 == 3 then
-		entity:set_yaw((-3.142/2)) -- 270 degrees
+		entity:setyaw((-3.142/2)) -- 270 degrees
 	else
-		entity:set_yaw(0)
+		entity:setyaw(0)
 	end
 	return entity
 end

homedecor_common/init.lua

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

homedecor_common/materials.lua

@@ -38,13 +38,12 @@ homedecor.materials = {
     wool_white = "wool:white",
     slab_stone = "stairs:slab_stone",
     slab_wood = "stairs:slab_wood",
-    glass_block = "default:glass",
+    glass_block = "default_glass",
     glass_bottle = "vessels:glass_bottle",
     coal_lump = "default:coal_lump",
     stone = "default:stone",
     cobble = "default:cobble",
     brick = "default:brick",
-    obsidian_glass = "default:obsidian_glass",
 }
 
 if minetest.get_modpath("moreores") then

homedecor_common/registration.lua

@@ -121,7 +121,7 @@ function homedecor.register(name, original_def)
 		end
 
 		if cdef.type ~= "toolrepair" and not cdef.output then
-			cdef.output = "homedecor:" .. name
+			cdef.output = ":homedecor:" .. name
 		end
 
 		minetest.register_craft(cdef)

homedecor_exterior/init.lua

@@ -362,7 +362,7 @@ homedecor_exterior.shrub_colors = {
 local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
 
 for color, color_loc in pairs(homedecor_exterior.shrub_colors) do
-	homedecor.register("shrubbery_large_"..color, {
+	minetest.register_node(":homedecor:shrubbery_large_"..color, {
 		description = S("Shrubbery (large, @1)", color_loc),
 		drawtype = "mesh",
 		mesh = "homedecor_cube.obj",
@@ -384,7 +384,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do
 		}
 	})
 
-	homedecor.register("shrubbery_"..color, {
+	minetest.register_node(":homedecor:shrubbery_"..color, {
 		description = S("Shrubbery (@1)", color_loc),
 		drawtype = "mesh",
 		mesh = "homedecor_shrubbery.obj",

homedecor_furniture_medieval/init.lua

@@ -79,15 +79,6 @@ homedecor.register("chains", {
 	_sound_def = {
 		key = "node_sound_stone_defaults",
 	},
-	crafts = {
-		{
-			output = "homedecor:chains 4",
-			recipe = {
-				{ "steel_ingot","" },
-				{ "homedecor:bars","homedecor:bars" },
-			},
-		}
-	}
 })
 
 minetest.register_alias("3dforniture:bars", "homedecor:bars")

homedecor_gastronomy/init.lua

@@ -109,7 +109,7 @@ homedecor.register("wine_rack", {
 	selection_box = wine_cbox,
 	collision_box = wine_cbox,
 	_sound_def = {
-		key = "node_sound_default",
+		key = "node_sound_defaults",
 	},
 })
 

homedecor_inbox/init.lua

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

homedecor_lighting/init.lua

@@ -241,7 +241,7 @@ for brightness_level = 0, 14 do
 		}
 		overlay = {
 			{ name = "homedecor_glowlight_top_glare.png", color = "white"},
-			{ name = "homedecor_glowlight_top_glare.png", color = "white"},
+			"",
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
@@ -309,7 +309,7 @@ for brightness_level = 0, 14 do
 		}
 		overlay = {
 			{ name = "homedecor_glowlight_top_glare.png", color = "white"},
-			{ name = "homedecor_glowlight_top_glare.png", color = "white"},
+			"",
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
@@ -378,7 +378,7 @@ for brightness_level = 0, 14 do
 		}
 		overlay = {
 			{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
-			{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
+			"",
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
 			{ name = sides_glare, color = "white"},
@@ -1750,22 +1750,6 @@ minetest.register_craft({
 	},
 })
 
-minetest.register_craft({
-	output = "homedecor:rope_light_on_floor_off",
-	type= "shapeless",
-	recipe = {
-		"homedecor:rope_light_on_ceiling_off"
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:rope_light_on_ceiling_off",
-	type= "shapeless",
-	recipe = {
-		homedecor.materials.steel_ingot, "homedecor:ceiling_lamp"
-	}
-})
-
 minetest.register_craft({
 	output = "homedecor:ceiling_lamp",
 	recipe = {
@@ -1921,4 +1905,3 @@ if minetest.get_modpath("darkage") then
 	end
 end
 
-minetest.log("action", "[homedecor_lightning] loaded.")

homedecor_misc/init.lua

@@ -290,14 +290,6 @@ homedecor.register("dvd_cd_cabinet", {
 	_sound_def = {
 		key = "node_sound_wood_defaults",
 	},
-	crafts = {
-		{
-			type = "shapeless",
-			recipe = {
-				"homedecor:dvd_player", "homedecor:kitchen_cabinet_colorable"
-			}
-		}
-	}
 })
 
 local pooltable_cbox = {

homedecor_office/init.lua

@@ -128,7 +128,7 @@ homedecor.register("calendar", {
 	groups = {choppy=2,attached_node=1, dig_tree=2},
 	legacy_wallmounted = true,
 	_sound_def = {
-		key = "node_sound_default",
+		key = "node_sound_defaults",
 	},
 	infotext = S("Date (right-click to update):\n@1", os.date("%Y-%m-%d")), -- ISO 8601 format
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)

homedecor_plasmascreen/init.lua

@@ -183,6 +183,4 @@ minetest.register_alias("plasmascreen:screen6", "air")
 minetest.register_alias("plasmascreen:screen5", "homedecor:tv")
 minetest.register_alias("plasmascreen:stand", "homedecor:tv_stand")
 minetest.register_alias("plasmascreen:tv", "homedecor:tv")
-minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off")
-
-minetest.log("action", "[plasmascreen] loaded.")
+minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off")

homedecor_roofing/init.lua

@@ -14,7 +14,6 @@ minetest.register_node(":homedecor:skylight", {
 		key = "node_sound_glass_defaults",
 	},
 	selection_box = homedecor.nodebox.slab_y(0.1),
-	collision_box = homedecor.nodebox.slab_y(0.1),
 })
 
 minetest.register_node(":homedecor:skylight_frosted", {
@@ -30,7 +29,6 @@ minetest.register_node(":homedecor:skylight_frosted", {
 		key = "node_sound_glass_defaults",
 	},
 	selection_box = homedecor.nodebox.slab_y(0.1),
-	collision_box = homedecor.nodebox.slab_y(0.1),
 })
 
 for s, s_loc in pairs({ ["asphalt"] = S("asphalt"), ["terracotta"] = S("terracotta"), ["wood"] = S("wood") }) do

homedecor_seating/init.lua

@@ -121,7 +121,7 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats)
 
 	--seat the player
 	sit_pos.y = sit_pos.y-0.5
-	clicker:set_pos(sit_pos)
+	clicker:setpos(sit_pos)
 	return itemstack
 end
 
@@ -129,5 +129,3 @@ 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

@@ -18,9 +18,6 @@ homedecor.register("deckchair", {
 	selection_box = dc_cbox,
 	collision_box = dc_cbox,
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil,
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
-	end
 })
 
 minetest.register_alias("homedecor:deckchair_foot", "homedecor:deckchair")
@@ -38,9 +35,6 @@ homedecor.register("deckchair_striped_blue", {
 	selection_box = dc_cbox,
 	collision_box = dc_cbox,
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil,
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
-	end
 })
 
 homedecor.register("simple_bench", {
@@ -58,9 +52,6 @@ homedecor.register("simple_bench", {
 	_sound_def = {
 		key = "node_sound_wood_defaults",
 	},
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
-	end
 })
 
 local bl1_sbox = {
@@ -151,7 +142,9 @@ homedecor.register("kitchen_chair_wood", {
 	after_place_node = unifieddyes.fix_rotation_nsew,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
+		pos.y = pos.y+0 -- where do I put my ass ?
+		homedecor.sit(pos, node, clicker)
+		return itemstack
 	end
 })
 
@@ -177,7 +170,9 @@ homedecor.register("kitchen_chair_padded", {
 	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
+		pos.y = pos.y+0 -- where do I put my ass ?
+		homedecor.sit(pos, node, clicker)
+		return itemstack
 	end
 })
 
@@ -215,9 +210,6 @@ for _, c in pairs(chairs) do
 		collision_box = ofchairs_cbox,
 		expand = { top = "placeholder" },
 		on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
-		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-			return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1)
-		end
 	})
 end
 

homedecor_wardrobe/init.lua

@@ -199,7 +199,7 @@ end
 minetest.register_craft( {
 	output = "homedecor:wardrobe",
 	recipe = {
-		{ "homedecor:drawer_small", "homedecor:kitchen_cabinet_colorable" },
+		{ "homedecor:drawer_small", "homedecor:kitchen_cabinet" },
 		{ "homedecor:drawer_small", "group:wood" },
 		{ "homedecor:drawer_small", "group:wood" }
 	},

itemframes/init.lua

@@ -94,10 +94,6 @@ local update_item = function(pos, node)
 			pos.z = pos.z + posad.z * 6.5 / 16
 		elseif node.name == "itemframes:pedestal" then
 			pos.y = pos.y + 12 / 16 + 0.33
-			local n = meta:get_string("item")
-			if string.match(n, "spears:spear_") then
-				pos.y = pos.y + 0.2
-			end
 		end
 		tmp.nodename = node.name
 		tmp.texture = ItemStack(meta:get_string("item")):get_name()
@@ -336,4 +332,3 @@ if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:pedestal")
 end
 
-minetest.log("action", "[itemframes] loaded.")