]> git.lizzy.rs Git - xdecor.git/commitdiff
style cleaning
authorkilbith <jeanpatrick.guerrero@gmail.com>
Wed, 10 Jun 2015 11:26:04 +0000 (13:26 +0200)
committerkilbith <jeanpatrick.guerrero@gmail.com>
Wed, 10 Jun 2015 11:26:04 +0000 (13:26 +0200)
building.lua [deleted file]
crafts.lua
furniture.lua [deleted file]
init.lua
lighting.lua [deleted file]
misc.lua [deleted file]
nodes.lua [new file with mode: 0644]
storage.lua [deleted file]

diff --git a/building.lua b/building.lua
deleted file mode 100644 (file)
index 846c400..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-xdecor.register("moonbrick", {
-       description = "Moonbrick", tiles = {"xdecor_moonbrick.png"},
-       groups = {snappy=3}, sounds = default.node_sound_stone_defaults()
-})
-
-xdecor.register("wood_tile", {
-       description = "Wood tile", tiles = {"xdecor_wood_tile.png"},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults()
-})
-
-xdecor.register("coalstone_tile", {
-       description = "Coalstone tile", tiles = {"xdecor_coalstone_tile.png"},
-       groups = {snappy=3}, sounds = default.node_sound_stone_defaults()
-})
-
-fencematerial = {"brass", "wrought_iron"}
-for _, m in ipairs(fencematerial) do
-xdecor.register("fence_"..m, {
-       description = "Fence ("..m..")", drawtype = "fencelike", tiles = {"xdecor_"..m..".png"},
-       inventory_image = "default_fence_overlay.png^xdecor_"..m..".png^default_fence_overlay.png^[makealpha:255,126,126",
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults()
-})
-end
index afc52e87ae28a146644c4042c0ba88a936a09acf..082c72c27f73e1cff53f0ce1db5bd6ff677ef961 100644 (file)
@@ -4,16 +4,14 @@ minetest.register_craft({
                {"group:wood", "group:wood", "group:wood"},
                {"default:iron_lump", "", "default:iron_lump"},
                {"group:wood", "group:wood", "group:wood"}
-       }
-})
+       } })
 
 minetest.register_craftitem("xdecor:brass_ingot", {
        description = "Brass ingot", inventory_image = "xdecor_brass_ingot.png" })
 
 minetest.register_craft({
        type = "shapeless", output = "xdecor:brass_ingot",
-       recipe = {"default:copper_ingot", "moreores:tin_ingot"}
-})
+       recipe = {"default:copper_ingot", "moreores:tin_ingot"} })
 
 minetest.register_craft({
        output = "xdecor:cabinet",
@@ -21,8 +19,7 @@ minetest.register_craft({
                {"group:wood", "group:wood", "group:wood"},
                {"doors:trapdoor", "", "doors:trapdoor"},
                {"group:wood", "group:wood", "group:wood"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:cabinet_half 2", recipe = {{"xdecor:cabinet"}} })
@@ -35,8 +32,7 @@ minetest.register_craft({
        recipe = {
                {"default:paper", "default:paper", "default:paper"},
                {"default:paper", "default:paper", "default:paper"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:cauldron",
@@ -44,8 +40,7 @@ minetest.register_craft({
                {"default:iron_lump", "", "default:iron_lump"},
                {"default:iron_lump", "default:water_source", "default:iron_lump"},
                {"default:iron_lump", "default:iron_lump", "default:iron_lump"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:chair",
@@ -53,16 +48,14 @@ minetest.register_craft({
                {"group:stick", "", ""},
                {"group:stick", "group:stick", "group:stick"},
                {"group:stick", "", "group:stick"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:coalstone_tile 8",
        recipe = {
                {"default:coalblock", "default:stone"},
                {"default:stone", "default:coalblock"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:cushion 2", recipe = {{"wool:red", "wool:red", "wool:red"}} })
@@ -72,21 +65,18 @@ minetest.register_craft({
        recipe = {
                {"xdecor:brass_ingot", "xdecor:brass_ingot", "xdecor:brass_ingot"},
                {"xdecor:brass_ingot", "xdecor:brass_ingot", "xdecor:brass_ingot"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:fence_wrought_iron 2",
        recipe = {
                {"default:iron_lump", "default:iron_lump", "default:iron_lump"},
                {"default:iron_lump", "default:iron_lump", "default:iron_lump"}
-       }
-})
+       } })
 
 minetest.register_craft({
        type = "shapeless", output = "xdecor:flint_steel",
-       recipe = {"default:obsidian_shard", "default:steel_ingot"}
-})
+       recipe = {"default:obsidian_shard", "default:steel_ingot"} })
 
 minetest.register_craft({
        output = "xdecor:frame",
@@ -94,13 +84,11 @@ minetest.register_craft({
                {"group:stick", "group:stick", "group:stick"},
                {"group:stick", "default:paper", "group:stick"},
                {"group:stick", "group:stick", "group:stick"},
-       }
-})
+       } })
 
 minetest.register_craft({
        type = "shapeless", output = "xdecor:moonbrick",
-       recipe = {"default:brick", "default:stone"}
-})
+       recipe = {"default:brick", "default:stone"} })
 
 minetest.register_craft({
        output = "xdecor:multishelf",
@@ -108,13 +96,11 @@ minetest.register_craft({
                {"group:wood", "group:wood", "group:wood"},
                {"xdecor:skull", "group:book", "group:vessel"},
                {"group:wood", "group:wood", "group:wood"}
-       }
-})
+       } })
 
 minetest.register_craft({
        type = "shapeless", output = "xdecor:painting",
-       recipe = {"default:sign_wall", "dye:blue"}
-})
+       recipe = {"default:sign_wall", "dye:blue"} })
 
 minetest.register_craft({
        output = "xdecor:plant_pot",
@@ -122,8 +108,7 @@ minetest.register_craft({
                {"default:clay_lump", "", "default:clay_lump"},
                {"default:clay_lump", "default:dirt", "default:clay_lump"},
                {"default:clay_lump", "default:clay_lump", "default:clay_lump"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:rope 2",
@@ -131,8 +116,7 @@ minetest.register_craft({
                {"farming:string"},
                {"farming:string"},
                {"farming:string"}
-       }
-})
+       } })
 
 minetest.register_craft({
        type = "shapeless", output = "xdecor:skull", recipe = {"bones:bones"} })
@@ -143,8 +127,7 @@ minetest.register_craft({
                {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"},
                {"", "group:stick", ""},
                {"", "group:stick", ""}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:tv",
@@ -152,22 +135,19 @@ minetest.register_craft({
                {"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"},
                {"default:steel_ingot", "default:glass", "default:steel_ingot"},
                {"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:workbench",
        recipe = {
                {"group:wood", "group:wood", "group:wood"},
-               {"screwdriver:screwdriver", "screwdriver:screwdriver", "screwdriver:screwdriver"},
+               {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
                {"group:wood", "group:wood", "group:wood"}
-       }
-})
+       } })
 
 minetest.register_craft({
        output = "xdecor:wood_tile 2",
        recipe = {
                {"group:wood", "group:wood"},
                {"group:wood", "group:wood"}
-       }
-})
+       } })
diff --git a/furniture.lua b/furniture.lua
deleted file mode 100644 (file)
index 1f26f14..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-xdecor.register("chair", {
-       description = "Chair", tiles = {"xdecor_wood.png"},
-       sounds = default.node_sound_wood_defaults(), groups = {snappy=3},
-       node_box = {type="fixed", fixed={
-               {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125},
-               {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125},
-               {-0.1875, 0.025, 0.22, 0.1875, 0.45, 0.28},
-               {-0.3125, -0.5, -0.3125, -0.1875, -0.125, -0.1875},
-               {0.1875, -0.5, -0.3125, 0.3125, -0.125, -0.1875},
-               {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.1875}}}
-})
-
-xdecor.register("cushion", {
-       description = "Cushion", tiles = {"xdecor_cushion.png"},
-       groups = {snappy=3}, on_place = minetest.rotate_node,
-       node_box = {type="fixed", fixed={{-0.5, -0.5, -0.5, 0.5, 0, 0.5}}}
-})
-
-local curtaincolors = { {"red", "#ad2323e0:175"}, {"white", "#ffffffe0:175"} }
-for c in ipairs(curtaincolors) do
-       local color = curtaincolors[c][1]
-       local hue = curtaincolors[c][2]
-
-       xdecor.register("curtain_"..color, {
-               description = "Curtain ("..color..")", tiles = {"xdecor_curtain.png^[colorize:"..hue},
-               inventory_image = "xdecor_curtain_open.png^[colorize:"..hue,
-               drawtype = "signlike", paramtype2 = "wallmounted",
-               use_texture_alpha = true, walkable = false,
-               groups = {dig_immediate=3}, selection_box = {type="wallmounted"},
-               on_rightclick = function(pos, node, clicker, itemstack)
-                       local fdir = node.param2
-                       minetest.set_node(pos, {name = "xdecor:curtain_open_"..color, param2 = fdir})
-               end
-       })
-
-       xdecor.register("curtain_open_"..color, {
-               tiles = { "xdecor_curtain_open.png^[colorize:"..hue },
-               drawtype = "signlike", paramtype2 = "wallmounted",
-               use_texture_alpha = true, walkable = false,
-               groups = {dig_immediate=3, not_in_creative_inventory=1},
-               selection_box = {type="wallmounted"}, drop = "xdecor:curtain_"..color,
-               on_rightclick = function(pos, node, clicker, itemstack)
-                       local fdir = node.param2
-                       minetest.set_node(pos, { name = "xdecor:curtain_"..color, param2 = fdir })
-               end
-       })
-       
-       minetest.register_craft({
-               output = "xdecor:curtain_"..color.." 4",
-               recipe = {{"", "wool:"..color, ""},
-                               {"", "wool:"..color, ""},
-                               {"", "wool:"..color, ""}} })
-end
-
-xdecor.register("table", {
-       description = "Table", tiles = {"xdecor_wood.png"},
-       groups = {snappy=3}, 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}}}
-})
index 38b587d698634c07abffd0d45910909561c4129b..c1f6f725d74bd9caa3f4d842d40be085a2ddbfff 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -1,14 +1,8 @@
 xdecor = {}
-
 modpath = minetest.get_modpath("xdecor")
 
 dofile(modpath.."/handlers/nodeboxes.lua")
 dofile(modpath.."/handlers/registration.lua")
-
-dofile(modpath.."/building.lua")
 dofile(modpath.."/crafts.lua")
 dofile(modpath.."/itemframes.lua")
-dofile(modpath.."/furniture.lua")
-dofile(modpath.."/lighting.lua")
-dofile(modpath.."/misc.lua")
-dofile(modpath.."/storage.lua")
+dofile(modpath.."/nodes.lua")
diff --git a/lighting.lua b/lighting.lua
deleted file mode 100644 (file)
index 1771bac..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-xdecor.register("candle", {
-       description = "Candle", light_source = 12,
-       inventory_image = "xdecor_candle_inv.png", drawtype = "torchlike",
-       paramtype2 = "wallmounted", legacy_wallmounted = true,
-       walkable = false, groups = {dig_immediate=3, attached_node=1},
-       tiles = { 
-               {name="xdecor_candle_floor.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}},
-               {name="xdecor_candle_wall.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}
-       },
-       selection_box = {type="wallmounted",
-               wall_bottom={-0.25, -0.5, -0.25, 0.25, 0.1, 0.25},
-               wall_side={-0.5, -0.35, -0.15, -0.15, 0.4, 0.15}}
-})
-
-xdecor.register("fire", {
-       description = "Fake fire", light_source = 14, walkable = false,
-       tiles = {{name="xdecor_fire_anim.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}},
-       drawtype = "plantlike", damage_per_second = 2, drop = "",
-       groups = {dig_immediate=3, not_in_creative_inventory=1}
-})
diff --git a/misc.lua b/misc.lua
deleted file mode 100644 (file)
index 3860858..0000000
--- a/misc.lua
+++ /dev/null
@@ -1,70 +0,0 @@
-xdecor.register("cauldron", {
-       description = "Cauldron", groups = {snappy=1},
-       tiles = {{name="xdecor_cauldron_top_anim.png", animation={type="vertical_frames", 
-               aspect_w=16, aspect_h=16, length=3.0}}, "xdecor_cauldron_sides.png"}
-})
-
-minetest.register_tool("xdecor:flint_steel", {
-       description = "Flint and steel", stack_max = 1, inventory_image = "xdecor_flint_steel.png",
-       tool_capabilities = {groupcaps={flamable={uses=65, maxlevel=1}}},
-       on_use = function(itemstack, user, pointed_thing)
-               if pointed_thing.type == "node" and minetest.get_node(pointed_thing.above).name == "air" then
-                       if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then
-                               minetest.set_node(pointed_thing.above, {name="xdecor:fire"})
-                       else
-                               minetest.chat_send_player(user:get_player_name(), "This area is protected!")
-                       end
-               else return end
-
-               itemstack:add_wear(65535/65)
-               return itemstack
-       end
-})
-
-flowerstype = {"dandelion_white", "dandelion_yellow", "geranium", "rose", "tulip", "viola"}
-for _, f in ipairs(flowerstype) do
-xdecor.register("potted_"..f, {
-       description = "Potted flowers ("..f..")", walkable = false,
-       tiles = {"xdecor_"..f.."_pot.png"}, inventory_image = "xdecor_"..f.."_pot.png",
-       drawtype = "plantlike", groups = {dig_immediate=3}, sounds = default.node_sound_leaves_defaults()
-})
-
-minetest.register_craft({
-       type = "shapeless", output = "xdecor:potted_"..f.." 2",
-       recipe = {"flowers:"..f, "xdecor:plant_pot"}
-})
-end
-
-xdecor.register("painting", {
-       description = "Painting", drawtype = "signlike", tiles = {"xdecor_painting.png"},
-       paramtype2 = "wallmounted", legacy_wallmounted = true, walkable = false,
-       inventory_image = "xdecor_painting.png", selection_box = {type = "wallmounted"},
-       groups = {dig_immediate=3, attached_node=1}, sounds = default.node_sound_wood_defaults()
-})
-
-xdecor.register("plant_pot", {
-       description = "Plant pot", groups = {snappy=3},
-       tiles = {"xdecor_plant_pot_top.png", "xdecor_plant_pot_sides.png"}
-})
-
-local rope_sbox = {type="fixed", fixed={-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}}
-xdecor.register("rope", {
-       description = "Hanging rope", walkable = false, climbable = true,
-       tiles = {"xdecor_rope.png"}, inventory_image = "xdecor_rope_inv.png",
-       drawtype = "plantlike", groups = {dig_immediate=3}, selection_box = rope_sbox
-})
-
-local skull_sbox = {type="fixed", fixed={-0.3, -0.5, -0.3, 0.3, 0.25, 0.3}}
-xdecor.register("skull", {
-       description = "Skull head", walkable = false, selection_box = skull_sbox,
-       tiles = {"xdecor_skull.png"}, inventory_image = "xdecor_skull.png",
-       drawtype = "torchlike", groups = {dig_immediate=3, attached_node=1}
-})
-
-xdecor.register("tv", {
-       description = "Television", light_source = 11, groups = {snappy=3},
-       tiles = {"xdecor_television_top.png", "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", aspect_w=16, aspect_h=16, length=80.0}}}
-})
diff --git a/nodes.lua b/nodes.lua
new file mode 100644 (file)
index 0000000..6e09ee9
--- /dev/null
+++ b/nodes.lua
@@ -0,0 +1,183 @@
+xdecor.register("barrel", {
+       description = "Barrel", infotext = "Barrel", inventory = {size=24},
+       tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults() })
+
+xdecor.register("cabinet", {
+       description = "Cabinet", infotext = "Cabinet", inventory = {size=24},
+       tiles = {"default_wood.png", "xdecor_cabinet_front.png"},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults() })
+
+xdecor.register("cabinet_half", {
+       description = "Cabinet half", infotext = "Cabinet (half)", inventory = {size=8},
+       tiles = {"default_wood.png", "xdecor_cabinet_half_front.png"},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults(),
+       node_box = {type="fixed", fixed={{-0.5, 0, -0.5, 0.5, 0.5, 0.5}}} })
+
+xdecor.register("candle", {
+       description = "Candle", light_source = 12,
+       inventory_image = "xdecor_candle_inv.png", drawtype = "torchlike",
+       paramtype2 = "wallmounted", legacy_wallmounted = true,
+       walkable = false, groups = {dig_immediate=3, attached_node=1},
+       tiles = { 
+               {name="xdecor_candle_floor.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}},
+               {name="xdecor_candle_wall.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}} },
+       selection_box = {type="wallmounted",
+               wall_bottom={-0.25, -0.5, -0.25, 0.25, 0.1, 0.25},
+               wall_side={-0.5, -0.35, -0.15, -0.15, 0.4, 0.15}} })
+
+xdecor.register("cardboard_box", {
+       description = "Cardboard box", groups = {snappy=3}, inventory = {size=8},
+       tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", "xdecor_cardbox_sides.png"},
+       node_box = {type="fixed", fixed={{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}}} })
+
+xdecor.register("cauldron", {
+       description = "Cauldron", groups = {snappy=1},
+       tiles = {{name="xdecor_cauldron_top_anim.png", animation={type="vertical_frames", 
+               aspect_w=16, aspect_h=16, length=3.0}}, "xdecor_cauldron_sides.png"} })
+
+xdecor.register("chair", {
+       description = "Chair", tiles = {"xdecor_wood.png"},
+       sounds = default.node_sound_wood_defaults(), groups = {snappy=3},
+       node_box = {type="fixed", fixed={
+               {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125},
+               {-0.1875, 0.025, 0.22, 0.1875, 0.45, 0.28}, {-0.3125, -0.5, -0.3125, -0.1875, -0.125, -0.1875},
+               {0.1875, -0.5, -0.3125, 0.3125, -0.125, -0.1875}, {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.1875}}} })
+
+xdecor.register("coalstone_tile", {
+       description = "Coalstone tile", tiles = {"xdecor_coalstone_tile.png"},
+       groups = {snappy=3}, sounds = default.node_sound_stone_defaults() })
+
+local curtaincolors = { {"red", "#ad2323e0:175"} }
+for c in ipairs(curtaincolors) do
+local color = curtaincolors[c][1]
+local hue = curtaincolors[c][2]
+
+xdecor.register("curtain_"..color, {
+       description = "Curtain ("..color..")", tiles = {"xdecor_curtain.png^[colorize:"..hue},
+       inventory_image = "xdecor_curtain_open.png^[colorize:"..hue,
+       drawtype = "signlike", paramtype2 = "wallmounted",
+       use_texture_alpha = true, walkable = false,
+       groups = {dig_immediate=3}, selection_box = {type="wallmounted"},
+       on_rightclick = function(pos, node, clicker, itemstack)
+               local fdir = node.param2
+               minetest.set_node(pos, {name = "xdecor:curtain_open_"..color, param2 = fdir})
+       end })
+
+xdecor.register("curtain_open_"..color, {
+       tiles = { "xdecor_curtain_open.png^[colorize:"..hue },
+       drawtype = "signlike", paramtype2 = "wallmounted",
+       use_texture_alpha = true, walkable = false,
+       groups = {dig_immediate=3, not_in_creative_inventory=1},
+       selection_box = {type="wallmounted"}, drop = "xdecor:curtain_"..color,
+       on_rightclick = function(pos, node, clicker, itemstack)
+               local fdir = node.param2
+               minetest.set_node(pos, { name = "xdecor:curtain_"..color, param2 = fdir })
+       end })
+       
+minetest.register_craft({
+       output = "xdecor:curtain_"..color.." 4",
+       recipe = {{"", "wool:"..color, ""},
+                       {"", "wool:"..color, ""},
+                       {"", "wool:"..color, ""}} })
+end
+
+xdecor.register("cushion", {
+       description = "Cushion", tiles = {"xdecor_cushion.png"},
+       groups = {snappy=3}, on_place = minetest.rotate_node,
+       node_box = {type="fixed", fixed={{-0.5, -0.5, -0.5, 0.5, 0, 0.5}}} })
+
+fencematerial = {"brass", "wrought_iron"}
+for _, m in ipairs(fencematerial) do
+xdecor.register("fence_"..m, {
+       description = "Fence ("..m..")", drawtype = "fencelike", tiles = {"xdecor_"..m..".png"},
+       inventory_image = "default_fence_overlay.png^xdecor_"..m..".png^default_fence_overlay.png^[makealpha:255,126,126",
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults() })
+end
+
+xdecor.register("fire", {
+       description = "Fake fire", light_source = 14, walkable = false,
+       tiles = {{name="xdecor_fire_anim.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}},
+       drawtype = "plantlike", damage_per_second = 2, drop = "",
+       groups = {dig_immediate=3, not_in_creative_inventory=1} })
+
+minetest.register_tool("xdecor:flint_steel", {
+       description = "Flint and steel", stack_max = 1, inventory_image = "xdecor_flint_steel.png",
+       tool_capabilities = {groupcaps={flamable={uses=65, maxlevel=1}}},
+       on_use = function(itemstack, user, pointed_thing)
+               if pointed_thing.type == "node" and minetest.get_node(pointed_thing.above).name == "air" then
+                       if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then
+                               minetest.set_node(pointed_thing.above, {name="xdecor:fire"})
+                       else minetest.chat_send_player(user:get_player_name(), "This area is protected!") end
+               else return end
+
+               itemstack:add_wear(65535/65)
+               return itemstack
+       end })
+
+flowerstype = {"dandelion_white", "dandelion_yellow", "geranium", "rose", "tulip", "viola"}
+for _, f in ipairs(flowerstype) do
+xdecor.register("potted_"..f, {
+       description = "Potted flowers ("..f..")", walkable = false,
+       tiles = {"xdecor_"..f.."_pot.png"}, inventory_image = "xdecor_"..f.."_pot.png",
+       drawtype = "plantlike", groups = {dig_immediate=3}, sounds = default.node_sound_leaves_defaults() })
+
+minetest.register_craft({
+       type = "shapeless", output = "xdecor:potted_"..f.." 2",
+       recipe = {"flowers:"..f, "xdecor:plant_pot"} })
+end
+
+xdecor.register("painting", {
+       description = "Painting", drawtype = "signlike", tiles = {"xdecor_painting.png"},
+       paramtype2 = "wallmounted", legacy_wallmounted = true, walkable = false,
+       inventory_image = "xdecor_painting.png", selection_box = {type = "wallmounted"},
+       groups = {dig_immediate=3, attached_node=1}, sounds = default.node_sound_wood_defaults() })
+
+xdecor.register("plant_pot", {
+       description = "Plant pot", groups = {snappy=3},
+       tiles = {"xdecor_plant_pot_top.png", "xdecor_plant_pot_sides.png"} })
+
+xdecor.register("moonbrick", {
+       description = "Moonbrick", tiles = {"xdecor_moonbrick.png"},
+       groups = {snappy=3}, sounds = default.node_sound_stone_defaults() })
+
+xdecor.register("multishelf", {
+       description = "Multishelf", infotext = "Multishelf", inventory = {size=24},
+       tiles = {"default_wood.png", "xdecor_multishelf.png"},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults() })
+
+local rope_sbox = {type="fixed", fixed={-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}}
+xdecor.register("rope", {
+       description = "Hanging rope", walkable = false, climbable = true,
+       tiles = {"xdecor_rope.png"}, inventory_image = "xdecor_rope_inv.png",
+       drawtype = "plantlike", groups = {dig_immediate=3}, selection_box = rope_sbox })
+
+local skull_sbox = {type="fixed", fixed={-0.3, -0.5, -0.3, 0.3, 0.25, 0.3}}
+xdecor.register("skull", {
+       description = "Skull head", walkable = false, selection_box = skull_sbox,
+       tiles = {"xdecor_skull.png"}, inventory_image = "xdecor_skull.png",
+       drawtype = "torchlike", groups = {dig_immediate=3, attached_node=1} })
+
+xdecor.register("table", {
+       description = "Table", tiles = {"xdecor_wood.png"},
+       groups = {snappy=3}, 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}}} })
+
+xdecor.register("tv", {
+       description = "Television", light_source = 11, groups = {snappy=3},
+       tiles = {"xdecor_television_top.png", "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", aspect_w=16, aspect_h=16, length=80.0}}} })
+
+xdecor.register("wood_tile", {
+       description = "Wood tile", tiles = {"xdecor_wood_tile.png"},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults() })
+
+xdecor.register("workbench", {
+       description = "Work table", infotext = "Work bench", inventory = {size=24},
+       groups = {snappy=3}, sounds = default.node_sound_wood_defaults(),
+       tiles = {"xdecor_workbench_top.png", "xdecor_workbench_top.png",
+               "xdecor_workbench_sides.png", "xdecor_workbench_sides.png",
+               "xdecor_workbench_front.png", "xdecor_workbench_front.png"} })
diff --git a/storage.lua b/storage.lua
deleted file mode 100644 (file)
index ea544c1..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-xdecor.register("barrel", {
-       description = "Barrel", infotext = "Barrel", inventory = {size=24},
-       tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults()
-})
-
-xdecor.register("cardboard_box", {
-       description = "Cardboard box", groups = {snappy=3}, inventory = {size=8},
-       tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", "xdecor_cardbox_sides.png"},
-       node_box = {type="fixed", fixed={{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}}}
-})
-
-xdecor.register("cabinet", {
-       description = "Cabinet", infotext = "Cabinet", inventory = {size=24},
-       tiles = {"default_wood.png", "xdecor_cabinet_front.png"},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults()
-})
-
-xdecor.register("cabinet_half", {
-       description = "Cabinet half", infotext = "Cabinet (half)", inventory = {size=8},
-       tiles = {"default_wood.png", "xdecor_cabinet_half_front.png"},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults(),
-       node_box = {type="fixed", fixed={{-0.5, 0, -0.5, 0.5, 0.5, 0.5}}}
-})
-
-xdecor.register("multishelf", {
-       description = "Multishelf", infotext = "Multishelf", inventory = {size=24},
-       tiles = {"default_wood.png", "xdecor_multishelf.png"},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults()
-})
-
-xdecor.register("workbench", {
-       description = "Work table", infotext = "Work bench", inventory = {size=24},
-       groups = {snappy=3}, sounds = default.node_sound_wood_defaults(),
-       tiles = {"xdecor_workbench_top.png", "xdecor_workbench_top.png",
-               "xdecor_workbench_sides.png", "xdecor_workbench_sides.png",
-               "xdecor_workbench_front.png", "xdecor_workbench_front.png"}
-})