diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index 7467cc94..c312d73f 100755 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -570,3 +570,39 @@ minetest.register_craft({ } }) +if not minetest.get_modpath("technic") then + minetest.register_node( ":technic:granite", { + description = "Granite", + tiles = { "technic_granite.png" }, + is_ground_content = true, + groups = {cracky=1}, + sounds = default.node_sound_stone_defaults(), + }) + + minetest.register_craft({ + output = "technic:granite 9", + recipe = { + { "building_blocks:Tar", "building_blocks:Marble", "building_blocks:Tar" }, + { "building_blocks:Marble", "building_blocks:Tar", "building_blocks:Marble" }, + { "building_blocks:Tar", "building_blocks:Marble", "building_blocks:Tar" } + }, + }) + + if minetest.get_modpath("moreblocks") then + stairsplus:register_all("technic", "granite", "technic:granite", { + description="Granite", + groups={cracky=1, not_in_creative_inventory=1}, + tiles={"technic_granite.png"}, + }) + + minetest.register_craft({ + output = "technic:granite 9", + recipe = { + { "moreblocks:tar", "building_blocks:Marble", "moreblocks:tar" }, + { "building_blocks:Marble", "moreblocks:tar", "building_blocks:Marble" }, + { "moreblocks:tar", "building_blocks:Marble", "moreblocks:tar" } + }, + }) + end +end + diff --git a/mods/homedecor_modpack/building_blocks/textures/technic_granite.png b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png new file mode 100644 index 00000000..abb13850 Binary files /dev/null and b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png differ diff --git a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua index cfa37af3..57a297f6 100755 --- a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua @@ -141,31 +141,46 @@ homedecor.register("shower_tray", { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 }, }, - groups = {cracky=2,}, + groups = {cracky=2}, sounds = default.node_sound_stone_defaults(), }) --Shower Head +local sh_cbox = { + type = "fixed", + fixed = { -0.2, -0.4, -0.1, 0.2, 0.1, 0.5 } +} + homedecor.register("shower_head", { - description = S("Shower Head"), - tiles = { "forniture_metal.png" }, - inventory_image="3dforniture_inv_shower_head.png", - sunlight_propagates = true, - node_box = { - type = "fixed", - fixed = { - { -0.10, -0.50, 0.10, 0.10, -0.40, 0.30, }, - { -0.05, -0.40, 0.15, 0.05, -0.30, 0.25, }, - { -0.05, -0.35, 0.25, 0.05, -0.30, 0.50, }, - { -0.10, -0.40, 0.49, 0.10, -0.25, 0.50, }, - }, + drawtype = "mesh", + mesh = "homedecor_shower_head.obj", + tiles = { "homedecor_shower_head.png" }, + inventory_image = "homedecor_shower_head_inv.png", + description = "Shower Head", + groups = {snappy=3}, + selection_box = sh_cbox, + collision_box = sh_cbox, +}) + +local bs_cbox = { + type = "fixed", + fixed = { -8/16, -8/16, 1/16, 8/16, 8/16, 8/16 } +} + +homedecor.register("bathroom_set", { + drawtype = "mesh", + mesh = "homedecor_bathroom_set.obj", + tiles = { + "homedecor_bathroom_set_mirror.png", + "homedecor_bathroom_set_tray.png", + "homedecor_bathroom_set_toothbrush.png", + "homedecor_bathroom_set_cup.png", + "homedecor_bathroom_set_toothpaste.png", }, - selection_box = { - type = "fixed", - fixed = { -0.1, -0.5, 0.1, 0.1, -0.25, 0.5 }, - }, - groups = {cracky=2,}, - sounds = default.node_sound_stone_defaults(), + description = "Bathroom sundries set", + groups = {snappy=3}, + selection_box = bs_cbox, + collision_box = bs_cbox, }) minetest.register_alias("3dforniture:toilet", "homedecor:toilet") diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index b7134b8f..ac950054 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -90,7 +90,7 @@ minetest.register_craftitem("homedecor:steel_wire", { minetest.register_craftitem("homedecor:speaker_driver", { description = S("Speaker driver"), - inventory_image = "homedecor_speaker_driver.png" + inventory_image = "homedecor_speaker_driver_inv.png" }) minetest.register_craftitem("homedecor:fan_blades", { @@ -1165,7 +1165,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:refrigerator_steel_bottom", + output = "homedecor:refrigerator_steel", recipe = { {"default:steel_ingot", "homedecor:glowlight_small_cube_white", "default:steel_ingot", }, {"default:steel_ingot", "default:copperblock", "default:steel_ingot", }, @@ -1175,9 +1175,9 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = "homedecor:refrigerator_white_bottom", + output = "homedecor:refrigerator_white", recipe = { - "homedecor:refrigerator_steel_bottom", + "homedecor:refrigerator_steel", "dye:white", "dye:white", "dye:white", @@ -2447,7 +2447,7 @@ minetest.register_craft( { -- doghouse minetest.register_craft( { - output = "homedecor:doghouse_base", + output = "homedecor:doghouse", recipe = { {"homedecor:shingles_terracotta", "homedecor:shingles_terracotta", "homedecor:shingles_terracotta"}, {"group:wood", "", "group:wood"}, @@ -2516,8 +2516,8 @@ minetest.register_craft( { output = "homedecor:pool_table", recipe = { { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, - { "group:wood", "group:wood", "group:wood" }, - { "group:stick", "", "group:stick" } + { "building_blocks:hardwood", "building_blocks:hardwood", "building_blocks:hardwood" }, + { "building_blocks:slab_hardwood", "", "building_blocks:slab_hardwood" } }, }) @@ -2548,7 +2548,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:well_base", + output = "homedecor:well", recipe = { { "homedecor:shingles_wood", "homedecor:shingles_wood", "homedecor:shingles_wood" }, { "group:wood", "group:stick", "group:wood" }, @@ -2741,11 +2741,11 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:piano_left", + output = "homedecor:piano", recipe = { { "", "homedecor:steel_wire", "building_blocks:hardwood" }, { "homedecor:plastic_strips", "homedecor:steel_wire", "building_blocks:hardwood" }, - { "building_blocks:hardwood", "default:steelblock", "building_blocks:hardwood" } + { "technic:brass_ingot", "default:steelblock", "building_blocks:hardwood" } }, }) @@ -3039,6 +3039,34 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:desk_globe", + recipe = { + { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, + { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "stairs:slab_wood", "dye:blue" } + }, +}) + +minetest.register_craft({ + output = "homedecor:desk_globe", + recipe = { + { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, + { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "moreblocks:slab_wood", "dye:blue" } + }, +}) + +minetest.register_craft({ + output = "homedecor:tool_cabinet_bottom", + recipe = { + { "homedecor:motor", "default:axe_steel", "default:pick_steel" }, + { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, + { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } + }, +}) + if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) end + diff --git a/mods/homedecor_modpack/homedecor/electronics.lua b/mods/homedecor_modpack/homedecor/electronics.lua index 85cf8fe7..fcf52333 100755 --- a/mods/homedecor_modpack/homedecor/electronics.lua +++ b/mods/homedecor_modpack/homedecor/electronics.lua @@ -4,34 +4,47 @@ local S = homedecor.gettext homedecor.register("speaker", { description = S("Large Stereo Speaker"), - tiles = { 'homedecor_speaker_top.png', - 'homedecor_speaker_bottom.png', - 'homedecor_speaker_right.png', - 'homedecor_speaker_left.png', - 'homedecor_speaker_back.png', - 'homedecor_speaker_front.png'}, + mesh="homedecor_speaker_large.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_front.png" + }, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), + on_punch = function(pos, node, puncher, pointed_thing) + minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) + end }) +homedecor.register("speaker_open", { + description = S("Large Stereo Speaker, open front"), + mesh="homedecor_speaker_large_open.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_driver.png", + "homedecor_speaker_open_front.png", + }, + groups = { snappy = 3 }, + sounds = default.node_sound_leaves_defaults(), + on_punch = function(pos, node, puncher, pointed_thing) + minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) + end +}) + +local spk_cbox = { + type = "fixed", + fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 } +} + homedecor.register("speaker_small", { description = S("Small Surround Speaker"), + mesh="homedecor_speaker_small.obj", tiles = { - 'homedecor_speaker_top.png', - 'homedecor_speaker_bottom.png', - 'homedecor_speaker_right.png', - 'homedecor_speaker_left.png', - 'homedecor_speaker_back.png', - 'homedecor_speaker_front.png' - }, - selection_box = { - type = "fixed", - fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } - }, - node_box = { - type = "fixed", - fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } + "homedecor_speaker_sides.png", + "homedecor_speaker_front.png" }, + selection_box = spk_cbox, + collision_box = spk_cbox, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), }) diff --git a/mods/homedecor_modpack/homedecor/exterior.lua b/mods/homedecor_modpack/homedecor/exterior.lua index bc4d7fa8..f2cb7d75 100755 --- a/mods/homedecor_modpack/homedecor/exterior.lua +++ b/mods/homedecor_modpack/homedecor/exterior.lua @@ -1,57 +1,34 @@ local S = homedecor.gettext dofile(homedecor.modpath.."/furniture.lua") +local bbq_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.3125, 0.5, 0.53125, 0.3125 } +} + homedecor.register("barbecue", { description = "Barbecue", + mesh = "homedecor_barbecue.obj", tiles = { - {name="homedecor_barbecue_top.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=2}}, "forniture_black_metal.png", + { name="homedecor_embers.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=2 + } + }, + "homedecor_barbecue_meat.png", }, groups = { snappy=3 }, light_source = 9, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.25, -0.4375, 0.0625, 0.3125}, -- NodeBox1 - {0.4375, -0.5, 0.25, 0.5, 0.0625, 0.3125}, -- NodeBox2 - {-0.5, -0.5, -0.3125, -0.4375, 0.0625, -0.25}, -- NodeBox3 - {0.4375, -0.5, -0.3125, 0.5, 0.0625, -0.25}, -- NodeBox4 - {-0.5, 0.0625, -0.3125, 0.5, 0.375, 0.3125}, -- NodeBox5 - {-0.375, 0.5, -0.25, -0.313, 0.5, 0.251}, -- NodeBox6 - {-0.25, 0.5, -0.25, -0.188, 0.5, 0.251}, -- NodeBox7 - {-0.125, 0.5, -0.25, -0.063, 0.5, 0.251}, -- NodeBox8 - {0, 0.5, -0.25, 0.062, 0.5, 0.251}, -- NodeBox9 - {0.125, 0.5, -0.25, 0.187, 0.5, 0.251}, -- NodeBox10 - {0.25, 0.5, -0.25, 0.312, 0.5, 0.251}, -- NodeBox11 - {0.375, 0.5, -0.25, 0.437, 0.5, 0.251}, -- NodeBox12 - {-0.5, 0.375, 0.251, 0.5, 0.5, 0.3125}, -- NodeBox13 - {-0.5, 0.0625, -0.3125, 0.5, 0.5, -0.25}, -- NodeBox14 - {-0.5, 0.0625, -0.3125, -0.438, 0.5, 0.3125}, -- NodeBox15 - {0.4375, 0.0625, -0.3125, 0.5, 0.5, 0.3125}, -- NodeBox16 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.3125, 0.5, 0.625, 0.3125 } - }, - expand = { top="homedecor:barbecue_meat" }, + selection_box = bbq_cbox, + collision_box = bbq_cbox, + expand = { top="air" }, }) -homedecor.register("barbecue_meat", { - tiles = { - "homedecor_barbecue_meat.png", - }, - groups = { snappy=3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.125, -0.0625, -0.4375, 0.125}, -- NodeBox1 - {0.125, -0.5, -0.125, 0.3125, -0.4375, 0.125}, -- NodeBox2 - } - }, - selection_box = homedecor.nodebox.null -}) +minetest.register_alias("homedecor:barbecue_meat", "air") homedecor.register("bench_large_1_left", { description = "Garden Bench (style 1)", @@ -254,77 +231,23 @@ homedecor.register("deckchair_foot", { expand = { forward="homedecor:deckchair_head" }, }) -homedecor.register("doghouse_base", { +homedecor.register("doghouse", { + mesh = "homedecor_doghouse.obj", tiles = { - "homedecor_doghouse_base_top.png", - "homedecor_doghouse_base_bottom.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_front.png" + "homedecor_shingles_terracotta.png", + "default_wood.png", + "building_blocks_towel.png" }, description = "Doghouse", inventory_image = "homedecor_doghouse_inv.png", - node_box = { - type = "fixed", - fixed = { - {0.3125, -0.5, -0.4375, 0.4375, -0.3125, -0.3125}, -- NodeBox1 - {0.3125, -0.5, 0.3125, 0.4375, -0.3125, 0.4375}, -- NodeBox2 - {-0.4375, -0.5, 0.3125, -0.3125, -0.3125, 0.4375}, -- NodeBox3 - {-0.4375, -0.5, -0.4375, -0.3125, -0.3125, -0.3125}, -- NodeBox4 - {-0.4375, -0.3125, -0.4375, -0.375, 0.5, 0.4375}, -- NodeBox5 - {-0.4375, 0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox6 - {-0.4375, -0.3125, -0.4375, 0.4375, -0.25, 0.4375}, -- NodeBox7 - {-0.375, -0.3125, -0.375, -0.1875, 0.4375, -0.3125}, -- NodeBox8 - {0.1875, -0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox9 - {0.375, -0.25, -0.4375, 0.4375, 0.5, 0.4375}, -- NodeBox10 - {-0.4375, -0.3125, 0.375, 0.4375, 0.5, 0.4375}, -- NodeBox11 - } - }, selection_box = homedecor.nodebox.slab_y(1.5), + collision_box = homedecor.nodebox.slab_y(1.5), groups = {snappy=3}, - expand = { top="homedecor:doghouse_roof" }, + expand = { top="air" }, }) -homedecor.register("doghouse_roof", { - tiles = { - "homedecor_doghouse_roof_top.png", - "homedecor_doghouse_roof_bottom.png", - "homedecor_doghouse_roof_side.png", - "homedecor_doghouse_roof_side.png", - "homedecor_doghouse_roof_front.png", - "homedecor_doghouse_roof_front.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, -0.4375, -0.4375, 0.5}, -- NodeBox17 - {-0.4375, -0.4375, -0.5, -0.375, -0.375, 0.5}, -- NodeBox18 - {-0.375, -0.375, -0.5, -0.3125, -0.3125, 0.5}, -- NodeBox19 - {-0.3125, -0.3125, -0.5, -0.25, -0.25, 0.5}, -- NodeBox20 - {-0.25, -0.25, -0.5, -0.1875, -0.1875, 0.5}, -- NodeBox21 - {-0.1875, -0.1875, -0.5, -0.125, -0.125, 0.5}, -- NodeBox22 - {-0.125, -0.125, -0.5, -0.0625, -0.0625, 0.5}, -- NodeBox23 - {-0.0625, -0.0625, -0.5, 0.0625, 0, 0.5}, -- NodeBox24 - {0.0625, -0.125, -0.5, 0.125, -0.0625, 0.5}, -- NodeBox25 - {0.125, -0.1875, -0.5, 0.1875, -0.125, 0.5}, -- NodeBox26 - {0.1875, -0.25, -0.5, 0.25, -0.1875, 0.5}, -- NodeBox27 - {0.25, -0.3125, -0.5, 0.3125, -0.25, 0.5}, -- NodeBox28 - {0.3125, -0.375, -0.5, 0.375, -0.3125, 0.5}, -- NodeBox29 - {0.375, -0.4375, -0.5, 0.4375, -0.375, 0.5}, -- NodeBox30 - {0.4375, -0.5, -0.5, 0.5, -0.4375, 0.5}, -- NodeBox31 - {-0.4375, -0.5, -0.375, 0.4375, -0.4375, 0.4375}, -- NodeBox32 - {-0.375, -0.4375, -0.375, 0.375, -0.375, 0.4375}, -- NodeBox33 - {-0.3125, -0.375, -0.375, 0.3125, -0.3125, 0.4375}, -- NodeBox34 - {-0.25, -0.3125, -0.375, 0.25, -0.25, 0.4375}, -- NodeBox35 - {-0.1875, -0.25, -0.375, 0.1875, -0.1875, 0.4375}, -- NodeBox36 - {-0.125, -0.1875, -0.375, 0.125, -0.125, 0.4375}, -- NodeBox37 - {0.0625, -0.125, -0.375, -0.0625, -0.0625, 0.4375}, -- NodeBox38 - } - }, - selection_box = homedecor.nodebox.null, - groups = {snappy=3, not_in_creative_inventory=1}, -}) +minetest.register_alias("homedecor:doghouse_roof", "air") +minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse") homedecor.register("simple_bench", { tiles = { @@ -464,97 +387,24 @@ homedecor.register("swing_rope", { selection_box = homedecor.nodebox.null }) -homedecor.register("well_base", { +homedecor.register("well", { + mesh = "homedecor_well.obj", tiles = { - "homedecor_well_base_top.png", - "default_cobble.png" + "homedecor_rope_texture.png", + "forniture_metal.png", + "default_water.png", + "default_cobble.png", + "default_wood.png", + "homedecor_shingles_wood.png" }, inventory_image = "homedecor_well_inv.png", description = "Water well", groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, -0.4375, 0.3125, 0.5, -0.3125}, -- NodeBox1 - {0.3125, -0.5, -0.3125, 0.4375, 0.5, 0.3125}, -- NodeBox2 - {-0.4375, -0.5, -0.3125, -0.3125, 0.5, 0.3125}, -- NodeBox3 - {-0.3125, -0.5, 0.3125, 0.3125, 0.5, 0.4375}, -- NodeBox4 - {0.25, -0.5, -0.375, 0.375, 0.5, -0.25}, -- NodeBox5 - {0.25, -0.5, 0.25, 0.375, 0.5, 0.375}, -- NodeBox6 - {-0.375, -0.5, -0.375, -0.25, 0.5, -0.25}, -- NodeBox7 - {-0.375, -0.5, 0.25, -0.25, 0.5, 0.375}, -- NodeBox8 - {-0.3125, -0.5, -0.5, 0.3125, -0.3125, -0.4375}, -- NodeBox9 - {0.4375, -0.5, -0.3125, 0.5, -0.3125, 0.3125}, -- NodeBox10 - {-0.3125, -0.5, 0.4375, 0.3125, -0.3125, 0.5}, -- NodeBox11 - {-0.5, -0.5, -0.3125, -0.4375, -0.3125, 0.3125}, -- NodeBox12 - {0.3125, -0.5, -0.4375, 0.4375, -0.3125, -0.3125}, -- NodeBox13 - {0.3125, -0.5, 0.3125, 0.4375, -0.3125, 0.4375}, -- NodeBox14 - {-0.4375, -0.5, 0.3125, -0.3125, -0.3125, 0.4375}, -- NodeBox15 - {-0.4375, -0.5, -0.4375, -0.3125, -0.3125, -0.3125}, -- NodeBox16 - {-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}, -- NodeBox17 - } - }, selection_box = homedecor.nodebox.slab_y(2), - expand = { top="homedecor:well_top" }, + collision_box = homedecor.nodebox.slab_y(2), + expand = { top="air" }, }) -homedecor.register("well_top", { - tiles = { - "homedecor_well_roof_top.png", - "homedecor_well_roof_wood.png", - "homedecor_well_roof_side3.png", - "homedecor_well_roof_side3.png", - "homedecor_well_roof_side2.png", - "homedecor_well_roof_side1.png" - }, - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.0625, -0.5, 0.375, 0.0625, 0.4375, 0.4375}, -- NodeBox1 - {-0.0625, -0.5, -0.4375, 0.0625, 0.4375, -0.375}, -- NodeBox2 - {-0.125, 0.375, -0.5, 0.125, 0.4375, 0.5}, -- NodeBox3 - {0.125, 0.3125, -0.5, 0.1875, 0.375, 0.5}, -- NodeBox4 - {-0.1875, 0.3125, -0.5, -0.125, 0.375, 0.5}, -- NodeBox5 - {0.1875, 0.25, -0.5, 0.25, 0.3125, 0.5}, -- NodeBox6 - {-0.25, 0.25, -0.5, -0.1875, 0.3125, 0.5}, -- NodeBox7 - {0.25, 0.1875, -0.5, 0.3125, 0.25, 0.5}, -- NodeBox8 - {-0.3125, 0.1875, -0.5, -0.25, 0.25, 0.5}, -- NodeBox9 - {0.3125, 0.125, -0.5, 0.375, 0.1875, 0.5}, -- NodeBox10 - {-0.375, 0.125, -0.5, -0.3125, 0.1875, 0.5}, -- NodeBox11 - {0.375, 0.0625, -0.5, 0.4375, 0.125, 0.5}, -- NodeBox12 - {-0.375, 0.0625, -0.5, -0.4375, 0.125, 0.5}, -- NodeBox13 - {0.4375, 0, -0.5, 0.5, 0.0625, 0.5}, -- NodeBox14 - {-0.5, 0, -0.5, -0.4375, 0.0625, 0.5}, -- NodeBox15 - {-0.0625, 0.4375, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox16 - {-0.125, 0.125, -0.4375, 0.125, 0.1875, -0.375}, -- NodeBox17 - {0.125, 0.1875, -0.4375, 0.1875, 0.25, -0.375}, -- NodeBox18 - {-0.1875, 0.1875, -0.4375, -0.125, 0.25, -0.375}, -- NodeBox19 - {-0.125, 0.125, 0.375, 0.125, 0.1875, 0.4375}, -- NodeBox20 - {0.125, 0.1875, 0.375, 0.1875, 0.25, 0.4375}, -- NodeBox21 - {-0.1875, 0.1875, 0.375, -0.125, 0.25, 0.4375}, -- NodeBox22 - {-0.0165975, -0.159751, -0.375, 0.0165974, -0.125, 0.375}, -- NodeBox23 - {-0.00414942, -0.465, -0.008299, 0.008299, -0.159751, 0.004149}, -- NodeBox24 - {-0.0625, -0.0625, -0.5, 0.0625, 0, -0.4646}, -- NodeBox25 - {0.0625, -0.125, -0.5, 0.125, -0.0625, -0.4646}, -- NodeBox26 - {0.125, -0.25, -0.5, 0.1875, -0.125, -0.4646}, -- NodeBox27 - {0.0625, -0.3125, -0.5, 0.125, -0.25, -0.4646}, -- NodeBox28 - {-0.0625, -0.375, -0.5, 0.0625, -0.3125, -0.4646}, -- NodeBox29 - {-0.0625, -0.3125, -0.5, -0.125, -0.25, -0.4646}, -- NodeBox30 - {-0.1875, -0.25, -0.5, -0.125, -0.125, -0.4646}, -- NodeBox31 - {-0.125, -0.125, -0.5, -0.0625, -0.0625, -0.4646}, -- NodeBox32 - {-0.016598, -0.3125, -0.48, 0.020747, -0.0625, -0.49}, -- NodeBox33 - {-0.125, -0.209544, -0.48, 0.125, -0.172199, -0.49}, -- NodeBox34 - {-0.0165975, -0.200, -0.477178, 0.020747, -0.175349, -0.435685}, -- NodeBox35 - {0.1, -0.75, -0.125, 0.125, -0.5, 0.125}, -- NodeBox36 - {-0.125, -0.75, -0.125, -0.1, -0.5, 0.125}, -- NodeBox37 - {-0.125, -0.75, -0.125, 0.125, -0.729253, 0.125}, -- NodeBox38 - {-0.125, -0.75, -0.125, 0.125, -0.5, -0.1}, -- NodeBox39 - {-0.125, -0.75, 0.1, 0.125, -0.5, 0.125}, -- NodeBox40 - {-0.0165975,-0.465, -0.125, 0.0165974, -0.451245, 0.125}, -- NodeBox41 - {-0.0165975, -0.51, 0.112033, 0.0165974, -0.46, 0.125}, -- NodeBox42 - {-0.0165975, -0.51, -0.125, 0.0165974, -0.46, -0.112033}, -- NodeBox43 - } - }, - selection_box = homedecor.nodebox.null, -}) +minetest.register_alias("homedecor:well_top", "air") +minetest.register_alias("homedecor:well_base", "homedecor:well") + diff --git a/mods/homedecor_modpack/homedecor/furniture_recipes.lua b/mods/homedecor_modpack/homedecor/furniture_recipes.lua index dcaff59c..52280c6b 100755 --- a/mods/homedecor_modpack/homedecor/furniture_recipes.lua +++ b/mods/homedecor_modpack/homedecor/furniture_recipes.lua @@ -174,7 +174,7 @@ for _, color in ipairs(lamp_colors) do }) minetest.register_craft({ - output = "homedecor:standing_lamp_bottom_"..color.."_off", + output = "homedecor:standing_lamp_"..color.."_off", recipe = { {"homedecor:table_lamp_"..color.."_off"}, {"group:stick"}, @@ -184,9 +184,9 @@ for _, color in ipairs(lamp_colors) do minetest.register_craft({ type = "shapeless", - output = "homedecor:standing_lamp_bottom_"..color.."_off", + output = "homedecor:standing_lamp_"..color.."_off", recipe = { - "homedecor:standing_lamp_bottom_off", + "homedecor:standing_lamp_off", "dye:"..color }, }) diff --git a/mods/homedecor_modpack/homedecor/handlers/locked.lua b/mods/homedecor_modpack/homedecor/handlers/locked.lua index 738d3be4..dc1ccc61 100755 --- a/mods/homedecor_modpack/homedecor/handlers/locked.lua +++ b/mods/homedecor_modpack/homedecor/handlers/locked.lua @@ -115,9 +115,9 @@ local function create_locked ( name, infotext ) end local items = { - { "refrigerator_white_bottom", + { "refrigerator_white", "Refrigerator" }, - { "refrigerator_steel_bottom", + { "refrigerator_steel", "Refrigerator (stainless steel)" }, { "kitchen_cabinet", "Cabinet" }, diff --git a/mods/homedecor_modpack/homedecor/kitchen_appliances.lua b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua index 46acbb3c..5acded0d 100755 --- a/mods/homedecor_modpack/homedecor/kitchen_appliances.lua +++ b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua @@ -2,57 +2,17 @@ local S = homedecor.gettext --- nodebox models - -local fridge_model_bottom = { - type = "fixed", - fixed = { - {0, -0.4375, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.5, -0.5, -0.42, 0.5, 0.5, 0.5}, -- NodeBox2 - {-0.5, -0.4375, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox3 - {0, 0.25, -0.5, 0.0625, 0.3125, -0.4375}, -- NodeBox4 - {-0.125, 0.25, -0.5, -0.0625, 0.3125, -0.4375}, -- NodeBox5 - {0, 0.25, -0.5, 0.0625, 0.5, -0.473029}, -- NodeBox6 - {-0.125, 0.25, -0.5, -0.0625, 0.5, -0.473029}, -- NodeBox7 - } -} - -local fridge_model_top = { - type = "fixed", - fixed = { - {0, -0.5, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.0625, -0.5, -0.42, 0, 0.5, 0.5}, -- NodeBox2 - {-0.5, -0.5, -0.4375, -0.0625, -0.4375, 0.5}, -- NodeBox3 - {-0.5, -0.5, -0.4375, -0.4375, 0.5, 0.5}, -- NodeBox4 - {-0.5, -0.1875, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox5 - {-0.4375, -0.4375, -0.125, -0.0625, -0.1875, 0.5}, -- NodeBox6 - {-0.125, -0.4375, -0.4375, -0.0625, -0.1875, -0.125}, -- NodeBox7 - {-0.3125, -0.3125, -0.307054, -0.25, -0.1875, -0.286307}, -- NodeBox8 - {-0.125, 0, -0.5, -0.0625, 0.0625, -0.4375}, -- NodeBox9 - {0, 0, -0.5, 0.0625, 0.0625, -0.4375}, -- NodeBox10 - {0, -0.5, -0.5, 0.0625, 0.0625, -0.473029}, -- NodeBox11 - {-0.125, -0.5, -0.5, -0.0625, 0.0625, -0.473029}, -- NodeBox12 - } -} - -- steel-textured fridge -homedecor.register("refrigerator_steel_bottom", { - tiles = { - "default_steel_block.png", - "homedecor_refrigerator_steel_bottom.png", - "homedecor_refrigerator_steel_sides1.png", - "homedecor_refrigerator_steel_sides1.png^[transformFX", - "homedecor_refrigerator_steel_back1.png", - "homedecor_refrigerator_steel_front2.png" - }, + +homedecor.register("refrigerator_steel", { + mesh = "homedecor_refrigerator.obj", + tiles = { "homedecor_refrigerator_steel.png" }, inventory_image = "homedecor_refrigerator_steel_inv.png", description = S("Refrigerator (stainless steel)"), groups = {snappy=3}, - node_box = fridge_model_bottom, selection_box = homedecor.nodebox.slab_y(2), - expand = { - top="homedecor:refrigerator_steel_top" - }, + collision_box = homedecor.nodebox.slab_y(2), + expand = { top="air" }, infotext=S("Refrigerator"), inventory = { size=50, @@ -60,39 +20,17 @@ homedecor.register("refrigerator_steel_bottom", { }, }) -homedecor.register("refrigerator_steel_top", { - tiles = { - "homedecor_refrigerator_steel_top.png", - "default_steel_block.png", - "homedecor_refrigerator_steel_sides1.png", - "homedecor_refrigerator_steel_sides1.png^[transformFX", - "homedecor_refrigerator_steel_back1.png", - "homedecor_refrigerator_steel_front1.png" - }, - groups = {snappy=3}, - node_box = fridge_model_top, - selection_box = homedecor.nodebox.null, -}) - -- white, enameled fridge -homedecor.register("refrigerator_white_bottom", { - tiles = { - "default_steel_block.png", - "homedecor_refrigerator_white_bottom.png", - "homedecor_refrigerator_white_sides1.png", - "homedecor_refrigerator_white_sides1.png^[transformFX", - "homedecor_refrigerator_white_back1.png", - "homedecor_refrigerator_white_front2.png" - }, +homedecor.register("refrigerator_white", { + mesh = "homedecor_refrigerator.obj", + tiles = { "homedecor_refrigerator_white.png" }, inventory_image = "homedecor_refrigerator_white_inv.png", description = S("Refrigerator"), groups = {snappy=3}, - node_box = fridge_model_bottom, selection_box = homedecor.nodebox.slab_y(2), - expand = { - top="homedecor:refrigerator_white_top" - }, + collision_box = homedecor.nodebox.slab_y(2), + expand = { top="air" }, infotext=S("Refrigerator"), inventory = { size=50, @@ -100,71 +38,20 @@ homedecor.register("refrigerator_white_bottom", { }, }) -homedecor.register("refrigerator_white_top", { - tiles = { - "homedecor_refrigerator_white_top.png", - "default_steel_block.png", - "homedecor_refrigerator_white_sides1.png", - "homedecor_refrigerator_white_sides1.png^[transformFX", - "homedecor_refrigerator_white_back1.png", - "homedecor_refrigerator_white_front1.png" - }, - groups = {snappy=3}, - node_box = fridge_model_top, - selection_box = homedecor.nodebox.null, -}) +minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") +minetest.register_alias("homedecor:refrigerator_white_top", "air") --- convert the old single-node fridges to the new two-node models +minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel") +minetest.register_alias("homedecor:refrigerator_steel_top", "air") -minetest.register_abm({ - nodenames = { "homedecor:refrigerator" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) - end -}) +minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked") +minetest.register_alias("homedecor:refrigerator_white_top_locked", "air") -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_locked" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom_locked", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) - end -}) - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_steel" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) - end -}) - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_steel_locked" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom_locked", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) - end -}) +minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked") +minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air") -- kitchen "furnaces" + homedecor.register_furnace("homedecor:oven", { description = S("Oven"), tile_format = "homedecor_oven_%s%s.png", diff --git a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua index df3c1781..3bbcf139 100755 --- a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua +++ b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua @@ -93,27 +93,19 @@ homedecor.register("copper_pans", { on_place = minetest.rotate_node }) +local kf_cbox = { + type = "fixed", + fixed = { -2/16, -8/16, 1/16, 2/16, -1/16, 8/16 } +} + homedecor.register("kitchen_faucet", { + mesh = "homedecor_kitchen_faucet.obj", tiles = { "homedecor_bright_metal.png" }, inventory_image = "homedecor_kitchen_faucet_inv.png", description = "Kitchen Faucet", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {0, -0.5, 0.375, 0.0625, -0.1875, 0.4375}, -- NodeBox1 - {0, -0.1875, 0.35, 0.0625, -0.15, 0.4375}, -- NodeBox2 - {0, -0.15, 0.32, 0.0625, -0.11, 0.41}, -- NodeBox3 - {0.007, -0.12, 0.17, 0.055, -0.11, 0.1285}, -- NodeBox4 - {0, -0.11, 0.125, 0.0625, -0.07, 0.37}, -- NodeBox5 - {-0.05, -0.48, 0.385, 0.115, -0.455, 0.43}, -- NodeBox6 - {-0.05, -0.49, 0.395, 0.115, -0.445, 0.42}, -- NodeBox7 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.055, -0.5, 0.125, 0.12, -0.065, 0.4375 } - }, + groups = {snappy=3}, + selection_box = kf_cbox, + collision_box = kf_cbox, }) homedecor.register("paper_towel", { diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 230c2d66..7e380d90 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -164,7 +164,7 @@ homedecor.register("fishtank", { sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) fdir = minetest.get_node(pos).param2 - minetest.add_node(pos, {name = "homedecor:fishtank_lighted", param2 = fdir}) + minetest.set_node(pos, {name = "homedecor:fishtank_lighted", param2 = fdir}) end }) @@ -178,7 +178,7 @@ homedecor.register("fishtank_lighted", { "homedecor_fishtank_back_lighted.png", "homedecor_fishtank_front_lighted.png" }, - light_source = default.LIGHT_MAX-4, + light_source = LIGHT_MAX-4, node_box = { type = "fixed", fixed = { @@ -200,7 +200,7 @@ homedecor.register("fishtank_lighted", { sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) fdir = minetest.get_node(pos).param2 - minetest.add_node(pos, {name = "homedecor:fishtank", param2 = fdir}) + minetest.set_node(pos, {name = "homedecor:fishtank", param2 = fdir}) end }) @@ -294,165 +294,29 @@ homedecor.register("filing_cabinet", { }, }) -homedecor.register("doghouse_base", { - tiles = { - "homedecor_doghouse_base_top.png", - "homedecor_doghouse_base_bottom.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_side.png", - "homedecor_doghouse_base_front.png" - }, - description = "Doghouse", - inventory_image = "homedecor_doghouse_inv.png", - node_box = { - type = "fixed", - fixed = { - {0.3125, -0.5, -0.4375, 0.4375, -0.3125, -0.3125}, -- NodeBox1 - {0.3125, -0.5, 0.3125, 0.4375, -0.3125, 0.4375}, -- NodeBox2 - {-0.4375, -0.5, 0.3125, -0.3125, -0.3125, 0.4375}, -- NodeBox3 - {-0.4375, -0.5, -0.4375, -0.3125, -0.3125, -0.3125}, -- NodeBox4 - {-0.4375, -0.3125, -0.4375, -0.375, 0.5, 0.4375}, -- NodeBox5 - {-0.4375, 0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox6 - {-0.4375, -0.3125, -0.4375, 0.4375, -0.25, 0.4375}, -- NodeBox7 - {-0.375, -0.3125, -0.375, -0.1875, 0.4375, -0.3125}, -- NodeBox8 - {0.1875, -0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox9 - {0.375, -0.25, -0.4375, 0.4375, 0.5, 0.4375}, -- NodeBox10 - {-0.4375, -0.3125, 0.375, 0.4375, 0.5, 0.4375}, -- NodeBox11 - } - }, - selection_box = homedecor.nodebox.slab_y(1.5), - groups = {snappy=3}, - expand = { top="homedecor:doghouse_roof" }, -}) - -homedecor.register("doghouse_roof", { - tiles = { - "homedecor_doghouse_roof_top.png", - "homedecor_doghouse_roof_bottom.png", - "homedecor_doghouse_roof_side.png", - "homedecor_doghouse_roof_side.png", - "homedecor_doghouse_roof_front.png", - "homedecor_doghouse_roof_front.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, -0.4375, -0.4375, 0.5}, -- NodeBox17 - {-0.4375, -0.4375, -0.5, -0.375, -0.375, 0.5}, -- NodeBox18 - {-0.375, -0.375, -0.5, -0.3125, -0.3125, 0.5}, -- NodeBox19 - {-0.3125, -0.3125, -0.5, -0.25, -0.25, 0.5}, -- NodeBox20 - {-0.25, -0.25, -0.5, -0.1875, -0.1875, 0.5}, -- NodeBox21 - {-0.1875, -0.1875, -0.5, -0.125, -0.125, 0.5}, -- NodeBox22 - {-0.125, -0.125, -0.5, -0.0625, -0.0625, 0.5}, -- NodeBox23 - {-0.0625, -0.0625, -0.5, 0.0625, 0, 0.5}, -- NodeBox24 - {0.0625, -0.125, -0.5, 0.125, -0.0625, 0.5}, -- NodeBox25 - {0.125, -0.1875, -0.5, 0.1875, -0.125, 0.5}, -- NodeBox26 - {0.1875, -0.25, -0.5, 0.25, -0.1875, 0.5}, -- NodeBox27 - {0.25, -0.3125, -0.5, 0.3125, -0.25, 0.5}, -- NodeBox28 - {0.3125, -0.375, -0.5, 0.375, -0.3125, 0.5}, -- NodeBox29 - {0.375, -0.4375, -0.5, 0.4375, -0.375, 0.5}, -- NodeBox30 - {0.4375, -0.5, -0.5, 0.5, -0.4375, 0.5}, -- NodeBox31 - {-0.4375, -0.5, -0.375, 0.4375, -0.4375, 0.4375}, -- NodeBox32 - {-0.375, -0.4375, -0.375, 0.375, -0.375, 0.4375}, -- NodeBox33 - {-0.3125, -0.375, -0.375, 0.3125, -0.3125, 0.4375}, -- NodeBox34 - {-0.25, -0.3125, -0.375, 0.25, -0.25, 0.4375}, -- NodeBox35 - {-0.1875, -0.25, -0.375, 0.1875, -0.1875, 0.4375}, -- NodeBox36 - {-0.125, -0.1875, -0.375, 0.125, -0.125, 0.4375}, -- NodeBox37 - {0.0625, -0.125, -0.375, -0.0625, -0.0625, 0.4375}, -- NodeBox38 - } - }, - selection_box = homedecor.nodebox.null, - groups = {snappy=3, not_in_creative_inventory=1}, -}) +local pooltable_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 0.3125, 1.5 } +} homedecor.register("pool_table", { + mesh = "homedecor_pool_table.obj", tiles = { - "homedecor_pool_table_top1.png", - "homedecor_pool_table_bottom1.png", - "homedecor_pool_table_sides1.png", - "homedecor_pool_table_sides1.png^[transformFX", - "homedecor_pool_table_end1.png", - "homedecor_pool_table_end1.png" + "homedecor_pool_table_cue.png", + "homedecor_pool_table_baize.png", + "homedecor_pool_table_pockets.png", + "homedecor_pool_table_balls.png", + "homedecor_pool_table_wood.png" }, description = "Pool Table", inventory_image = "homedecor_pool_table_inv.png", groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.375, -0.5, -0.375, -0.25, 0.1875, -0.25}, -- NodeBox1 - {0.25, -0.5, -0.375, 0.375, 0.1875, -0.25}, -- NodeBox2 - {-0.25, -0.125, -0.3125, 0.25, -0.0625, 0}, -- NodeBox3 - {-0.3125, -0.0625, -0.3125, -0.25, 0.1875, 0}, -- NodeBox4 - {0.25, -0.0625, -0.3125, 0.3125, 0.1875, 0}, -- NodeBox5 - {-0.3125, -0.125, 0, 0.3125, 0.1875, 0.0625}, -- NodeBox6 - {0.25, -0.125, -0.25, 0.3125, 0.1875, 0.5}, -- NodeBox7 - {-0.3125, -0.125, -0.25, -0.25, 0.1875, 0.5}, -- NodeBox8 - {-0.5, 0.1875, -0.5, -0.4375, 0.25, 0.5}, -- NodeBox9 - {-0.5, 0.1875, -0.5, 0.5, 0.25, -0.4375}, -- NodeBox10 - {0.4375, 0.1875, -0.5, 0.5, 0.25, 0.5}, -- NodeBox11 - {-0.3125, 0.1875, -0.3125, 0.3125, 0.25, 0.5}, -- NodeBox12 - {-0.4375, 0.1875, -0.3125, 0.4375, 0.25, 0.4375}, -- NodeBox13 - {-0.3125, 0.1875, -0.5, 0.3125, 0.25, -0.3125}, -- NodeBox14 - {-0.25, -0.125, -0.325, 0.25, 0, -0.3125}, -- NodeBox15 - {0.25, 0.125, -0.4375, 0.4375, 0.1875, 0.5}, -- NodeBox16 - {-0.4375, 0.125, -0.4375, -0.25, 0.1875, 0.5}, -- NodeBox17 - {-0.5, 0.25, -0.5, -0.4375, 0.3125, 0.5}, -- NodeBox18 - {-0.5, 0.25, -0.5, 0.5, 0.3125, -0.4375}, -- NodeBox19 - {0.4375, 0.25, -0.5, 0.5, 0.3125, 0.5}, -- NodeBox20 - {-0.4375, 0.25, -0.3125, -0.375, 0.3125, 0.4375}, -- NodeBox23 - {-0.3125, 0.25, -0.4375, 0.3125, 0.3125, -0.375}, -- NodeBox24 - {0.375, 0.25, -0.3125, 0.4375, 0.3125, 0.4375}, -- NodeBox25 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.3125, 1.5 } - }, - expand = { forward="homedecor:pool_table_2" }, + selection_box = pooltable_cbox, + collision_box = pooltable_cbox, + expand = { forward="air" }, }) -homedecor.register("pool_table_2", { - tiles = { - "homedecor_pool_table_top1.png^[transformR180", - "homedecor_pool_table_bottom1.png", - "homedecor_pool_table_sides1.png^[transformFX", - "homedecor_pool_table_sides1.png", - "homedecor_pool_table_end1.png", - "homedecor_pool_table_end1.png" - }, - groups = {snappy=3, not_in_creative_inventory=1}, - node_box = { - type = "fixed", - fixed = { - {-0.375, -0.5, 0.25, -0.25, 0.1875, 0.375}, -- NodeBox1 - {0.25, -0.5, 0.25, 0.375, 0.1875, 0.375}, -- NodeBox2 - {-0.25, -0.125, 0, 0.25, -0.0625, 0.3125}, -- NodeBox3 - {-0.3125, -0.0625, 0, -0.25, 0.1875, 0.3125}, -- NodeBox4 - {0.25, -0.0625, 0, 0.3125, 0.1875, 0.3125}, -- NodeBox5 - {-0.3125, -0.125, -0.0625, 0.3125, 0.1875, 0}, -- NodeBox6 - {0.25, -0.125, -0.5, 0.3125, 0.1875, 0.25}, -- NodeBox7 - {-0.3125, -0.125, -0.5, -0.25, 0.1875, 0.25}, -- NodeBox8 - {-0.5, 0.1875, -0.5, -0.4375, 0.25, 0.5}, -- NodeBox9 - {-0.5, 0.1875, 0.4375, 0.5, 0.25, 0.5}, -- NodeBox10 - {0.4375, 0.1875, -0.5, 0.5, 0.25, 0.5}, -- NodeBox11 - {-0.3125, 0.1875, -0.5, 0.3125, 0.25, 0.3125}, -- NodeBox12 - {-0.4375, 0.1875, -0.4375, 0.4375, 0.25, 0.3125}, -- NodeBox13 - {-0.3125, 0.1875, 0.3125, 0.3125, 0.25, 0.5}, -- NodeBox14 - {-0.25, -0.125, 0.3125, 0.25, 0, 0.325}, -- NodeBox15 - {0.25, 0.125, -0.5, 0.4375, 0.1875, 0.4375}, -- NodeBox16 - {-0.4375, 0.125, -0.5, -0.25, 0.1875, 0.4375}, -- NodeBox17 - {-0.5, 0.25, -0.5, -0.4375, 0.3125, 0.5}, -- NodeBox18 - {-0.5, 0.25, 0.4375, 0.5, 0.3125, 0.5}, -- NodeBox19 - {0.4375, 0.25, -0.5, 0.5, 0.3125, 0.5}, -- NodeBox20 - {-0.4375, 0.25, -0.4375, -0.375, 0.3125, 0.3125}, -- NodeBox23 - {-0.3125, 0.25, 0.375, 0.3125, 0.3125, 0.4375}, -- NodeBox24 - {0.375, 0.25, -0.4375, 0.4375, 0.3125, 0.3125}, -- NodeBox25 - } - }, - selection_box = homedecor.nodebox.null, -}) +minetest.register_alias("homedecor:pool_table_2", "air") local trash_cbox = { type = "fixed", @@ -470,101 +334,6 @@ homedecor.register("trash_can", { collision_box = trash_cbox, }) -homedecor.register("well_base", { - tiles = { - "homedecor_well_base_top.png", - "default_cobble.png" - }, - inventory_image = "homedecor_well_inv.png", - description = "Water well", - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, -0.4375, 0.3125, 0.5, -0.3125}, -- NodeBox1 - {0.3125, -0.5, -0.3125, 0.4375, 0.5, 0.3125}, -- NodeBox2 - {-0.4375, -0.5, -0.3125, -0.3125, 0.5, 0.3125}, -- NodeBox3 - {-0.3125, -0.5, 0.3125, 0.3125, 0.5, 0.4375}, -- NodeBox4 - {0.25, -0.5, -0.375, 0.375, 0.5, -0.25}, -- NodeBox5 - {0.25, -0.5, 0.25, 0.375, 0.5, 0.375}, -- NodeBox6 - {-0.375, -0.5, -0.375, -0.25, 0.5, -0.25}, -- NodeBox7 - {-0.375, -0.5, 0.25, -0.25, 0.5, 0.375}, -- NodeBox8 - {-0.3125, -0.5, -0.5, 0.3125, -0.3125, -0.4375}, -- NodeBox9 - {0.4375, -0.5, -0.3125, 0.5, -0.3125, 0.3125}, -- NodeBox10 - {-0.3125, -0.5, 0.4375, 0.3125, -0.3125, 0.5}, -- NodeBox11 - {-0.5, -0.5, -0.3125, -0.4375, -0.3125, 0.3125}, -- NodeBox12 - {0.3125, -0.5, -0.4375, 0.4375, -0.3125, -0.3125}, -- NodeBox13 - {0.3125, -0.5, 0.3125, 0.4375, -0.3125, 0.4375}, -- NodeBox14 - {-0.4375, -0.5, 0.3125, -0.3125, -0.3125, 0.4375}, -- NodeBox15 - {-0.4375, -0.5, -0.4375, -0.3125, -0.3125, -0.3125}, -- NodeBox16 - {-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}, -- NodeBox17 - } - }, - selection_box = homedecor.nodebox.slab_y(2), - expand = { top="homedecor:well_top" }, -}) - -homedecor.register("well_top", { - tiles = { - "homedecor_well_roof_top.png", - "homedecor_well_roof_wood.png", - "homedecor_well_roof_side3.png", - "homedecor_well_roof_side3.png", - "homedecor_well_roof_side2.png", - "homedecor_well_roof_side1.png" - }, - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.0625, -0.5, 0.375, 0.0625, 0.4375, 0.4375}, -- NodeBox1 - {-0.0625, -0.5, -0.4375, 0.0625, 0.4375, -0.375}, -- NodeBox2 - {-0.125, 0.375, -0.5, 0.125, 0.4375, 0.5}, -- NodeBox3 - {0.125, 0.3125, -0.5, 0.1875, 0.375, 0.5}, -- NodeBox4 - {-0.1875, 0.3125, -0.5, -0.125, 0.375, 0.5}, -- NodeBox5 - {0.1875, 0.25, -0.5, 0.25, 0.3125, 0.5}, -- NodeBox6 - {-0.25, 0.25, -0.5, -0.1875, 0.3125, 0.5}, -- NodeBox7 - {0.25, 0.1875, -0.5, 0.3125, 0.25, 0.5}, -- NodeBox8 - {-0.3125, 0.1875, -0.5, -0.25, 0.25, 0.5}, -- NodeBox9 - {0.3125, 0.125, -0.5, 0.375, 0.1875, 0.5}, -- NodeBox10 - {-0.375, 0.125, -0.5, -0.3125, 0.1875, 0.5}, -- NodeBox11 - {0.375, 0.0625, -0.5, 0.4375, 0.125, 0.5}, -- NodeBox12 - {-0.375, 0.0625, -0.5, -0.4375, 0.125, 0.5}, -- NodeBox13 - {0.4375, 0, -0.5, 0.5, 0.0625, 0.5}, -- NodeBox14 - {-0.5, 0, -0.5, -0.4375, 0.0625, 0.5}, -- NodeBox15 - {-0.0625, 0.4375, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox16 - {-0.125, 0.125, -0.4375, 0.125, 0.1875, -0.375}, -- NodeBox17 - {0.125, 0.1875, -0.4375, 0.1875, 0.25, -0.375}, -- NodeBox18 - {-0.1875, 0.1875, -0.4375, -0.125, 0.25, -0.375}, -- NodeBox19 - {-0.125, 0.125, 0.375, 0.125, 0.1875, 0.4375}, -- NodeBox20 - {0.125, 0.1875, 0.375, 0.1875, 0.25, 0.4375}, -- NodeBox21 - {-0.1875, 0.1875, 0.375, -0.125, 0.25, 0.4375}, -- NodeBox22 - {-0.0165975, -0.159751, -0.375, 0.0165974, -0.125, 0.375}, -- NodeBox23 - {-0.00414942, -0.465, -0.008299, 0.008299, -0.159751, 0.004149}, -- NodeBox24 - {-0.0625, -0.0625, -0.5, 0.0625, 0, -0.4646}, -- NodeBox25 - {0.0625, -0.125, -0.5, 0.125, -0.0625, -0.4646}, -- NodeBox26 - {0.125, -0.25, -0.5, 0.1875, -0.125, -0.4646}, -- NodeBox27 - {0.0625, -0.3125, -0.5, 0.125, -0.25, -0.4646}, -- NodeBox28 - {-0.0625, -0.375, -0.5, 0.0625, -0.3125, -0.4646}, -- NodeBox29 - {-0.0625, -0.3125, -0.5, -0.125, -0.25, -0.4646}, -- NodeBox30 - {-0.1875, -0.25, -0.5, -0.125, -0.125, -0.4646}, -- NodeBox31 - {-0.125, -0.125, -0.5, -0.0625, -0.0625, -0.4646}, -- NodeBox32 - {-0.016598, -0.3125, -0.48, 0.020747, -0.0625, -0.49}, -- NodeBox33 - {-0.125, -0.209544, -0.48, 0.125, -0.172199, -0.49}, -- NodeBox34 - {-0.0165975, -0.200, -0.477178, 0.020747, -0.175349, -0.435685}, -- NodeBox35 - {0.1, -0.75, -0.125, 0.125, -0.5, 0.125}, -- NodeBox36 - {-0.125, -0.75, -0.125, -0.1, -0.5, 0.125}, -- NodeBox37 - {-0.125, -0.75, -0.125, 0.125, -0.729253, 0.125}, -- NodeBox38 - {-0.125, -0.75, -0.125, 0.125, -0.5, -0.1}, -- NodeBox39 - {-0.125, -0.75, 0.1, 0.125, -0.5, 0.125}, -- NodeBox40 - {-0.0165975,-0.465, -0.125, 0.0165974, -0.451245, 0.125}, -- NodeBox41 - {-0.0165975, -0.51, 0.112033, 0.0165974, -0.46, 0.125}, -- NodeBox42 - {-0.0165975, -0.51, -0.125, 0.0165974, -0.46, -0.112033}, -- NodeBox43 - } - }, - selection_box = homedecor.nodebox.null, -}) - homedecor.register("coatrack_wallmount", { tiles = { "forniture_wood.png" }, inventory_image = "homedecor_coatrack_wallmount_inv.png", @@ -698,77 +467,28 @@ homedecor.register("dartboard", { sounds = default.node_sound_defaults(), }) -homedecor.register("piano_left", { +local piano_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.125, 1.5, 0.5, 0.5 } +} + +homedecor.register("piano", { + mesh = "homedecor_piano.obj", tiles = { - "homedecor_piano_top_left.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_front_left.png", + "homedecor_piano_keys.png", + "homedecor_tile_brass2.png", + "homedecor_piano_wood.png" }, inventory_image = "homedecor_piano_inv.png", description = "Piano", - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.1875, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.0625, -0.125, -0.4375, 0.25, 0.1875}, -- NodeBox2 - {-0.5, -0.5, -0.125, -0.4375, -0.375, 0.1875}, -- NodeBox3 - {-0.5, -0.375, -0.0625, -0.4375, 0.0625, 0}, -- NodeBox4 - {-0.5, 0.0625, -0.0625, 0.5, 0.1875, 0.1875}, -- NodeBox5 - {-0.4375, 0.1875, 0.15, 0.5, 0.4375, 0.1875}, -- NodeBox6 - {0.3594, -0.5, 0, 0.4062, -0.46875, 0.25}, -- left-most pedal - {0.4844, -0.5, 0, 0.5, -0.46875, 0.25}, -- half of center pedal - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.125, 1.5, 0.5, 0.5 } - }, - expand = { right="homedecor:piano_right" }, + groups = { snappy = 3 }, + selection_box = piano_cbox, + collision_box = piano_cbox, + expand = { right="air" }, }) -homedecor.register("piano_right", { - tiles = { - "homedecor_piano_top_right.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_front_right.png", - }, - groups = { snappy = 3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.1875, 0.5, 0.5, 0.5}, -- NodeBox1 - {0.4375, -0.5, -0.125, 0.5, -0.375, 0.1875}, -- NodeBox2 - {0.4375, 0.0625, -0.125, 0.5, 0.25, 0.1875}, -- NodeBox3 - {0.4375, -0.375, -0.0625, 0.5, 0.0625, 0}, -- NodeBox4 - {-0.5, 0.0625, -0.0625, 0.4375, 0.1875, 0.1875}, -- NodeBox5 - {-0.5, 0.1875, 0.15, 0.4375, 0.4375, 0.1875}, -- NodeBox6 - {-0.5, -0.5, 0, -0.4688, -0.46875, 0.25}, -- half of center pedal - {-0.3905, -0.5, 0, -0.3438, -0.46875, 0.25}, -- right-most pedal - - } - }, - selection_box = homedecor.nodebox.null -}) - --- convert old pool tables into newer model - -minetest.register_abm({ - nodenames = { "homedecor:pool_table2" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local swap_fdir = { 2, 3, 0, 1 } - local fdir = swap_fdir[node.param2+1] - minetest.set_node(pos, {name = "homedecor:pool_table_2", param2 = fdir}) - end -}) +minetest.register_alias("homedecor:piano_left", "homedecor:piano") +minetest.register_alias("homedecor:piano_right", "air") homedecor.register("trophy", { description = "Trophy", @@ -836,112 +556,24 @@ homedecor.register("sportbench", { } }) +local skate_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.15, 0.5, -0.3, 0.15 } +} + homedecor.register("skateboard", { - description = "Skateboard", - tiles = { - "homedecor_skateboard_top.png", - "homedecor_skateboard_bottom.png", - "homedecor_skateboard_sides.png" - }, + drawtype = "mesh", + mesh = "homedecor_skateboard.obj", + tiles = { "homedecor_skateboard.png" }, inventory_image = "homedecor_skateboard_inv.png", - groups = { snappy=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.4375, -0.4375, -0.1875, 0.4375, -0.415, 0.125}, -- NodeBox1 - {-0.375, -0.5, 0.0625, -0.3125, -0.4375, 0.125}, -- NodeBox2 - {-0.375, -0.5, -0.1875, -0.3125, -0.4375, -0.125}, -- NodeBox3 - {0.3125, -0.5, 0.0625, 0.375, -0.4375, 0.125}, -- NodeBox4 - {0.3125, -0.5, -0.1875, 0.375, -0.4375, -0.125}, -- NodeBox5 - {-0.5, -0.4375, -0.16, -0.4375, -0.415, 0.0975}, -- NodeBox6 - {0.4375, -0.4375, -0.16, 0.5, -0.415, 0.0975}, -- NodeBox7 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.2, 0.5, -0.40, 0.125 } - }, + description = "Skateboard", + groups = {snappy=3}, + selection_box = skate_cbox, + collision_box = skate_cbox, + sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) -homedecor.register("stonepath", { - description = "Garden stone path", - tiles = { - "default_stone.png" - }, - inventory_image = "homedecor_stonepath_inv.png", - groups = { snappy=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.4375, -0.5, 0.3125, -0.3125, -0.48, 0.4375}, -- NodeBox1 - {-0.25, -0.5, 0.125, 0, -0.48, 0.375}, -- NodeBox2 - {0.125, -0.5, 0.125, 0.4375, -0.48, 0.4375}, -- NodeBox3 - {-0.4375, -0.5, -0.125, -0.25, -0.48, 0.0625}, -- NodeBox4 - {-0.0625, -0.5, -0.25, 0.25, -0.48, 0.0625}, -- NodeBox5 - {0.3125, -0.5, -0.25, 0.4375, -0.48, -0.125}, -- NodeBox6 - {-0.3125, -0.5, -0.375, -0.125, -0.48, -0.1875}, -- NodeBox7 - {0.125, -0.5, -0.4375, 0.25, -0.48, -0.3125}, -- NodeBox8 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.4375, -0.5, -0.4375, 0.4375, -0.4, 0.4375 } - } -}) - -homedecor.register("barbecue", { - description = "Barbecue", - tiles = { - {name="homedecor_barbecue_top.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=2}}, - "forniture_black_metal.png", - }, - groups = { snappy=3 }, - light_source = 9, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.25, -0.4375, 0.0625, 0.3125}, -- NodeBox1 - {0.4375, -0.5, 0.25, 0.5, 0.0625, 0.3125}, -- NodeBox2 - {-0.5, -0.5, -0.3125, -0.4375, 0.0625, -0.25}, -- NodeBox3 - {0.4375, -0.5, -0.3125, 0.5, 0.0625, -0.25}, -- NodeBox4 - {-0.5, 0.0625, -0.3125, 0.5, 0.375, 0.3125}, -- NodeBox5 - {-0.375, 0.5, -0.25, -0.313, 0.5, 0.251}, -- NodeBox6 - {-0.25, 0.5, -0.25, -0.188, 0.5, 0.251}, -- NodeBox7 - {-0.125, 0.5, -0.25, -0.063, 0.5, 0.251}, -- NodeBox8 - {0, 0.5, -0.25, 0.062, 0.5, 0.251}, -- NodeBox9 - {0.125, 0.5, -0.25, 0.187, 0.5, 0.251}, -- NodeBox10 - {0.25, 0.5, -0.25, 0.312, 0.5, 0.251}, -- NodeBox11 - {0.375, 0.5, -0.25, 0.437, 0.5, 0.251}, -- NodeBox12 - {-0.5, 0.375, 0.251, 0.5, 0.5, 0.3125}, -- NodeBox13 - {-0.5, 0.0625, -0.3125, 0.5, 0.5, -0.25}, -- NodeBox14 - {-0.5, 0.0625, -0.3125, -0.438, 0.5, 0.3125}, -- NodeBox15 - {0.4375, 0.0625, -0.3125, 0.5, 0.5, 0.3125}, -- NodeBox16 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.3125, 0.5, 0.625, 0.3125 } - }, - expand = { top="homedecor:barbecue_meat" }, -}) - -homedecor.register("barbecue_meat", { - tiles = { - "homedecor_barbecue_meat.png", - }, - groups = { snappy=3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.125, -0.0625, -0.4375, 0.125}, -- NodeBox1 - {0.125, -0.5, -0.125, 0.3125, -0.4375, 0.125}, -- NodeBox2 - } - }, - selection_box = homedecor.nodebox.null -}) - homedecor.register("beer_tap", { description = "Beer tap", tiles = { @@ -1031,6 +663,9 @@ homedecor.register("tool_cabinet_bottom", { }, selection_box = homedecor.nodebox.slab_y(2), expand = { top="homedecor:tool_cabinet_top" }, + inventory = { + size=24, + } }) homedecor.register("tool_cabinet_top", { @@ -1066,243 +701,6 @@ homedecor.register("tool_cabinet_top", { selection_box = homedecor.nodebox.null }) -homedecor.register("swing", { - description = "Tree's swing", - tiles = { - "homedecor_swing_top.png", - "homedecor_swing_top.png^[transformR180", - "homedecor_swing_top.png" - }, - inventory_image = "homedecor_swing_inv.png", - groups = { snappy=3, oddly_breakable_by_hand=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.3125, 0.33, -0.125, 0.3125, 0.376, 0.1875}, -- NodeBox1 - {-0.3125, 0.376, 0.025, -0.3, 0.5, 0.0375}, -- NodeBox2 - { 0.3, 0.376, 0.025, 0.3125, 0.5, 0.0375}, -- NodeBox3 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.3125, 0.33, -0.125, 0.3125, 0.5, 0.1875 } - }, - on_place = function(itemstack, placer, pointed_thing) - isceiling, pos = homedecor.find_ceiling(itemstack, placer, pointed_thing) - if isceiling then - local height = 0 - - for i = 0, 4 do -- search up to 5 spaces downward from the ceiling for the first non-buildable-to node... - height = i - local testpos = { x=pos.x, y=pos.y-i-1, z=pos.z } - local testnode = minetest.get_node(testpos) - local testreg = core.registered_nodes[testnode.name] - - if not testreg.buildable_to then - if i < 1 then - minetest.chat_send_player(placer:get_player_name(), "No room under there to hang a swing.") - return - else - break - end - end - end - - for j = 0, height do -- then fill that space with ropes... - local testpos = { x=pos.x, y=pos.y-j, z=pos.z } - local testnode = minetest.get_node(testpos) - local testreg = core.registered_nodes[testnode.name] - minetest.set_node(testpos, { name = "homedecor:swing_rope", param2 = fdir }) - end - - minetest.set_node({ x=pos.x, y=pos.y-height, z=pos.z }, { name = "homedecor:swing", param2 = fdir }) - - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - - else - minetest.chat_send_player(placer:get_player_name(), "You have to point at the bottom side of an overhanging object to place a swing.") - end - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - for i = 0, 4 do - local testpos = { x=pos.x, y=pos.y+i+1, z=pos.z } - if minetest.get_node(testpos).name == "homedecor:swing_rope" then - minetest.remove_node(testpos) - else - return - end - end - end -}) - -homedecor.register("swing_rope", { - tiles = { - "homedecor_swingrope_sides.png" - }, - groups = { not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, 0.025, -0.3, 0.5, 0.0375}, -- NodeBox1 - {0.3, -0.5, 0.025, 0.3125, 0.5, 0.0375}, -- NodeBox2 - } - }, - selection_box = homedecor.nodebox.null -}) - -local bookcolors = { - "red", - "green", - "blue", - "violet", - "grey", - "brown" -} - -local BOOK_FORMNAME = "homedecor:book_form" - -for c in ipairs(bookcolors) do - local color = bookcolors[c] - local color_d = S(bookcolors[c]) - - local function book_dig(pos, node, digger) - if minetest.is_protected(pos, digger:get_player_name()) then return end - local meta = minetest.get_meta(pos) - local stack = ItemStack({ - name = "homedecor:book_"..color, - metadata = meta:get_string("text"), - }) - stack = digger:get_inventory():add_item("main", stack) - if not stack:is_empty() then - minetest.item_drop(stack, digger, pos) - end - minetest.remove_node(pos) - end - -homedecor.register("book_"..color, { - description = S("Book (%s)"):format(color_d), - mesh = "homedecor_book.obj", - tiles = { "homedecor_book_"..color..".png" }, - inventory_image = "homedecor_book_"..color.."_inv.png", - wield_image = "homedecor_book_"..color.."_inv.png", - groups = { snappy=3, oddly_breakable_by_hand=3, book=1 }, - stack_max = 1, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) - end, - on_place = function(itemstack, placer, pointed_thing) - local plname = placer:get_player_name() - local pos = pointed_thing.under - local node = minetest.get_node(pos) - local n = minetest.registered_nodes[node.name] - if not n.buildable_to then - pos = pointed_thing.above - node = minetest.get_node(pos) - n = minetest.registered_nodes[node.name] - if not n.buildable_to then return end - end - if minetest.is_protected(pos, plname) then return end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - minetest.set_node(pos, { - name = "homedecor:book_"..color, - param2 = fdir, - }) - local text = itemstack:get_metadata() or "" - local meta = minetest.get_meta(pos) - meta:set_string("text", text) - local data = minetest.deserialize(text) or {} - if data.title and data.title ~= "" then - meta:set_string("infotext", data.title) - end - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end, - on_dig = book_dig, - on_use = function(itemstack, user, pointed_thing) - local player_name = user:get_player_name() - local data = minetest.deserialize(itemstack:get_metadata()) - local title, text, owner = "", "", player_name - if data then - title, text, owner = data.title, data.text, data.owner - end - local formspec - if owner == player_name then - formspec = "size[8,8]"..default.gui_bg..default.gui_bg_img.. - "field[0.5,1;7.5,0;title;Book title :;".. - minetest.formspec_escape(title).."]".. - "textarea[0.5,1.5;7.5,7;text;Book content :;".. - minetest.formspec_escape(text).."]".. - "button_exit[2.5,7.5;3,1;save;Save]" - else - formspec = "size[8,8]"..default.gui_bg.. - "button_exit[7,0.25;1,0.5;close;X]".. - default.gui_bg_img.. - "label[0.5,0.5;by "..owner.."]".. - "label[0.5,0;"..minetest.formspec_escape(title).."]".. - "textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]" - end - minetest.show_formspec(user:get_player_name(), BOOK_FORMNAME, formspec) - end, - selection_box = { - type = "fixed", - fixed = {-0.2, -0.5, -0.25, 0.2, -0.35, 0.25} - }, - collision_box = { - type = "fixed", - fixed = {-0.15, -0.5, -0.25, 0.15, -0.35, 0.25} - }, -}) - -homedecor.register("book_open_"..color, { - mesh = "homedecor_book_open.obj", - tiles = { "homedecor_book_open_"..color..".png" }, - groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 }, - drop = "homedecor:book_"..color, - on_dig = book_dig, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) - minetest.sound_play("homedecor_book_close", { - pos=pos, - max_hear_distance = 3, - gain = 2, - }) - end, - selection_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} - }, - collision_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} - }, -}) - -end - -minetest.register_on_player_receive_fields(function(player, form_name, fields) - if form_name ~= BOOK_FORMNAME or not fields.save then - return - end - local stack = player:get_wielded_item() - if minetest.get_item_group(stack:get_name(), "book") == 0 then - return - end - local data = minetest.deserialize(stack:get_metadata()) or {} - data.title, data.text, data.owner = - fields.title, fields.text, player:get_player_name() - stack:set_metadata(minetest.serialize(data)) - player:set_wielded_item(stack) - minetest.log("action", player:get_player_name().." has written in a book (title: \""..fields.title.."\"): \""..fields.text.. - "\" at location: "..minetest.pos_to_string(player:getpos())) -end) - homedecor.register("calendar", { description = "Calendar", drawtype = "signlike", diff --git a/mods/homedecor_modpack/homedecor/tables.lua b/mods/homedecor_modpack/homedecor/tables.lua index f15275f9..863fcc74 100755 --- a/mods/homedecor_modpack/homedecor/tables.lua +++ b/mods/homedecor_modpack/homedecor/tables.lua @@ -192,57 +192,28 @@ homedecor.register("utility_table_legs", { }, }) +local desk_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 0.5 } +} + homedecor.register("desk", { description = "Desk", + mesh = "homedecor_desk.obj", tiles = { - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png", - "homedecor_desk_front_l.png" + "homedecor_desk_drawers.png", + "forniture_black_metal.png", + "forniture_wood.png" }, inventory_image = "homedecor_desk_inv.png", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.4375, 0.375, 0.5, 0.5}, - {-0.5, 0.4375, -0.4375, 0.5, 0.5, 0.5}, - {-0.4375, -0.4375, -0.5, 0.3125, -0.0625, -0.4375}, - {-0.4375, 0, -0.5, 0.3125, 0.375, 0.5}, - {0.3125, -0.375, 0.4375, 0.5, 0.25, 0.5}, - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 0.5 } - }, + selection_box = desk_cbox, + collision_box = desk_cbox, groups = { snappy = 3 }, - expand = { - right="homedecor:desk_r" + expand = { right="air" }, + inventory = { + size=24, }, }) -homedecor.register("desk_r", { - tiles = { - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png", - "homedecor_desk_back_r.png", - "homedecor_desk_front_r.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, 0.4375, -0.4375, 0.5, 0.5, 0.5}, - {0.375, -0.5, -0.4375, 0.5, 0.5, 0.5}, - {-0.5, 0.3125, -0.4375, 0.5, 0.375, 0.5}, - {-0.5, 0.3125, -0.4375, -0.4375, 0.5, 0.5}, - {-0.5, -0.375, 0.4375, 0.4375, 0.25, 0.5}, - } - }, - selection_box = homedecor.nodebox.null, - groups = { snappy = 3, not_in_creative_inventory=1 } -}) +minetest.register_alias("homedecor:desk_r", "air") diff --git a/mods/homedecor_modpack/homedecor/textures/3dforniture_inv_shower_head.png b/mods/homedecor_modpack/homedecor/textures/3dforniture_inv_shower_head.png deleted file mode 100755 index 3effdf28..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/3dforniture_inv_shower_head.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png deleted file mode 100755 index 58f647a3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png new file mode 100644 index 00000000..f5cd422c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_mirror.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_mirror.png new file mode 100644 index 00000000..c5cb6b60 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_mirror.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png new file mode 100644 index 00000000..45e2c747 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png new file mode 100644 index 00000000..48da6e00 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png new file mode 100644 index 00000000..2c0667db Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_back_r.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_back_r.png deleted file mode 100755 index 2c7763b4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_back_r.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_drawers.png new file mode 100644 index 00000000..f25fff2e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_drawers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_l.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_l.png deleted file mode 100755 index 0a2d3891..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_l.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_r.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_r.png deleted file mode 100755 index 7b9076c6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_front_r.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png old mode 100755 new mode 100644 index 477f58ed..1eea06b9 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_bottom.png deleted file mode 100755 index d6de8fe8..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_front.png deleted file mode 100755 index 0efe9478..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png deleted file mode 100755 index 9d36035e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_top.png deleted file mode 100755 index dcf75c94..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png old mode 100755 new mode 100644 index 89301817..a3511f3f Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_bottom.png deleted file mode 100755 index 4091ec04..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_front.png deleted file mode 100755 index fa1bf1ed..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_side.png deleted file mode 100755 index 078c8b94..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_side.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_top.png deleted file mode 100755 index a230904d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_roof_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_embers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_embers.png new file mode 100644 index 00000000..2e7dda5a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_embers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png old mode 100755 new mode 100644 index 43bbc6d6..f1cbe587 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png deleted file mode 100755 index 9b0fb7ff..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png deleted file mode 100755 index 8e8b30ab..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png old mode 100755 new mode 100644 index 8146d02a..4f1d1d80 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png new file mode 100644 index 00000000..a492cd0b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png deleted file mode 100755 index a81915eb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_left.png deleted file mode 100755 index a00bc584..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_right.png deleted file mode 100755 index 440a459e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_top_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_wood.png new file mode 100644 index 00000000..89492de7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png new file mode 100644 index 00000000..8214a119 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png new file mode 100644 index 00000000..4ed31dd7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png deleted file mode 100755 index 47eaf244..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png new file mode 100644 index 00000000..3fe8b200 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png deleted file mode 100755 index 2d7eecdb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png old mode 100755 new mode 100644 index 3797aae5..858ae631 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png new file mode 100644 index 00000000..2bff66ab Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png deleted file mode 100755 index 566855b5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png deleted file mode 100755 index bd750180..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_wood.png new file mode 100644 index 00000000..40306608 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png new file mode 100644 index 00000000..5aeb13b4 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png deleted file mode 100755 index 7eba8517..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png deleted file mode 100755 index 1674160a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png deleted file mode 100755 index 7e4caa1c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png deleted file mode 100755 index 53a44fe2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png old mode 100755 new mode 100644 index ce39d459..ef02873a Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_sides1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_sides1.png deleted file mode 100755 index 53063002..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_sides1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png deleted file mode 100755 index aae21dd4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png new file mode 100644 index 00000000..14c38c2a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png deleted file mode 100755 index eeca4906..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png deleted file mode 100755 index cff5115f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png deleted file mode 100755 index 8592ebd6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png deleted file mode 100755 index 8ff22669..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png old mode 100755 new mode 100644 index 5810c16e..0271e39d Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png deleted file mode 100755 index 6337b0e4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png deleted file mode 100755 index 954afb23..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png new file mode 100644 index 00000000..a7ccf64c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png new file mode 100644 index 00000000..b69658dc Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png new file mode 100644 index 00000000..f094005e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard.png new file mode 100644 index 00000000..10a5ffd6 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png deleted file mode 100755 index 5ac11a5b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png old mode 100755 new mode 100644 index 3ecf6cdd..a064d984 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png deleted file mode 100755 index 5a7045e6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_top.png deleted file mode 100755 index a3920caa..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_back.png deleted file mode 100755 index 9f664870..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_bottom.png deleted file mode 100755 index ed65f660..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png old mode 100755 new mode 100644 index 729c1d68..9c57d02e Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver_inv.png new file mode 100644 index 00000000..729c1d68 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png old mode 100755 new mode 100644 index 689e7c08..a2e53e0b Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_left.png deleted file mode 100755 index 04a028fb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_open_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_open_front.png new file mode 100644 index 00000000..c02286aa Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_open_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_right.png deleted file mode 100755 index 2066676e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png new file mode 100644 index 00000000..4b959288 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_top.png deleted file mode 100755 index ecd6f1ea..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_base_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_base_top.png deleted file mode 100755 index b0aac400..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_base_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png old mode 100755 new mode 100644 index 1326a917..c8da5d7d Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side1.png deleted file mode 100755 index 4d1e2892..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side2.png deleted file mode 100755 index 1ca3df76..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side3.png deleted file mode 100755 index 92e3bf66..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_side3.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_top.png deleted file mode 100755 index c6c0fcf5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_wood.png deleted file mode 100755 index c6c0fcf5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_roof_wood.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png new file mode 100644 index 00000000..fb63e263 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png old mode 100755 new mode 100644 index 573b705d..581efada Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png differ diff --git a/mods/homedecor_modpack/homedecor/window_treatments.lua b/mods/homedecor_modpack/homedecor/window_treatments.lua index 55187444..ea55625b 100755 --- a/mods/homedecor_modpack/homedecor/window_treatments.lua +++ b/mods/homedecor_modpack/homedecor/window_treatments.lua @@ -65,78 +65,42 @@ homedecor.register("window_plain", { }, }) +local wb1_cbox = { + type = "fixed", + fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 }, +} + homedecor.register("blinds_thick", { description = "Window Blinds (thick)", - tiles = { "homedecor_windowblinds.png" }, + mesh = "homedecor_windowblind_thick.obj", + tiles = { + "homedecor_windowblind_strings.png", + "homedecor_windowblinds.png" + }, walkable = false, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.527123, 0.375, 0.3125, 0.523585, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.304245, 0.3125, 0.5, 0.3125, 0.5}, -- NodeBox2 - {-0.5, 0.244104, 0.3125, 0.5, 0.25, 0.5}, -- NodeBox3 - {-0.5, 0.180424, 0.3125, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, 0.116745, 0.3125, 0.5, 0.125, 0.5}, -- NodeBox5 - {-0.5, 0.0566037, 0.3125, 0.5, 0.0625, 0.5}, -- NodeBox6 - {-0.5, -0.00707551, 0.3125, 0.5, 0, 0.5}, -- NodeBox7 - {-0.5, -0.0707547, 0.3125, 0.5, -0.0625, 0.5}, -- NodeBox8 - {-0.5, -0.130896, 0.3125, 0.5, -0.125, 0.5}, -- NodeBox9 - {-0.5, -0.194576, 0.3125, 0.5, -0.1875, 0.5}, -- NodeBox10 - {-0.5, -0.258255, 0.3125, 0.5, -0.25, 0.5}, -- NodeBox11 - {-0.5, -0.318396, 0.3125, 0.5, -0.3125, 0.5}, -- NodeBox12 - {-0.5, -0.5, 0.3125, 0.5, -0.4375, 0.5}, -- NodeBox13 - {-0.5, -0.378538, 0.3125, 0.5, -0.375, 0.5}, -- NodeBox14 - {-0.375, -0.5, 0.367925, -0.367925, 0.4375, 0.445755}, -- NodeBox15 - {0.367924, -0.5, 0.367925, 0.375, 0.5, 0.445755}, -- NodeBox16 - {0.375, 0.375, 0.25, 0.4375, 0.4375, 0.3125}, -- NodeBox17 - {0.396226, -0.325, 0.268868, 0.417453, 0.375, 0.290094}, -- NodeBox18 - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.527123, -0.5, 0.25, 0.523585, 0.5, 0.5} - }, - }, + selection_box = wb1_cbox, + collision_box = wb1_cbox, }) +local wb2_cbox = { + type = "fixed", + fixed = { -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, +} + homedecor.register("blinds_thin", { description = "Window Blinds (thin)", - tiles = { "homedecor_windowblinds.png" }, + mesh = "homedecor_windowblind_thin.obj", + tiles = { + "homedecor_windowblind_strings.png", + "homedecor_windowblinds.png" + }, walkable = false, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.52, 0.375, 0.4375, 0.52, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.304245, 0.4375, 0.5, 0.3125, 0.5}, -- NodeBox2 - {-0.5, 0.244104, 0.4375, 0.5, 0.25, 0.5}, -- NodeBox3 - {-0.5, 0.180424, 0.43755, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, 0.116745, 0.4375, 0.5, 0.125, 0.5}, -- NodeBox5 - {-0.5, 0.0566037, 0.4375, 0.5, 0.0625, 0.5}, -- NodeBox6 - {-0.5, -0.00707551, 0.4375, 0.5, 0, 0.5}, -- NodeBox7 - {-0.5, -0.0707547, 0.4375, 0.5, -0.0625, 0.5}, -- NodeBox8 - {-0.5, -0.130896, 0.4375, 0.5, -0.125, 0.5}, -- NodeBox9 - {-0.5, -0.194576, 0.4375, 0.5, -0.1875, 0.5}, -- NodeBox10 - {-0.5, -0.258255, 0.4375, 0.5, -0.25, 0.5}, -- NodeBox11 - {-0.5, -0.318396, 0.4375, 0.5, -0.3125, 0.5}, -- NodeBox12 - {-0.5, -0.5, 0.4375, 0.5, -0.4375, 0.5}, -- NodeBox13 - {-0.5, -0.378538, 0.4375, 0.5, -0.375, 0.5}, -- NodeBox14 - {-0.375, -0.49, 0.4575, -0.367925, 0.4375, 0.48}, -- NodeBox15 - {0.367924, -0.49, 0.4575, 0.375, 0.5, 0.48}, -- NodeBox16 - {0.375, 0.375, 0.375, 0.4375, 0.4375, 0.4375}, -- NodeBox17 - {0.396226, -0.325, 0.4, 0.417453, 0.375, 0.42}, -- NodeBox18 - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.52, -0.5, 0.375, 0.52, 0.5, 0.5} - }, - }, + selection_box = wb2_cbox, + collision_box = wb2_cbox, }) local curtaincolors = {