]> git.lizzy.rs Git - xdecor.git/blobdiff - nodes.lua
Drop connected walls, alias them to new Minetest Game walls
[xdecor.git] / nodes.lua
index eee2887c3e61b62a58b354bbb0b0954b965a4e1c..11ef0003393460f686dcb0e2f6778e446e0fedf6 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -9,11 +9,9 @@ xpanes.register_pane("bamboo_frame", {
        inventory_image = "xdecor_bamboo_frame.png",
        wield_image = "xdecor_bamboo_frame.png",
        groups = {choppy=3, oddly_breakable_by_hand=2, pane=1, flammable=2},
-       recipe = {
-               {"default:papyrus", "default:papyrus", "default:papyrus"},
-               {"default:papyrus", "farming:cotton", "default:papyrus"},
-               {"default:papyrus", "default:papyrus", "default:papyrus"}
-       }
+       recipe = { {"default:papyrus", "default:papyrus", "default:papyrus"},
+                  {"default:papyrus", "farming:cotton",  "default:papyrus"},
+                  {"default:papyrus", "default:papyrus", "default:papyrus"} }
 })
 
 xdecor.register("baricade", {
@@ -22,7 +20,7 @@ xdecor.register("baricade", {
        walkable = false,
        inventory_image = "xdecor_baricade.png",
        tiles = {"xdecor_baricade.png"},
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        damage_per_second = 4,
        selection_box = xdecor.nodebox.slab_y(0.3)
 })
@@ -32,7 +30,7 @@ xdecor.register("barrel", {
        inventory = {size=24},
        infotext = "Barrel",
        tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"},
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        sounds = default.node_sound_wood_defaults()
 })
 
@@ -40,28 +38,24 @@ xdecor.register("cabinet", {
        description = "Wood Cabinet",
        inventory = {size=24},
        infotext = "Wood Cabinet",
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        sounds = default.node_sound_wood_defaults(),
        on_rotate = screwdriver.rotate_simple,
-       tiles = {
-               "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
-               "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
-               "xdecor_cabinet_sides.png", "xdecor_cabinet_front.png"
-       }
+       tiles = {"xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
+                "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
+                "xdecor_cabinet_sides.png", "xdecor_cabinet_front.png"}
 })
 
 xdecor.register("cabinet_half", {
        description = "Half Wood Cabinet",
        inventory = {size=8},
        infotext = "Half Wood Cabinet",
-       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
+       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2},
        sounds = default.node_sound_wood_defaults(),
        node_box = xdecor.nodebox.slab_y(0.5, 0.5),
-       tiles = {
-               "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
-               "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_sides.png",
-               "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png"
-       }
+       tiles = {"xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png",
+                "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_sides.png",
+                "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png"}
 })
 
 xdecor.register("candle", {
@@ -74,13 +68,12 @@ xdecor.register("candle", {
        legacy_wallmounted = true,
        walkable = false,
        groups = {dig_immediate=3, attached_node=1},
-       tiles = {
-               { name = "xdecor_candle_floor.png",
-                       animation = {type="vertical_frames", length=1.5} },
-               { name = "xdecor_candle_ceiling.png",
-                       animation = {type="vertical_frames", length=1.5} },
-               { name = "xdecor_candle_wall.png",
-                       animation = {type="vertical_frames", length=1.5} }
+       tiles = {{name = "xdecor_candle_floor.png",
+                       animation = {type="vertical_frames", length=1.5}},
+               {name = "xdecor_candle_ceiling.png",
+                       animation = {type="vertical_frames", length=1.5}},
+               {name = "xdecor_candle_wall.png",
+                       animation = {type="vertical_frames", length=1.5}}
        },
        selection_box = {
                type = "wallmounted",
@@ -90,6 +83,27 @@ xdecor.register("candle", {
        }
 })
 
+xdecor.register("chair", {
+       description = "Chair",
+       tiles = {"xdecor_wood.png"},
+       sounds = default.node_sound_wood_defaults(),
+       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2},
+       on_rotate = screwdriver.rotate_simple,
+       node_box = xdecor.pixelbox(16, {
+               {3,  0, 11,   2, 16, 2},
+               {11, 0, 11,   2, 16, 2},
+               {5,  9, 11.5, 6,  6, 1},
+               {3,  0,  3,   2,  6, 2},
+               {11, 0,  3,   2,  6, 2},
+               {3,  6,  3,   10, 2, 8}
+       }),
+       can_dig = xdecor.sit_dig,
+       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+               pos.y = pos.y + 0  -- Sitting position.
+               xdecor.sit(pos, node, clicker, pointed_thing)
+       end
+})
+
 xpanes.register_pane("chainlink", {
        description = "Chain Link",
        tiles = {"xdecor_chainlink.png"},
@@ -99,11 +113,9 @@ xpanes.register_pane("chainlink", {
        inventory_image = "xdecor_chainlink.png",
        wield_image = "xdecor_chainlink.png",
        groups = {cracky=3, oddly_breakable_by_hand=2, pane=1},
-       recipe = {
-               {"default:steel_ingot", "", "default:steel_ingot"},
-               {"", "default:steel_ingot", ""},
-               {"default:steel_ingot", "", "default:steel_ingot"}
-       }
+       recipe = { {"default:steel_ingot", "", "default:steel_ingot"},
+                  {"", "default:steel_ingot", ""},
+                  {"default:steel_ingot", "", "default:steel_ingot"} }
 })
 
 xdecor.register("cobweb", {
@@ -134,7 +146,7 @@ for _, c in pairs({"red"}) do  -- Add more curtains colors simply here.
                paramtype2 = "wallmounted",
                groups = {dig_immediate=3, flammable=3},
                selection_box = {type="wallmounted"},
-               on_rightclick = function(pos, node, _, _)
+               on_rightclick = function(pos, node)
                        minetest.set_node(pos, {name="xdecor:curtain_open_"..c, param2=node.param2})
                end
        })
@@ -147,68 +159,124 @@ for _, c in pairs({"red"}) do  -- Add more curtains colors simply here.
                groups = {dig_immediate=3, flammable=3, not_in_creative_inventory=1},
                selection_box = {type="wallmounted"},
                drop = "xdecor:curtain_"..c,
-               on_rightclick = function(pos, node, _, _)
+               on_rightclick = function(pos, node)
                        minetest.set_node(pos, {name="xdecor:curtain_"..c, param2=node.param2})
                end
        })
 
        minetest.register_craft({
                output = "xdecor:curtain_"..c.." 4",
-               recipe = {
-                       {"", "wool:"..c, ""},
-                       {"", "wool:"..c, ""}
-               }
+               recipe = { {"", "wool:"..c, ""},
+                          {"", "wool:"..c, ""} }
        })
 end
 
-xdecor.register("crate", {
-       description = "Crate",
-       inventory = {size=24},
-       infotext = "Crate",
-       tiles = {"xdecor_crate.png"},
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
-       sounds = default.node_sound_wood_defaults()
+minetest.register_alias("xdecor:crate", "default:chess")
+
+xdecor.register("cushion", {
+       description = "Cushion",
+       tiles = {"xdecor_cushion.png"},
+       groups = {snappy=3, flammable=3, fall_damage_add_percent=-50},
+       on_place = minetest.rotate_node,
+       node_box = xdecor.nodebox.slab_y(0.5),
+       can_dig = xdecor.sit_dig,
+       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+               pos.y = pos.y + 0
+               xdecor.sit(pos, node, clicker, pointed_thing)
+
+               local wield_item = clicker:get_wielded_item():get_name()
+               if wield_item == "xdecor:cushion" and clicker:get_player_control().sneak then
+                       local player_name = clicker:get_player_name()
+                       if minetest.is_protected(pos, player_name) then
+                               minetest.record_protection_violation(pos, player_name) return
+                       end
+
+                       minetest.set_node(pos, {name="xdecor:cushion_block", param2=node.param2})
+
+                       if not minetest.setting_getbool("creative_mode") then
+                               itemstack:take_item()
+                       end
+                       return itemstack
+               end
+       end
 })
 
-local function door_access(door)
-       return door:find("prison")
-end
+xdecor.register("cushion_block", {
+       tiles = {"xdecor_cushion.png"},
+       groups = {snappy=3, flammable=3, fall_damage_add_percent=-75, not_in_creative_inventory=1}
+})
 
-local door_types = {
-       {"japanese", "brown"}, {"prison", "grey"}, {"prison_rust", "rust"},
-       {"screen", "brownb"}, {"slide", "brownc"}, {"woodglass", "brown"}
+local function door_access(name) return name:find("prison") end
+local xdecor_doors = {
+       japanese = {
+               {"group:wood", "default:paper"},
+               {"default:paper", "group:wood"},
+               {"group:wood", "default:paper"}
+       },
+       prison = {
+               {"xpanes:bar", "xpanes:bar"},
+               {"xpanes:bar", "xpanes:bar"},
+               {"xpanes:bar", "xpanes:bar"}
+       },
+       rusty_prison = {
+               {"xpanes:rusty_bar", "xpanes:rusty_bar"},
+               {"xpanes:rusty_bar", "xpanes:rusty_bar"},
+               {"xpanes:rusty_bar", "xpanes:rusty_bar"}
+       },
+       screen = {
+               {"group:wood", "group:wood"},
+               {"xpanes:chainlink", "xpanes:chainlink"},
+               {"group:wood", "group:wood"}
+       },
+       slide = {
+               {"default:paper", "default:paper"},
+               {"default:paper", "default:paper"},
+               {"group:wood", "group:wood"}
+       },
+       woodglass = {
+               {"default:glass", "default:glass"},
+               {"group:wood", "group:wood"},
+               {"group:wood", "group:wood"}
+       }
 }
 
-for _, d in pairs(door_types) do
-       doors.register_door("xdecor:"..d[1].."_door", {
-               description = string.gsub(d[1]:gsub("^%l", string.upper), "_r", " R").." Door",
-               inventory_image = "xdecor_"..d[1].."_door_inv.png",
-               groups = {choppy=3, cracky=3, oddly_breakable_by_hand=1, flammable=2, door=1},
-               tiles_bottom = {"xdecor_"..d[1].."_door_b.png", "xdecor_"..d[2]..".png"},
-               tiles_top = {"xdecor_"..d[1].."_door_a.png", "xdecor_"..d[2]..".png"},
-               only_placer_can_open = door_access(d[1]),
-               sounds = default.node_sound_wood_defaults(),
-               sunlight = false
+for name, recipe in pairs(xdecor_doors) do
+       if not doors.register then break end
+       doors.register(name.."_door", {
+               tiles = {{name = "xdecor_"..name.."_door.png", backface_culling=true}},
+               description = string.gsub(" "..name, "%W%l", string.upper):sub(2):gsub("_", " ").." Door",
+               inventory_image = "xdecor_"..name.."_door_inv.png",
+               protected = door_access(name),
+               groups = {choppy=2, cracky=2, oddly_breakable_by_hand=1, door=1},
+               recipe = recipe
        })
+       minetest.register_alias("xdecor:"..name.."_door", "doors:"..name.."_door")
+       minetest.register_alias("xdecor:"..name.."_door_t_1", "air")
+       minetest.register_alias("xdecor:"..name.."_door_t_2", "air")
+       minetest.register_alias("xdecor:"..name.."_door_b_1", "doors:"..name.."_door_a")
+       minetest.register_alias("xdecor:"..name.."_door_b_2", "doors:"..name.."_door_b")
 end
+minetest.register_alias("xdecor:prison_rust_door", "doors:rusty_prison_door")
+minetest.register_alias("xdecor:prison_rust_door_t_1", "air")
+minetest.register_alias("xdecor:prison_rust_door_t_2", "air")
+minetest.register_alias("xdecor:prison_rust_door_b_1", "doors:rusty_prison_door_a")
+minetest.register_alias("xdecor:prison_rust_door_b_2", "doors:rusty_prison_door_b")
 
 xdecor.register("empty_shelf", {
        description = "Empty Shelf",
        inventory = {size=24},
        infotext = "Empty Shelf",
        tiles = {"default_wood.png", "default_wood.png^xdecor_empty_shelf.png"},
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        sounds = default.node_sound_wood_defaults(),
        on_rotate = screwdriver.rotate_simple
 })
 
 xdecor.register("enderchest", {
        description = "Ender Chest",
-       tiles = {
-               "xdecor_enderchest_top.png", "xdecor_enderchest_top.png",
-               "xdecor_enderchest_side.png", "xdecor_enderchest_side.png",
-               "xdecor_enderchest_side.png", "xdecor_enderchest_front.png"
-       },
+       tiles = {"xdecor_enderchest_top.png", "xdecor_enderchest_top.png",
+                "xdecor_enderchest_side.png", "xdecor_enderchest_side.png",
+                "xdecor_enderchest_side.png", "xdecor_enderchest_front.png"},
        groups = {cracky=1, choppy=1, oddly_breakable_by_hand=1},
        sounds = default.node_sound_stone_defaults(),
        on_rotate = screwdriver.rotate_simple,
@@ -229,51 +297,11 @@ minetest.register_on_joinplayer(function(player)
        inv:set_size("enderchest", 8*4)
 end)
 
-xdecor.register("fire", {
-       description = "Fancy Fire",
-       drawtype = "plantlike",
-       light_source = 14,
-       walkable = false,
-       tiles = {
-               { name = "xdecor_fire_anim.png",
-               animation = {type="vertical_frames", length=1.5} }
-       },
-       damage_per_second = 4,
-       drop = "",
-       selection_box = {
-               type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, -0.3, 0.3}
-       },
-       groups = {dig_immediate=3, hot=3, not_in_creative_inventory=1}
-})
-
-minetest.register_tool("xdecor:flint_steel", {
-       description = "Flint & Steel",
-       inventory_image = "xdecor_flint_steel.png",
-       tool_capabilities = {
-               groupcaps = { igniter = {uses=10, maxlevel=1} }
-       },
-       on_use = function(itemstack, user, pointed_thing)
-               local player = user:get_player_name()
-               if pointed_thing.type == "node" and
-                               minetest.get_node(pointed_thing.above).name == "air" then
-                       if not minetest.is_protected(pointed_thing.above, player) then
-                               minetest.set_node(pointed_thing.above, {name="xdecor:fire"})
-                       else
-                               minetest.chat_send_player(player, "This area is protected.")
-                       end
-               end
-
-               itemstack:add_wear(1000)
-               return itemstack
-       end
-})
-
-minetest.register_tool("xdecor:hammer", {
-       description = "Hammer",
-       inventory_image = "xdecor_hammer.png",
-       wield_image = "xdecor_hammer.png",
-       on_use = function(...) do return end end
-})
+if rawget(_G, "fire") then
+       minetest.register_alias("xdecor:fire", "fire:basic_flame")
+else
+       minetest.register_alias("xdecor:fire", "air")
+end
 
 xdecor.register("ivy", {
        description = "Ivy",
@@ -300,8 +328,7 @@ xdecor.register("lantern", {
        legacy_wallmounted = true,
        walkable = false,
        groups = {dig_immediate=3, attached_node=1},
-       tiles = {"xdecor_lantern_floor.png", "xdecor_lantern_ceiling.png",
-                       "xdecor_lantern.png"},
+       tiles = {"xdecor_lantern_floor.png", "xdecor_lantern_ceiling.png", "xdecor_lantern.png"},
        selection_box = {
                type = "wallmounted",
                wall_top = {-0.25, -0.4, -0.25, 0.25, 0.5, 0.25},
@@ -310,13 +337,17 @@ xdecor.register("lantern", {
        }
 })
 
-xdecor.register("lightbox", {
-       description = "Light Box",
-       tiles = {"xdecor_lightbox.png"},
-       groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2},
-       light_source = 13,
-       sounds = default.node_sound_glass_defaults()
-})
+for _, l in pairs({"iron", "wooden"}) do
+       xdecor.register(l.."_lightbox", {
+               description = l:gsub("^%l", string.upper).." Light Box",
+               tiles = {"xdecor_"..l.."_lightbox.png"},
+               groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2},
+               light_source = 13,
+               sounds = default.node_sound_glass_defaults()
+       })
+end
+
+minetest.register_alias("xdecor:lightbox", "xdecor:wooden_lightbox")
 
 xdecor.register("packed_ice", {
        drawtype = "normal",
@@ -326,10 +357,8 @@ xdecor.register("packed_ice", {
        sounds = default.node_sound_glass_defaults()
 })
 
-local flowers = {"dandelion_white", "dandelion_yellow", "geranium", "rose",
-               "tulip", "viola"}
-
-for _, f in pairs(flowers) do
+for _, f in pairs({"dandelion_white", "dandelion_yellow", "geranium",
+               "rose", "tulip", "viola"}) do
        xdecor.register("potted_"..f, {
                description = string.gsub("Potted Flowers ("..f..")", "_", " "),
                walkable = false,
@@ -343,10 +372,8 @@ for _, f in pairs(flowers) do
 
        minetest.register_craft({
                output = "xdecor:potted_"..f,
-               recipe = {
-                       {"default:clay_brick", "flowers:"..f, "default:clay_brick"},
-                       {"", "default:clay_brick", ""}
-               }
+               recipe = { {"default:clay_brick", "flowers:"..f, "default:clay_brick"},
+                          {"", "default:clay_brick", ""} }
        })
 end
 
@@ -359,7 +386,7 @@ xdecor.register("painting_1", {
        legacy_wallmounted = true,
        wield_image = "xdecor_painting_empty.png",
        sunlight_propagates = true,
-       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1},
+       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1},
        sounds = default.node_sound_wood_defaults(),
        node_box = {
                type = "wallmounted",
@@ -369,12 +396,12 @@ xdecor.register("painting_1", {
        },
        on_construct = function(pos)
                local node = minetest.get_node(pos)
-               minetest.set_node(pos, {name="xdecor:painting_"..math.random(1,4), param2=node.param2})
+               local random = math.random(4)
+               if random == 1 then return end
+               minetest.set_node(pos, {name="xdecor:painting_"..random, param2=node.param2})
        end
 })
 
-minetest.register_alias("xdecor:painting", "xdecor:painting_1") -- legacy code
-
 for i = 2, 4 do
        xdecor.register("painting_"..i, {
                tiles = {"xdecor_painting_"..i..".png"},
@@ -382,7 +409,7 @@ for i = 2, 4 do
                legacy_wallmounted = true,
                drop = "xdecor:painting_1",
                sunlight_propagates = true,
-               groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1, not_in_creative_inventory=1},
+               groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1, not_in_creative_inventory=1},
                sounds = default.node_sound_wood_defaults(),
                node_box = {
                        type = "wallmounted",
@@ -403,11 +430,10 @@ for _, b in pairs({{"cactus", "cactus"}, {"moon", "stone"}}) do
        })
        
        minetest.register_craft({
-       output = "xdecor:"..b[1].."brick",
-       recipe = {
-               {"default:brick", "default:"..b[2]}
-       }
-})
+               output = "xdecor:"..b[1].."brick",
+               type = "shapeless",
+               recipe = {"default:brick", "default:"..b[2]}
+       })
 end
 
 xdecor.register("multishelf", {
@@ -416,26 +442,29 @@ xdecor.register("multishelf", {
        infotext = "Multi Shelf",
        on_rotate = screwdriver.rotate_simple,
        tiles = {"default_wood.png", "default_wood.png^xdecor_multishelf.png"},
-       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        sounds = default.node_sound_wood_defaults()
 })
 
-xpanes.register_pane("rust_bar", {
-       description = "Rust Bars",
-       tiles = {"xdecor_rust_bars.png"},
+xpanes.register_pane("rusty_bar", {
+       description = "Rusty Iron Bars",
+       tiles = {"xdecor_rusty_bars.png"},
        drawtype = "airlike",
        paramtype = "light",
-       textures = {"xdecor_rust_bars.png", "xdecor_rust_bars.png", "xpanes_space.png"},
-       inventory_image = "xdecor_rust_bars.png",
-       wield_image = "xdecor_rust_bars.png",
-       groups = {cracky=3, oddly_breakable_by_hand=2, pane=1},
-       recipe = {
-               {"", "default:dirt", ""},
-               {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-               {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}
-       }
+       textures = {"xdecor_rusty_bars.png", "xdecor_rusty_bars.png", "xpanes_space.png"},
+       inventory_image = "xdecor_rusty_bars.png",
+       wield_image = "xdecor_rusty_bars.png",
+       groups = {cracky=2, pane=1},
+       recipe = { {"", "default:dirt", ""},
+                  {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+                  {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"} }
 })
 
+minetest.register_alias("xpanes:rust_bar", "xpanes:rusty_bar")
+for i = 1, 15 do
+       minetest.register_alias("xpanes:rust_bar_"..i, "xpanes:rusty_bar_"..i)
+end
+
 xdecor.register("stonepath", {
        description = "Garden Stone Path",
        tiles = {"default_stone.png"},
@@ -443,24 +472,20 @@ xdecor.register("stonepath", {
        on_rotate = screwdriver.rotate_simple,
        sounds = default.node_sound_stone_defaults(),
        sunlight_propagates = true,
-       node_box = {
-               type = "fixed",
-               fixed = {{0, -0.5, 0, 0.375, -0.47, 0.375},
-                       {-0.4375, -0.5, -0.4375, -0.0625, -0.47, -0.0625},
-                       {-0.4375, -0.5, 0.125, -0.125, -0.47, 0.4375},
-                       {0.125, -0.5, -0.375, 0.375, -0.47, -0.125}}
-       },
+       node_box = xdecor.pixelbox(16, {
+               {8,  0,  8, 6, .5, 6},
+               {1,  0,  1, 6, .5, 6},
+               {1,  0, 10, 5, .5, 5},
+               {10, 0,  2, 4, .5, 4}
+       }),
        selection_box = xdecor.nodebox.slab_y(0.05)
 })
 
-local stonish = {"desertstone_tile", "stone_tile", "stone_rune", "coalstone_tile",
-               "hard_clay"}
-
-for _, t in pairs(stonish) do
+for _, t in pairs({"desertstone_tile", "stone_tile", "stone_rune",
+               "coalstone_tile", "hard_clay"}) do
        xdecor.register(t, {
                drawtype = "normal",
-               description = string.sub(t:gsub("^%l", string.upper), 1, -6)
-                               .." "..t:sub(-4):gsub("^%l", string.upper),
+               description = string.gsub(" "..t, "%W%l", string.upper):sub(2):gsub("_", " "),
                tiles = {"xdecor_"..t..".png"},
                groups = {cracky=1},
                sounds = default.node_sound_stone_defaults()
@@ -470,13 +495,11 @@ end
 xdecor.register("table", {
        description = "Table",
        tiles = {"xdecor_wood.png"},
-       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
+       groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        sounds = default.node_sound_wood_defaults(),
-       node_box = {
-               type = "fixed",
-               fixed = {{-0.5, 0.4, -0.5, 0.5, 0.5, 0.5},
-                       {-0.15, -0.5, -0.15, 0.15, 0.4, 0.15}}
-       }
+       node_box = xdecor.pixelbox(16, {
+               {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6}
+       })
 })
 
 xdecor.register("tatami", {
@@ -484,9 +507,7 @@ xdecor.register("tatami", {
        tiles = {"xdecor_tatami.png"},
        wield_image = "xdecor_tatami.png",
        groups = {snappy=3, flammable=3},
-       node_box = {
-               type = "fixed", fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-       }
+       node_box = xdecor.nodebox.slab_y(0.0625)
 })
 
 xdecor.register("tv", {
@@ -494,16 +515,19 @@ xdecor.register("tv", {
        light_source = 11,
        groups = {snappy=3},
        on_rotate = screwdriver.rotate_simple,
-       tiles = {
-               "xdecor_television_left.png^[transformR270",
-               "xdecor_television_left.png^[transformR90",
-               "xdecor_television_left.png^[transformFX",
-               "xdecor_television_left.png", "xdecor_television_back.png",
-               { name = "xdecor_television_front_animated.png",
-                       animation = {type="vertical_frames", length=80.0} }
-       }
+       tiles = { "xdecor_television_left.png^[transformR270",
+                 "xdecor_television_left.png^[transformR90",
+                 "xdecor_television_left.png^[transformFX",
+                 "xdecor_television_left.png", "xdecor_television_back.png",
+               {name = "xdecor_television_front_animated.png",
+                animation = {type="vertical_frames", length=80.0}} }
 })
 
+for _, n in pairs({"c0", "c1", "c2", "c3", "c4", "ln"}) do
+       minetest.register_alias("xdecor:cobble_wall_"..n, "walls:cobble")
+       minetest.register_alias("xdecor:mossycobble_wall_"..n, "walls:cobble")
+end
+
 xpanes.register_pane("wood_frame", {
        description = "Wood Frame",
        tiles = {"xdecor_wood_frame.png"},
@@ -512,20 +536,18 @@ xpanes.register_pane("wood_frame", {
        textures = {"xdecor_wood_frame.png", "xdecor_wood_frame.png", "xpanes_space.png"},
        inventory_image = "xdecor_wood_frame.png",
        wield_image = "xdecor_wood_frame.png",
-       groups = {choppy=3, oddly_breakable_by_hand=2, pane=1, flammable=3},
+       groups = {choppy=2, pane=1, flammable=2},
        sounds = default.node_sound_wood_defaults(),
-       recipe = {
-               {"group:wood", "group:stick", "group:wood"},
-               {"group:stick", "group:stick", "group:stick"},
-               {"group:wood", "group:stick", "group:wood"}
-       }
+       recipe = { {"group:wood", "group:stick", "group:wood"},
+                  {"group:stick", "group:stick", "group:stick"},
+                  {"group:wood", "group:stick", "group:wood"} }
 })
 
 xdecor.register("woodframed_glass", {
        description = "Wood Framed Glass",
        drawtype = "glasslike_framed",
        tiles = {"xdecor_woodframed_glass.png", "xdecor_woodframed_glass_detail.png"},
-       groups = {cracky=3, oddly_breakable_by_hand=2},
+       groups = {cracky=2, oddly_breakable_by_hand=1},
        sounds = default.node_sound_glass_defaults()
 })
 
@@ -533,6 +555,7 @@ xdecor.register("wood_tile", {
        description = "Wood Tile",
        tiles = {"xdecor_wood_tile.png"},
        drawtype = "normal",
-       groups = {choppy=1, oddly_breakable_by_hand=1, wood=1, flammable=2},
+       groups = {choppy=1, wood=1, flammable=2},
        sounds = default.node_sound_wood_defaults()
 })
+