From 1a594f4f2240017d6484ddf8f17cc9fd850c7be4 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 6 Jun 2019 01:19:50 -0400 Subject: update homedecor --- homedecor_doors_and_gates/init.lua | 23 ++++++++++++++++++++--- homedecor_lighting/init.lua | 4 +--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index d065a8f..b20fd4a 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -716,6 +716,15 @@ minetest.register_alias("doors:wood_glass_white_b", "doors:homedecor minetest.register_alias("doors:wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") minetest.register_alias("doors:wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") +minetest.register_alias("doors:homedecor_wood_glass_oak_a", "doors:homedecor_french_oak_a") +minetest.register_alias("doors:homedecor_wood_glass_oak_b", "doors:homedecor_french_oak_b") + +minetest.register_alias("doors:homedecor_wood_glass_white_a", "doors:homedecor_french_white_a") +minetest.register_alias("doors:homedecor_wood_glass_white_b", "doors:homedecor_french_white_b") + +minetest.register_alias("doors:homedecor_wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") +minetest.register_alias("doors:homedecor_wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") + minetest.register_alias("doors:homedecor_woodglass2_a", "doors:homedecor_carolina_a") minetest.register_alias("doors:homedecor_woodglass2_b", "doors:homedecor_carolina_b") @@ -730,8 +739,14 @@ minetest.register_alias("doors:bedroom_b", "doors:homedecor -- flip old homedecor doors around, since they use minetest_game doors API now -old_doors[#old_doors + 1] = "homedecor:door_wood_glass_left" -old_doors[#old_doors + 1] = "homedecor:door_wood_glass_right" +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_oak_left" +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_oak_right" + +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_white_left" +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_white_right" + +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_mahogany_left" +old_doors[#old_doors + 1] = "homedecor:door_wood_glass_mahogany_right" old_doors[#old_doors + 1] = "homedecor:door_woodglass2_left" old_doors[#old_doors + 1] = "homedecor:door_woodglass2_right" @@ -740,7 +755,7 @@ old_doors[#old_doors + 1] = "homedecor:door_bedroom_left" old_doors[#old_doors + 1] = "homedecor:door_bedroom_right" minetest.register_lbm({ - name = ":homedecor:convert_doors_2", + name = ":homedecor:convert_doors_3", label = "Convert Homedecor doors to mtg doors API", nodenames = old_doors, run_at_every_load = false, @@ -751,8 +766,10 @@ minetest.register_lbm({ local dir = string.sub(node.name, e+1) local newname = "doors:homedecor_"..string.sub(node.name, 16, e-1) if dir == "right" then + print("Want to replace "..node.name.." with "..newname.."_a") minetest.set_node(pos, {name = newname.."_a", param2 = newparam2 }) else + print("Want to replace "..node.name.." with "..newname.."_b") minetest.set_node(pos, {name = newname.."_b", param2 = newparam2 }) end minetest.set_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "doors:hidden"}) diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 40721ef..c18aca0 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1836,8 +1836,7 @@ minetest.register_alias("homedecor:table_lamp_max", "homedecor:table_ minetest.register_alias("homedecor:standing_lamp", "homedecor:standing_lamp_14") minetest.register_alias("homedecor:standing_lamp_max", "homedecor:standing_lamp_14") -minetest.register_alias("homedecor:wall_lamp", "homedecor:wall_lamp_14") -minetest.register_alias("homedecor:wall_lamp_max", "homedecor:wall_lamp_14") +minetest.register_alias("homedecor:wall_lamp", "homedecor:wall_lamp_on") minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_14") minetest.register_alias("3dforniture:table_lamp_max", "homedecor:table_lamp_14") @@ -1862,7 +1861,6 @@ for name, level in pairs(word_to_bright) do minetest.register_alias("homedecor:ceiling_lamp_"..name, "homedecor:ceiling_lamp_"..level) minetest.register_alias("homedecor:table_lamp_"..name, "homedecor:table_lamp_"..level) minetest.register_alias("homedecor:standing_lamp_"..name, "homedecor:standing_lamp_"..level) - minetest.register_alias("homedecor:wall_lamp_"..name, "homedecor:wall_lamp_"..level) minetest.register_alias("3dforniture:table_lamp_"..name, "homedecor:table_lamp_"..level) end -- cgit v1.2.3