Fix wrong nodenames caused by last commit (#61)

This commit is contained in:
Niklp 2023-08-23 00:11:31 +02:00 committed by GitHub
parent 80b4f242e0
commit 46c71131c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions

View File

@ -43,13 +43,13 @@ homedecor.register("ceiling_tile", {
}) })
local rug_types = { local rug_types = {
{ S("small"), "homedecor_small_rug.obj" }, { "small", S("small"), "homedecor_small_rug.obj" },
{ S("large"), homedecor.box.slab_y(0.0625) }, { "large", S("large"), homedecor.box.slab_y(0.0625) },
{ S("persian"), homedecor.box.slab_y(0.0625) }, { "persian", S("persian"), homedecor.box.slab_y(0.0625) },
} }
for _, rt in ipairs(rug_types) do for _, rt in ipairs(rug_types) do
local s, m = unpack(rt) local s, desc, m = unpack(rt)
local mesh = m local mesh = m
local nodebox = nil local nodebox = nil
@ -69,7 +69,7 @@ for _, rt in ipairs(rug_types) do
end end
homedecor.register("rug_"..s, { homedecor.register("rug_"..s, {
description = S("Rug (@1)", s), description = S("Rug (@1)", desc),
mesh = mesh, mesh = mesh,
tiles = tiles, tiles = tiles,
node_box = nodebox, node_box = nodebox,
@ -83,22 +83,29 @@ for _, rt in ipairs(rug_types) do
}) })
end end
local pot_colors = { S("black"), S("green"), S("terracotta") } local pot_colors = {
{ "black", S("black") },
{ "green", S("green") },
{ "terracotta", S("terracotta") },
}
for _, p in ipairs(pot_colors) do for _, pot in ipairs(pot_colors) do
homedecor.register("flower_pot_"..p, { local p, desc = unpack(pot)
description = S("Flower Pot (@1)", p),
mesh = "homedecor_flowerpot.obj", homedecor.register("flower_pot_"..p, {
tiles = { description = S("Flower Pot (@1)", desc),
"homedecor_flower_pot_"..p..".png", mesh = "homedecor_flowerpot.obj",
{ name = default and "default_dirt.png" or wood_tex, color = 0xff505050 }, tiles = {
}, "homedecor_flower_pot_"..p..".png",
groups = { snappy = 3, potting_soil=1 }, { name = default and "default_dirt.png" or wood_tex, color = 0xff505050 },
_sound_def = { },
key = "node_sound_stone_defaults", groups = { snappy = 3, potting_soil=1 },
}, _sound_def = {
}) key = "node_sound_stone_defaults",
},
})
end end
if minetest.get_modpath("flowers") then if minetest.get_modpath("flowers") then
local flowers_list = { local flowers_list = {
{ S("Rose"), "rose", "flowers:rose" }, { S("Rose"), "rose", "flowers:rose" },