fixed french door conversions, for real now. :P

bumped LBM version
fix wall lantern aliases, for real this time :P
2025-06-28 21:06:02 +02:00 · 2019-06-06 01:17:43 -04:00 · 2019-06-06 01:03:57 -04:00 · 2019-06-05 06:16:33 -04:00 · 2019-06-05 04:26:22 -04:00 · 2019-06-04 01:37:02 -04:00
16 changed files with 691 additions and 678 deletions
--- a/homedecor_3d_extras/models/homedecor_door_wood_glass_a.obj
+++ b/homedecor_3d_extras/models/homedecor_door_wood_glass_a.obj
--- a/homedecor_3d_extras/models/homedecor_door_wood_glass_b.obj
+++ b/homedecor_3d_extras/models/homedecor_door_wood_glass_b.obj
--- a/homedecor_doors_and_gates/init.lua
+++ b/homedecor_doors_and_gates/init.lua
@ -40,41 +40,41 @@ local door_list = {
 		custom_model = "homedecor_door_fancy"
 	},

-	{	name = "wood_glass_oak",
-		description = "Glass and Wood, Oak-colored",
+	{	name = "french_oak",
+		description = "French door, Oak-colored",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_wood_glass"
+		custom_model = "homedecor_door_french"
 	},

-	{	name = "wood_glass_mahogany",
-		description = "Glass and Wood, Mahogany-colored",
+	{	name = "french_mahogany",
+		description = "French door, Mahogany-colored",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_wood_glass"
+		custom_model = "homedecor_door_french"
 	},

-	{	name = "wood_glass_white",
-		description = "Glass and Wood, White",
+	{	name = "french_white",
+		description = "French door, White",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_wood_glass"
+		custom_model = "homedecor_door_french"
 	},

-	{	name = "bedroom",
-		description = "White Bedroom Door",
+	{	name = "basic_panel",
+		description = "Basic white panel Door",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_wood_defaults(),
@ -95,8 +95,8 @@ local door_list = {
 		custom_model = "homedecor_door_wrought_iron"
 	},

-	{	name = "woodglass2",
-		description = "Wooden door with glass insert, type 2",
+	{	name = "carolina",
+		description = "Wooden Carolina door",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_wood_defaults(),
@ -166,7 +166,7 @@ end
 local hd_3d = minetest.get_modpath("homedecor_3d_extras")

 for _, door in ipairs(door_list) do
-	doors.register(door.name, {
+	doors.register("homedecor_"..door.name, {
 			tiles = {{ name = "homedecor_door_"..door.name..".png", backface_culling = door.backface }},
 			description = door.description,
 			inventory_image = "homedecor_door_"..door.name.."_inv.png",
@ -177,9 +177,8 @@ for _, door in ipairs(door_list) do
 			mesecons = mesecons
 	})

-	local nn_a = "doors:"..door.name.."_a"
-	local nn_b = "doors:"..door.name.."_b"
-
+	local nn_a = "doors:homedecor_"..door.name.."_a"
+	local nn_b = "doors:homedecor_"..door.name.."_b"

 	if door.alpha then
 		local def = hd_doors_clone_node(nn_a)
@ -204,6 +203,9 @@ for _, door in ipairs(door_list) do

 	old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_left"
 	old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_right"
+
+	minetest.register_alias("doors:"..door.name.."_a", "doors:homedecor_"..door.name.."_a")
+	minetest.register_alias("doors:"..door.name.."_b", "doors:homedecor_"..door.name.."_b")
 end

 -- Gates
@ -696,19 +698,64 @@ minetest.register_craft({

 -- aliases

-minetest.register_alias("homedecor:jpn_door_top", "air")
-minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed")
+minetest.register_alias("homedecor:jpn_door_top",               "air")
+minetest.register_alias("homedecor:jpn_door_top_open",          "air")

-minetest.register_alias("homedecor:jpn_door_top_open", "air")
-minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open")
+minetest.register_alias("homedecor:jpn_door_bottom",            "homedecor:door_japanese_closed")
+minetest.register_alias("homedecor:jpn_door_bottom_open",       "homedecor:door_japanese_open")

-minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b")
-minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a")
+minetest.register_alias("homedecor:door_glass_right",           "doors:door_glass_b")
+minetest.register_alias("homedecor:door_glass_left",            "doors:door_glass_a")
+
+minetest.register_alias("doors:wood_glass_oak_a",               "doors:homedecor_french_oak_a")
+minetest.register_alias("doors:wood_glass_oak_b",               "doors:homedecor_french_oak_b")
+
+minetest.register_alias("doors:wood_glass_white_a",             "doors:homedecor_french_white_a")
+minetest.register_alias("doors:wood_glass_white_b",             "doors:homedecor_french_white_b")
+
+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")
+
+minetest.register_alias("doors:woodglass2_a",                   "doors:homedecor_carolina_a")
+minetest.register_alias("doors:woodglass2_b",                   "doors:homedecor_carolina_b")
+
+minetest.register_alias("doors:homedecor_bedroom_a",            "doors:homedecor_basic_panel_a")
+minetest.register_alias("doors:homedecor_bedroom_b",            "doors:homedecor_basic_panel_b")
+
+minetest.register_alias("doors:bedroom_a",                      "doors:homedecor_basic_panel_a")
+minetest.register_alias("doors:bedroom_b",                      "doors:homedecor_basic_panel_b")

 -- flip old homedecor doors around, since they use minetest_game doors API now

+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"
+
+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",
+	name = ":homedecor:convert_doors_3",
 	label = "Convert Homedecor doors to mtg doors API",
 	nodenames = old_doors,
 	run_at_every_load = false,
@ -717,10 +764,12 @@ minetest.register_lbm({
 		local newparam2 = (node.param2 + 2) % 4
 		local e = string.find(node.name, "_", -7)
 		local dir = string.sub(node.name, e+1)
-		local newname = "doors:"..string.sub(node.name, 16, 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"})
--- a/homedecor_doors_and_gates/textures/homedecor_door_basic_panel.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_basic_panel.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_basic_panel_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_basic_panel_inv.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png
--- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
--- a/homedecor_furniture_medieval/models/forniture_torch.obj
+++ b/homedecor_furniture_medieval/models/forniture_torch.obj
--- a/homedecor_furniture_medieval/models/homedecor_wall_lamp.obj
+++ b/homedecor_furniture_medieval/models/homedecor_wall_lamp.obj
Author	SHA1	Message	Date
Vanessa Dannenberg	bff90189fc	fixed french door conversions, for real now. :P bumped LBM version	2019-06-06 01:17:43 -04:00
Vanessa Dannenberg	b407f06dc4	fix wall lantern aliases, for real this time :P	2019-06-06 01:03:57 -04:00
Vanessa Dannenberg	e6dc2c5508	bump doors LBM name to force it to run again	2019-06-05 06:16:33 -04:00
Vanessa Dannenberg	bde2bf2bf6	fix some missing door LBM entries	2019-06-05 04:26:22 -04:00
Vanessa Dannenberg	ea160a6519	simplify mesecons/digilines rules replaced all "xz" and "toponly" with "alldir" made on-floor rope lights use "alldir"	2019-06-04 01:37:02 -04:00
Vanessa Dannenberg	631813bb2d	make all dimmable lights fully dimmable to any level 0-14 for backward compat, they'll resond to the usual strings, too: "off" -> 0 "min" -> 3 "med" -> 7 "hi" -> 11 "max"/"on" -> 14 all dimmable nodes have been renamed to bear the light value in their names, and aliased. the non-dimmable lights still respond as before ("off" or n < 4; "on" or n > 3)	2019-06-04 00:56:00 -04:00
Vanessa Dannenberg	f33636d473	move wall lamp and torch models to the correct dir	2019-06-03 07:17:12 -04:00
Vanessa Dannenberg	cbb41f7d98	give most doors more meaningful, distinct node names to avoid confusion doors:wood_glass_{oak,white,mahogany}_{a,b} --> doors:homedecor_french_{oak,white,mahogany}_{a,b} doors:woodglass2_{a,b} --> doors:homedecor_carolina_{a,b} doors:bedroom_{a,b} --> doors:homedecor_basic_panel_{a,b} All others: doors:$foo_{a,b} --> doors:homedecor_$foo_{a,b}	2019-06-03 03:42:06 -04:00