From cbb41f7d983972c443f22247c654e0015abf162c Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Mon, 3 Jun 2019 03:42:06 -0400 Subject: [PATCH] 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} --- ...lass_a.obj => homedecor_door_french_a.obj} | 0 ...lass_b.obj => homedecor_door_french_b.obj} | 0 homedecor_doors_and_gates/init.lua | 69 ++++++++++++------ ...oom.png => homedecor_door_basic_panel.png} | Bin ...png => homedecor_door_basic_panel_inv.png} | Bin ...glass2.png => homedecor_door_carolina.png} | Bin ...nv.png => homedecor_door_carolina_inv.png} | Bin ...png => homedecor_door_french_mahogany.png} | Bin ...=> homedecor_door_french_mahogany_inv.png} | Bin ..._oak.png => homedecor_door_french_oak.png} | Bin ....png => homedecor_door_french_oak_inv.png} | Bin ...te.png => homedecor_door_french_white.png} | Bin ...ng => homedecor_door_french_white_inv.png} | Bin 13 files changed, 46 insertions(+), 23 deletions(-) rename homedecor_3d_extras/models/{homedecor_door_wood_glass_a.obj => homedecor_door_french_a.obj} (100%) rename homedecor_3d_extras/models/{homedecor_door_wood_glass_b.obj => homedecor_door_french_b.obj} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_bedroom.png => homedecor_door_basic_panel.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_bedroom_inv.png => homedecor_door_basic_panel_inv.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_woodglass2.png => homedecor_door_carolina.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_woodglass2_inv.png => homedecor_door_carolina_inv.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_mahogany.png => homedecor_door_french_mahogany.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_mahogany_inv.png => homedecor_door_french_mahogany_inv.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_oak.png => homedecor_door_french_oak.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_oak_inv.png => homedecor_door_french_oak_inv.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_white.png => homedecor_door_french_white.png} (100%) rename homedecor_doors_and_gates/textures/{homedecor_door_wood_glass_white_inv.png => homedecor_door_french_white_inv.png} (100%) diff --git a/homedecor_3d_extras/models/homedecor_door_wood_glass_a.obj b/homedecor_3d_extras/models/homedecor_door_french_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wood_glass_a.obj rename to homedecor_3d_extras/models/homedecor_door_french_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_wood_glass_b.obj b/homedecor_3d_extras/models/homedecor_door_french_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wood_glass_b.obj rename to homedecor_3d_extras/models/homedecor_door_french_b.obj diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index a0f72536..d16efb39 100644 --- 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,14 +698,35 @@ 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_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 diff --git a/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png b/homedecor_doors_and_gates/textures/homedecor_door_basic_panel.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_bedroom.png rename to homedecor_doors_and_gates/textures/homedecor_door_basic_panel.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_basic_panel_inv.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_basic_panel_inv.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png b/homedecor_doors_and_gates/textures/homedecor_door_carolina.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png rename to homedecor_doors_and_gates/textures/homedecor_door_carolina.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_carolina_inv.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_carolina_inv.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_french_mahogany.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_mahogany.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_french_mahogany_inv.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_mahogany_inv.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_french_oak.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_oak.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_french_oak_inv.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_oak_inv.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png b/homedecor_doors_and_gates/textures/homedecor_door_french_white.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_white.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_french_white_inv.png similarity index 100% rename from homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_french_white_inv.png