diff --git a/mods/blocks/building/ornamental.lua b/mods/blocks/building/ornamental.lua index 2587c184e..b8bc40e01 100644 --- a/mods/blocks/building/ornamental.lua +++ b/mods/blocks/building/ornamental.lua @@ -1,4 +1,21 @@ local common_defs = { + carpet = { + _mcl_blast_resistance = 0.1, + _mcl_hardness = 0.1, + drawtype = "nodebox", + groups = { + attached_node = 3, colored_blocks = 1, fire_encouragement = 60, + fire_flammability = 20, fuel = 3, handy = 1, wool_carpets = 1 + }, + node_box = { + fixed = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}, + type = "fixed" + }, + paramtype = "light", + sounds = mcl_sounds.node_sound_wool_defaults(), + sunlight_propagates = true, + wield_scale = {x = 1, y = 1, z = 0.5} + }, glass = { _mcl_blast_resistance = 0.3, _mcl_hardness = 0.3, @@ -38,7 +55,16 @@ local common_defs = { } for _, color in pairs(voxelibre.colors) do - local identifier = color.."_stained_glass" + local identifier = color.."_carpet" + local image_name = "building_"..color.."_wool.png" + + common_defs.carpet.inventory_image = image_name + common_defs.carpet.tiles = {image_name} + common_defs.carpet.wield_image = image_name + + voxelibre.register_block(identifier, table.copy(common_defs.carpet)) + + identifier = color.."_stained_glass" voxelibre.register_block(identifier, table.copy(common_defs.glass)) @@ -50,3 +76,31 @@ for _, color in pairs(voxelibre.colors) do voxelibre.register_block(identifier, table.copy(common_defs.wool)) end + +local blocks = { + ["bamboo_mosaic"] = { + _mcl_blast_resistance = 3, + _mcl_hardness = 2, + groups = { + axey = 1, building_blocks = 1, fire_encouragement = 5, + fire_flammability = 20, fuel = 15, handy = 1 + }, + sounds = mcl_sounds.node_sound_wood_defaults() + }, + ["bookshelf"] = { + _mcl_blast_resistance = 1.5, + _mcl_hardness = 1.5, + _mcl_silk_touch_drop = true, + drop = "items:book 3", + groups = {axey = 1, building_blocks = 1, fire_encouragement = 30, + fire_flammability = 20, fuel = 15, handy = 1 + }, + sounds = mcl_sounds.node_sound_wood_defaults(), + tiles = {type = "loglike"} + }, + +} + +for identifier, definitions in pairs(blocks) do + voxelibre.register_block(identifier, definitions) +end diff --git a/textures/building/building_bookshelf.png b/textures/building/building_bookshelf.png new file mode 100644 index 000000000..548d3561a Binary files /dev/null and b/textures/building/building_bookshelf.png differ diff --git a/textures/building/building_bookshelf_top.png b/textures/building/building_bookshelf_top.png new file mode 100644 index 000000000..8f9053555 Binary files /dev/null and b/textures/building/building_bookshelf_top.png differ