diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index c312d73f..c767b624 100755 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -20,7 +20,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'building_blocks:Tarmac_spread 4', recipe = { - {"building_blocks:Tar", "building_blocks:Tar"}, + {"group:tar_block", "group:tar_block"}, } }) minetest.register_craft({ @@ -60,8 +60,8 @@ minetest.register_craft({ minetest.register_craft({ output = 'building_blocks:BWtile 10', recipe = { - {"building_blocks:Marble", "building_blocks:Tar"}, - {"building_blocks:Tar", "building_blocks:Marble"}, + {"group:marble", "group:tar_block"}, + {"group:tar_block", "group:marble"}, } }) minetest.register_craft({ @@ -501,7 +501,7 @@ minetest.register_craftitem("building_blocks:tar_base", { minetest.register_craft({ output = 'building_blocks:knife 1', recipe = { - {"building_blocks:Tar"}, + {"group:tar_block"}, {"group:stick"}, } }) @@ -520,14 +520,14 @@ minetest.register_node("building_blocks:Tar", { description = "Tar", tiles = {"building_blocks_tar.png"}, is_ground_content = true, - groups = {crumbly=1}, + groups = {crumbly=1, tar_block = 1}, sounds = default.node_sound_stone_defaults(), }) minetest.register_node("building_blocks:Marble", { description = "Marble", tiles = {"building_blocks_marble.png"}, is_ground_content = true, - groups = {cracky=3}, + groups = {cracky=3, marble = 1}, sounds = default.node_sound_stone_defaults(), }) minetest.register_craft({ @@ -559,14 +559,12 @@ minetest.register_tool("building_blocks:knife", { }, }) -minetest.add_to_creative_inventory('building_blocks:Tar 0') -minetest.add_to_creative_inventory('building_blocks:hardwood 0') minetest.register_craft({ output = "building_blocks:Marble 9", recipe = { - {"default:clay", "building_blocks:Tar", "default:clay"}, - {"building_blocks:Tar","default:clay", "building_blocks:Tar"}, - {"default:clay", "building_blocks:Tar","default:clay"}, + {"default:clay", "group:tar_block", "default:clay"}, + {"group:tar_block","default:clay", "group:tar_block"}, + {"default:clay", "group:tar_block","default:clay"}, } }) @@ -582,9 +580,9 @@ if not minetest.get_modpath("technic") then 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" } + { "group:tar_block", "group:marble", "group:tar_block" }, + { "group:marble", "group:tar_block", "group:marble" }, + { "group:tar_block", "group:marble", "group:tar_block" } }, }) @@ -594,15 +592,6 @@ if not minetest.get_modpath("technic") then 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/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index b9e5b0e6..0545caf7 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -1278,6 +1278,24 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "homedecor:candlestick_wrought_iron", + recipe = { + {""}, + {"homedecor:candle_thin"}, + {"default:iron_lump"}, + } +}) + +minetest.register_craft({ + output = "homedecor:candlestick_brass", + recipe = { + {""}, + {"homedecor:candle_thin"}, + {"technic:brass_ingot"}, + } +}) + minetest.register_craft({ output = "homedecor:oil_lamp 4", recipe = { @@ -2427,8 +2445,8 @@ for i in ipairs(color_pairings) do minetest.register_craft( { output = "homedecor:tiles_"..result.." 2", recipe = { - { "building_blocks:Marble", "dye:"..dye1 }, - { "building_blocks:Marble", "dye:"..dye2 } + { "group:marble", "dye:"..dye1 }, + { "group:marble", "dye:"..dye2 } }, }) end @@ -2674,12 +2692,19 @@ for c in ipairs(bedcolors) do local woolcolor = bedcolors[c][2] minetest.register_craft( { - output = "homedecor:bed_"..color.."_foot", - recipe = { - { "group:stick", "", "group:stick" }, - { "wool:white", "wool:"..woolcolor, "wool:"..woolcolor }, - { "group:wood", "", "group:wood" }, - }, + output = "homedecor:bed_"..color.."_regular", + recipe = { + { "group:stick", "", "group:stick" }, + { "wool:white", "wool:"..woolcolor, "wool:"..woolcolor }, + { "group:wood", "", "group:wood" }, + }, + }) + + minetest.register_craft( { + output = "homedecor:bed_"..color.."_kingsize", + recipe = { + { "homedecor:bed_"..color.."_regular", "homedecor:bed_"..color.."_regular" } + }, }) end @@ -3120,6 +3145,23 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:ceiling_lamp", + recipe = { + { "", "technic:brass_ingot", ""}, + { "", "homedecor:chainlink_brass", ""}, + { "default:glass", "homedecor:glowlight_small_cube_white", "default:glass"} + }, +}) + +minetest.register_craft({ + output = "homedecor:ceiling_lamp", + recipe = { + { "", "chains:chain_top_brass", ""}, + { "default:glass", "homedecor:glowlight_small_cube_white", "default:glass"} + }, +}) + 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/door_models.lua b/mods/homedecor_modpack/homedecor/door_models.lua deleted file mode 100755 index 32baf210..00000000 --- a/mods/homedecor_modpack/homedecor/door_models.lua +++ /dev/null @@ -1,380 +0,0 @@ - -local S = homedecor.gettext - -homedecor.door_models = { - { - "closet_mahogany", - S("Mahogany Closet Door"), - - {{ -8/16, 5/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0/32, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -12/32, 13/32, 8/16, -11/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -13/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16}, - { -8/16, 10/32, 13/32, 8/16, 11/32, 15/32 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -11/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 5/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0/32, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -12/32, 13/32, 8/16, -11/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -13/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16}, - { -8/16, 10/32, 13/32, 8/16, 11/32, 15/32 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -11/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ----------- - - { - "closet_oak", - S("Oak Closet Door"), - - {{ -8/16, 5/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0/32, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -12/32, 13/32, 8/16, -11/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -13/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16}, - { -8/16, 10/32, 13/32, 8/16, 11/32, 15/32 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -11/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 5/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0/32, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -12/32, 13/32, 8/16, -11/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -13/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16}, - { -8/16, 10/32, 13/32, 8/16, 11/32, 15/32 }, - { -8/16, 8/32, 13/32, 8/16, 9/32, 15/32 }, - { -8/16, 6/32, 13/32, 8/16, 7/32, 15/32 }, - { -8/16, 4/32, 13/32, 8/16, 5/32, 15/32 }, - { -8/16, 2/32, 13/32, 8/16, 3/32, 15/32 }, - { -8/16, 0, 13/32, 8/16, 1/32, 15/32 }, - { -8/16, -2/32, 13/32, 8/16, -1/32, 15/32 }, - { -8/16, -4/32, 13/32, 8/16, -3/32, 15/32 }, - { -8/16, -6/32, 13/32, 8/16, -5/32, 15/32 }, - { -8/16, -8/32, 13/32, 8/16, -7/32, 15/32 }, - { -8/16, -10/32, 13/32, 8/16, -9/32, 15/32 }, - { -8/16, -16/32, 6/16, 8/16, -11/32, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - }, - ----------- - - { - "exterior_fancy", - S("Fancy Wood/Glass Door"), - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }} - }, - ----------- - - { - "glass", - S("Glass Office Door"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ----------- - - { - "wood_glass", - S("Glass and Wood, Oak-colored"), - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }} - }, - ----------- - - { - "wood_glass_mahogany", - S("Glass and Wood, Mahogany-colored"), - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }} - }, - ----------- - - { - "wood_glass_white", - S("Glass and Wood, White"), - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -3/32, 6/16, 8/16, 1/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -7/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }}, - - {{ -8/16, 7/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -1/32, 6/16, 8/16, 3/32, 8/16 }, - { -8/16, -8/16, 6/16, 8/16, -6/16, 8/16 }, - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, - { -1/16, -8/16, 6/16, 1/16, 8/16, 8/16 }, - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }} - }, - ----------- - - { - "wood_plain", - S("Plain Wooden Door"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ----------- - - { - "bedroom", - S("White Bedroom Door"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ----------- - - { - "wrought_iron", - S("Wrought Iron Gate/Door"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ---------- - - { - "woodglass", - S("Woodglass door"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - ---------- - - { - "woodglass2", - S("Woodglass door type2"), - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, - - {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }} - }, - -} - diff --git a/mods/homedecor_modpack/homedecor/doors_and_gates.lua b/mods/homedecor_modpack/homedecor/doors_and_gates.lua index 53b16348..5b0e4431 100755 --- a/mods/homedecor_modpack/homedecor/doors_and_gates.lua +++ b/mods/homedecor_modpack/homedecor/doors_and_gates.lua @@ -120,119 +120,133 @@ local function addDoorNode(pos,def,isClosed) minetest.get_meta(pos):set_int('closed', isClosed and 1 or 0) end +local door_model_list = { + { name = "closet_mahogany", + description = S("Mahogany Closet Door"), + mesh = "homedecor_door_closet.obj" + }, + + { name = "closet_oak", + description = S("Oak Closet Door"), + mesh = "homedecor_door_closet.obj" + }, + + { name = "exterior_fancy", + description = S("Fancy Wood/Glass Door"), + mesh = "homedecor_door_fancy.obj", + tiles = { + "homedecor_door_exterior_fancy.png", + "homedecor_door_exterior_fancy_insert.png" + }, + usealpha = true + }, + + { name = "glass", + description = S("Glass Office Door"), + mesh = "homedecor_door_plain.obj" + }, + + { name = "wood_glass_oak", + description = S("Glass and Wood, Oak-colored"), + mesh = "homedecor_door_wood_glass.obj", + tiles = { + "homedecor_door_wood_glass_oak.png", + "homedecor_door_wood_glass_insert.png", + } + }, + + { name = "wood_glass_mahogany", + description = S("Glass and Wood, Mahogany-colored"), + mesh = "homedecor_door_wood_glass.obj", + tiles = { + "homedecor_door_wood_glass_mahogany.png", + "homedecor_door_wood_glass_insert.png", + } + }, + + { name = "wood_glass_white", + description = S("Glass and Wood, White"), + mesh = "homedecor_door_wood_glass.obj", + tiles = { + "homedecor_door_wood_glass_white.png", + "homedecor_door_wood_glass_insert.png", + } + }, + + { name = "wood_plain", + description = S("Plain Wooden Door"), + mesh = "homedecor_door_plain.obj" + }, + + { name = "bedroom", + description = S("White Bedroom Door"), + mesh = "homedecor_door_plain.obj" + }, + + { name = "wrought_iron", + description = S("Wrought Iron Gate/Door"), + mesh = "homedecor_door_plain.obj" + }, + + { name = "woodglass", + description = S("Wooden door with glass insert"), + mesh = "homedecor_door_woodglass_typea.obj", + tiles = { + "homedecor_door_woodglass_typea.png", + "homedecor_door_woodglass_typea_insert.png", + }, + usealpha = true + }, + + { name = "woodglass2", + description = S("Wooden door with glass insert, type 2"), + mesh = "homedecor_door_plain.obj", + usealpha = true + }, +} + +local def_selbox = { + type = "fixed", + fixed = { -0.5, -0.5, 0.375, 0.5, 1.5, 0.5 } +} + local sides = {"left", "right"} -local rsides = {"right", "left"} for i in ipairs(sides) do local side = sides[i] - local rside = rsides[i] - for j in ipairs(homedecor.door_models) do - local doorname = homedecor.door_models[j][1] - local doordesc = homedecor.door_models[j][2] - local nodeboxes_top = homedecor.door_models[j][5] - local nodeboxes_bottom = homedecor.door_models[j][6] - local texalpha = false - if doorname == "exterior_fancy" or "woodglass" or "woodglass2" then - texalpha = true + for _, door_model in ipairs(door_model_list) do + + local doorname = door_model.name + + local selbox = door_model.selectbox or def_selbox + local colbox = door_model.collisionbox or door_model.selectbox or def_selbox + local mesh = door_model.mesh + local groups = {snappy = 3} + + if side == "right" then + mesh = string.gsub(door_model.mesh, ".obj", "_right.obj") + groups = {snappy = 3, not_in_creative_inventory = 1} end - if side == "left" then - nodeboxes_top = homedecor.door_models[j][3] - nodeboxes_bottom = homedecor.door_models[j][4] - end - - local lower_top_side = "homedecor_door_"..doorname.."_tb.png" - local upper_bottom_side = "homedecor_door_"..doorname.."_tb.png" - - if doorname == "glass" or doorname == "wrought_iron" then - lower_top_side = "homedecor_blanktile.png" - upper_bottom_side = "homedecor_blanktile.png" - end - - local tiles_upper = { - "homedecor_door_"..doorname.."_tb.png", - upper_bottom_side, - "homedecor_door_"..doorname.."_lrt.png", - "homedecor_door_"..doorname.."_lrt.png", - "homedecor_door_"..doorname.."_"..rside.."_top.png", - "homedecor_door_"..doorname.."_"..side.."_top.png", - } - - local tiles_lower = { - lower_top_side, - "homedecor_door_"..doorname.."_tb.png", - "homedecor_door_"..doorname.."_lrb.png", - "homedecor_door_"..doorname.."_lrb.png", - "homedecor_door_"..doorname.."_"..rside.."_bottom.png", - "homedecor_door_"..doorname.."_"..side.."_bottom.png", - } - - local selectboxes_top = { - type = "fixed", - fixed = { -0.5, -1.5, 6/16, 0.5, 0.5, 8/16} - } - - local selectboxes_bottom = { - type = "fixed", - fixed = { -0.5, -0.5, 6/16, 0.5, 1.5, 8/16} - } - - minetest.register_node("homedecor:door_"..doorname.."_top_"..side, { - description = doordesc.." "..S("(Top Half, %s-opening)"):format(side), - drawtype = "nodebox", - tiles = tiles_upper, + minetest.register_node("homedecor:door_"..doorname.."_"..side, { + description = door_model.description.." "..S("(%s-opening)"):format(side), + drawtype = "mesh", + mesh = mesh, + tiles = door_model.tiles or { "homedecor_door_"..doorname..".png" }, + inventory_image = "homedecor_door_"..doorname.."_inv.png", + wield_image = "homedecor_door_"..doorname.."_inv.png", paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, not_in_creative_inventory=1}, + groups = groups, sounds = default.node_sound_wood_defaults(), - use_texture_alpha = texalpha, - selection_box = selectboxes_top, - node_box = { - type = "fixed", - fixed = nodeboxes_top - }, - drop = "homedecor:door_"..doorname.."_bottom_"..side, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - if minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == "homedecor:door_"..doorname.."_bottom_"..side then - minetest.remove_node({x=pos.x, y=pos.y-1, z=pos.z}) - end - end, - on_rightclick = function(pos, node, clicker) - homedecor.flip_door({x=pos.x, y=pos.y-1, z=pos.z}, node, clicker, doorname, side) - end - }) - - local dgroups = {snappy=3, not_in_creative_inventory=1} - if side == "left" then - dgroups = {snappy=3} - end - - minetest.register_node("homedecor:door_"..doorname.."_bottom_"..side, { - description = doordesc.." "..S("(%s-opening)"):format(side), - drawtype = "nodebox", - tiles = tiles_lower, - inventory_image = "homedecor_door_"..doorname.."_left_inv.png", - wield_image = "homedecor_door_"..doorname.."_left_inv.png", - paramtype = "light", - paramtype2 = "facedir", - groups = dgroups, - sounds = default.node_sound_wood_defaults(), - use_texture_alpha = texalpha, - selection_box = selectboxes_bottom, - node_box = { - type = "fixed", - fixed = nodeboxes_bottom - }, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == "homedecor:door_"..doorname.."_top_"..side then - minetest.remove_node({x=pos.x, y=pos.y+1, z=pos.z}) - end - end, + use_texture_alpha = door_model.usealpha, + selection_box = selbox, + collision_box = colbox, on_place = function(itemstack, placer, pointed_thing) return homedecor.stack_wing(itemstack, placer, pointed_thing, - "homedecor:door_"..doorname.."_bottom_left", "homedecor:door_"..doorname.."_top_left", - "homedecor:door_"..doorname.."_bottom_right", "homedecor:door_"..doorname.."_top_right") + "homedecor:door_"..doorname.."_left", "air", + "homedecor:door_"..doorname.."_right", "air") end, on_construct = function(pos) minetest.get_meta(pos):set_int("closed", 1) @@ -240,32 +254,40 @@ for i in ipairs(sides) do on_rightclick = function(pos, node, clicker) homedecor.flip_door(pos, node, clicker, doorname, side) end, - -- both left and right doors may be used for open or closed doors - -- so they have to have both action_on and action_off and just - -- check when that action is invoked if to continue + -- both left and right doors may be used for open or closed doors + -- so they have to have both action_on and action_off and just + -- check when that action is invoked if to continue - on_punch = function(pos, node, puncher) - minetest.get_meta(pos):set_string('closed',nil) - end, - drop = "homedecor:door_"..doorname.."_bottom_left", - mesecons = { - effector = { - action_on = function(pos,node) - local isClosed = getClosed(pos) - if isClosed then - homedecor.flip_door(pos,node,nil,doorname,side,isClosed) - end - end, - action_off = function(pos,node) - local isClosed = getClosed(pos) - if not isClosed then - homedecor.flip_door(pos,node,nil,doorname,side,isClosed) - end - end - } - } + on_punch = function(pos, node, puncher) + minetest.get_meta(pos):set_string('closed',nil) + end, + drop = "homedecor:door_"..doorname.."_left", + mesecons = { + effector = { + action_on = function(pos,node) + local isClosed = getClosed(pos) + if isClosed then + homedecor.flip_door(pos,node,nil,doorname,side,isClosed) + end + end, + action_off = function(pos,node) + local isClosed = getClosed(pos) + if not isClosed then + homedecor.flip_door(pos,node,nil,doorname,side,isClosed) + end + end + } + } }) + + minetest.register_alias("homedecor:door_"..doorname.."_top_"..side, "air") + minetest.register_alias("homedecor:door_"..doorname.."_bottom_"..side, "homedecor:door_"..doorname.."_"..side) + end + + minetest.register_alias("homedecor:door_wood_glass_top_"..side, "air") + minetest.register_alias("homedecor:door_wood_glass_bottom_"..side, "homedecor:door_wood_glass_oak_"..side) + end -- Gates @@ -463,112 +485,56 @@ function homedecor.flip_gate(pos, node, player, gate, oc) end end --- "paper" door/wall +-- Japanese-style wood/paper wall pieces and door + +local jp_cbox = { + type = "fixed", + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, +} minetest.register_node("homedecor:japanese_wall_top", { - tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_top.png", - "homedecor_japanese_wall_top.png" - }, description = "Japanese wall (top)", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.03125, 0.5, 0.5, 0.03125}, -- NodeBox1 - {-0.5, -0.5, 0, -0.469, 0.5, 0.0625}, -- NodeBox2 - {0.469, -0.5, 0, 0.5, 0.5, 0.0625}, -- NodeBox3 - {-0.5, -0.5, 0, 0.5, -0.46875, 0.0625}, -- NodeBox4 - {-0.5, 0.219, 0, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.031, -0.5, 0, 0.031, 0.5, 0.0625}, -- NodeBox6 - {-0.5, -0.031, 0, 0.5, 0.03125, 0.0625}, -- NodeBox7 - {-0.281, -0.5, 0, -0.219, 0.5, 0.0625}, -- NodeBox8 - {0.219, -0.5, 0, 0.281, 0.5, 0.0625}, -- NodeBox9 - {-0.5, -0.281, 0, 0.5, -0.21875, 0.0625}, -- NodeBox10 - } + drawtype = "mesh", + mesh = "homedecor_wall_japanese_top.obj", + tiles = { + "homedecor_japanese_wood.png", + "homedecor_japanese_paper.png" }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, - } + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, }) minetest.register_node("homedecor:japanese_wall_middle", { - tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_middle.png", - "homedecor_japanese_wall_middle.png" - }, description = "Japanese wall", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.03125, 0.5, 0.5, 0.03125}, -- NodeBox1 - {-0.5, -0.5, 0, -0.469, 0.5, 0.0625}, -- NodeBox2 - {0.469, -0.5, 0, 0.5, 0.5, 0.0625}, -- NodeBox3 - {-0.5, -0.5, 0, 0.5, -0.46875, 0.0625}, -- NodeBox4 - {-0.5, 0.469, 0, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.031, -0.5, 0, 0.031, 0.5, 0.0625}, -- NodeBox6 - {-0.5, -0.031, 0, 0.5, 0.03125, 0.0625}, -- NodeBox7 - {-0.281, -0.5, 0, -0.219, 0.5, 0.0625}, -- NodeBox8 - {0.219, -0.5, 0, 0.281, 0.5, 0.0625}, -- NodeBox9 - {-0.5, -0.281, 0, 0.5, -0.21875, 0.0625}, -- NodeBox10 - {-0.5, 0.219, 0, 0.5, 0.28125, 0.0625}, -- NodeBox11 - } + drawtype = "mesh", + mesh = "homedecor_wall_japanese_middle.obj", + tiles = { + "homedecor_japanese_wood.png", + "homedecor_japanese_paper.png" }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, - } + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, }) minetest.register_node("homedecor:japanese_wall_bottom", { - tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_bottom.png", - "homedecor_japanese_wall_bottom.png" - }, description = "Japanese wall (bottom)", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.03125, 0.5, 0.5, 0.03125}, -- NodeBox1 - {-0.5, -0.5, 0, -0.469, 0.5, 0.0625}, -- NodeBox2 - {0.469, -0.5, 0, 0.5, 0.5, 0.0625}, -- NodeBox3 - {-0.5, -0.5, 0, 0.5, -0.21875, 0.0625}, -- NodeBox4 - {-0.5, 0.469, 0, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.031, -0.5, 0, 0.031, 0.5, 0.0625}, -- NodeBox6 - {-0.5, -0.031, 0, 0.5, 0.03125, 0.0625}, -- NodeBox7 - {-0.281, -0.5, 0, -0.219, 0.5, 0.0625}, -- NodeBox8 - {0.219, -0.5, 0, 0.281, 0.5, 0.0625}, -- NodeBox9 - {-0.5, 0.219, 0, 0.5, 0.28125, 0.0625}, -- NodeBox11 - } + drawtype = "mesh", + mesh = "homedecor_wall_japanese_bottom.obj", + tiles = { + "homedecor_japanese_wood.png", + "homedecor_japanese_paper.png" }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, - } + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, }) minetest.register_node("homedecor:tatami_mat", { @@ -592,143 +558,56 @@ minetest.register_node("homedecor:tatami_mat", { } }) -homedecor.register("jpn_door_bottom", { +homedecor.register("door_japanese_closed", { description = "Japanese-style door", - inventory_image = "homedecor_jpn_door_inv.png", + inventory_image = "homedecor_door_japanese_inv.png", tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_door_bottom.png" + "homedecor_japanese_wood.png", + "homedecor_japanese_paper.png" }, + mesh = "homedecor_door_japanese_closed.obj", groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.03125, 0.5, 0.5, 0.03125}, -- NodeBox1 - {-0.5, -0.5, 0, -0.44, 0.5, 0.0625}, -- NodeBox2 - {0.44, -0.5, 0, 0.5, 0.5, 0.0625}, -- NodeBox3 - {-0.5, -0.5, 0, 0.5, -0.4065, 0.0625}, -- NodeBox4 - {-0.5, 0.469, 0, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.5, 0.1565, 0, 0.5, 0.21875, 0.0625}, -- NodeBox6 - {-0.5, -0.185, 0, 0.5, -0.125, 0.0625}, -- NodeBox7 - {-0.2185, -0.5, 0, -0.1565, 0.5, 0.0625}, -- NodeBox8 - {0.1565, -0.5, 0, 0.2185, 0.5, 0.0625}, -- NodeBox9 - } - }, selection_box = { type = "fixed", fixed = {-0.5, -0.5, 0, 0.5, 1.5, 0.0625}, }, - expand = { top = "homedecor:jpn_door_top" }, + collision_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.0625, 0.5, 1.5, 0}, + }, + expand = { top = "air" }, on_rightclick = function(pos, node, clicker) - local fdir = minetest.get_node(pos).param2 - minetest.set_node(pos, {name = "homedecor:jpn_door_bottom_open", param2 = fdir}) - minetest.set_node({x = pos.x, y=pos.y + 1, z = pos.z}, {name = "homedecor:jpn_door_top_open", param2 = fdir}) + minetest.set_node(pos, {name = "homedecor:door_japanese_open", param2 = node.param2}) end }) -minetest.register_node("homedecor:jpn_door_top", { +minetest.register_node("homedecor:door_japanese_open", { tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_door_top.png" + "homedecor_japanese_wood.png", + "homedecor_japanese_paper.png" }, - drawtype = "nodebox", + drawtype = "mesh", + mesh = "homedecor_door_japanese_open.obj", paramtype = "light", paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory = 1 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.03125, 0.5, 0.5, 0.03125}, -- NodeBox1 - {-0.5, -0.5, 0, -0.44, 0.5, 0.0625}, -- NodeBox2 - {0.44, -0.5, 0, 0.5, 0.5, 0.0625}, -- NodeBox3 - {-0.5, -0.5, 0, 0.5, -0.469, 0.0625}, -- NodeBox4 - {-0.5, 0.4065, 0, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.5, 0.1255, 0, 0.5, 0.1875, 0.0625}, -- NodeBox6 - {-0.5, -0.2185, 0, 0.5, -0.1565, 0.0625}, -- NodeBox7 - {-0.2185, -0.5, 0, -0.1565, 0.5, 0.0625}, -- NodeBox8 - {0.1565, -0.5, 0, 0.2185, 0.5, 0.0625}, -- NodeBox9 - } - }, - selection_box = homedecor.nodebox.null, -}) - -minetest.register_node("homedecor:jpn_door_bottom_open", { - tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_door_bottom.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3, not_in_creative_inventory = 1 }, - node_box = { - type = "fixed", - fixed = { - {-1.5, -0.5, -0.03125, -0.5, 0.5, -0.03125}, -- NodeBox1 - {-1.5, -0.5, -0.0625, -1.44, 0.5, 0}, -- NodeBox2 - {-0.5625, -0.5, -0.0625, -0.5, 0.5, 0}, -- NodeBox3 - {-1.5, -0.5, -0.0625, -0.5, -0.40625, 0}, -- NodeBox4 - {-1.5, 0.469, -0.0625, -0.5, 0.5, 0}, -- NodeBox5 - {-1.5, 0.1565, -0.0625, -0.5, 0.21875, 0}, -- NodeBox6 - {-1.5, -0.1865, -0.0625, -0.5, -0.125, 0}, -- NodeBox7 - {-1.21875, -0.5, -0.0625, -1.1565, 0.5, 0}, -- NodeBox8 - {-0.84375, -0.5, -0.0625, -0.7815, 0.5, 0}, -- NodeBox9 - } - }, selection_box = { type = "fixed", fixed = {-1.5, -0.5, -0.0625, 0.5, 1.5, 0}, }, - on_rightclick = function(pos, node, clicker) - local fdir = minetest.get_node(pos).param2 - minetest.set_node(pos, {name = "homedecor:jpn_door_bottom", param2 = fdir}) - minetest.set_node({x = pos.x, y=pos.y + 1, z = pos.z}, {name = "homedecor:jpn_door_top", param2 = fdir}) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local pos2 = { x = pos.x, y=pos.y + 1, z = pos.z } - if minetest.get_node(pos2).name == "homedecor:jpn_door_top_open" then - minetest.remove_node(pos2) - end - end, - drop = "homedecor:jpn_door_bottom", -}) - -minetest.register_node("homedecor:jpn_door_top_open", { - tiles = { - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_wall_edges.png", - "homedecor_japanese_door_top.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3, not_in_creative_inventory = 1 }, - node_box = { + collision_box = { type = "fixed", - fixed = { - {-1.5, -0.5, -0.03125, -0.5, 0.5, -0.03125}, -- NodeBox1 - {-1.5, -0.5, -0.0625, -1.44, 0.5, 0}, -- NodeBox2 - {-0.5625, -0.5, -0.0625, -0.5, 0.5, 0}, -- NodeBox3 - {-1.5, -0.5, -0.0625, -0.5, -0.469, 0}, -- NodeBox4 - {-1.5, 0.4065, -0.0625, -0.5, 0.5, 0}, -- NodeBox5 - {-1.5, 0.1253, -0.0625, -0.5, 0.1875, 0}, -- NodeBox6 - {-1.5, -0.2185, -0.0625, -0.5, -0.15625, 0}, -- NodeBox7 - {-1.21875, -0.5, -0.0625, -1.1565, 0.5, 0}, -- NodeBox8 - {-0.84375, -0.5, -0.0625, -0.7815, 0.5, 0}, -- NodeBox9 - } + fixed = {-1.5, -0.5, -0.0625, -0.5, 1.5, 0}, }, - selection_box = homedecor.nodebox.null, + on_rightclick = function(pos, node, clicker) + minetest.set_node(pos, {name = "homedecor:door_japanese_closed", param2 = node.param2}) + end, + drop = "homedecor:door_japanese_closed", }) +minetest.register_alias("homedecor:jpn_door_top", "air") +minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed") + +minetest.register_alias("homedecor:jpn_door_top_open", "air") +minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") diff --git a/mods/homedecor_modpack/homedecor/furniture.lua b/mods/homedecor_modpack/homedecor/furniture.lua index 93b0b291..f704b5ed 100755 --- a/mods/homedecor_modpack/homedecor/furniture.lua +++ b/mods/homedecor_modpack/homedecor/furniture.lua @@ -189,43 +189,16 @@ local bedcolors = { "pink", } -local function bed_extension(pos, color) - - local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) - local thisnode = minetest.get_node(pos) - local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) - - local fdir = thisnode.param2 - - if string.find(topnode.name, "homedecor:bed_.*_regular$") then - if fdir == topnode.param2 then - local newnode = string.gsub(thisnode.name, "_regular", "_extended") - minetest.set_node(pos, { name = newnode, param2 = fdir}) - end - end - - if string.find(bottomnode.name, "homedecor:bed_.*_regular$") then - if fdir == bottomnode.param2 then - local newnode = string.gsub(bottomnode.name, "_regular", "_extended") - minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newnode, param2 = fdir}) - end - end -end - -local function unextend_bed(pos, color) - local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) - local fdir = bottomnode.param2 - if string.find(bottomnode.name, "homedecor:bed_.*_extended$") then - local newnode = string.gsub(bottomnode.name, "_extended", "_regular") - minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newnode, param2 = fdir}) - end -end - local bed_cbox = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } } +local kbed_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 1.5 } +} + for _, color in ipairs(bedcolors) do local color2=color if color == "darkgrey" then @@ -246,12 +219,13 @@ for _, color in ipairs(bedcolors) do groups = {snappy=3}, selection_box = bed_cbox, collision_box = bed_cbox, - on_construct = function(pos) - bed_extension(pos, color) + after_place_node = function(pos, placer, itemstack, pointed_thing) + if not placer:get_player_control().sneak then + return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color) + end end, - expand = { forward = "air" }, - after_unexpand = function(pos) - unextend_bed(pos, color) + after_dig_node = function(pos) + homedecor.unextend_bed(pos, color) end, }) @@ -269,12 +243,36 @@ for _, color in ipairs(bedcolors) do selection_box = bed_cbox, collision_box = bed_cbox, expand = { forward = "air" }, - after_unexpand = function(pos) - unextend_bed(pos, color) + after_dig_node = function(pos) + homedecor.unextend_bed(pos, color) end, drop = "homedecor:bed_"..color.."_regular" }) + homedecor.register("bed_"..color.."_kingsize", { + mesh = "homedecor_bed_kingsize.obj", + tiles = { + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", + }, + inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", + description = S("Bed (%s, king sized)"):format(color), + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = kbed_cbox, + collision_box = kbed_cbox, + after_dig_node = function(pos, oldnode, oldmetadata, digger) + local inv = digger:get_inventory() + if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then + inv:remove_item("main", "homedecor:bed_"..color.."_kingsize 1") + inv:add_item("main", "homedecor:bed_"..color.."_regular 2") + end + end, + }) + minetest.register_alias("homedecor:bed_"..color.."_foot", "homedecor:bed_"..color.."_regular") minetest.register_alias("homedecor:bed_"..color.."_footext", "homedecor:bed_"..color.."_extended") minetest.register_alias("homedecor:bed_"..color.."_head", "air") diff --git a/mods/homedecor_modpack/homedecor/furniture_recipes.lua b/mods/homedecor_modpack/homedecor/furniture_recipes.lua index 52280c6b..4e2e5b08 100755 --- a/mods/homedecor_modpack/homedecor/furniture_recipes.lua +++ b/mods/homedecor_modpack/homedecor/furniture_recipes.lua @@ -197,7 +197,7 @@ minetest.register_craft({ output = "homedecor:toilet", recipe = { {"","","bucket:bucket_water"}, - { "building_blocks:Marble","building_blocks:Marble", "building_blocks:Marble" }, + { "group:marble","group:marble", "group:marble" }, { "", "bucket:bucket_empty", "" }, }, }) @@ -205,7 +205,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:sink", recipe = { - { "building_blocks:Marble","bucket:bucket_empty", "building_blocks:Marble" }, + { "group:marble","bucket:bucket_empty", "group:marble" }, }, }) @@ -219,7 +219,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:shower_tray", recipe = { - { "building_blocks:Marble","bucket:bucket_water", "building_blocks:Marble" }, + { "group:marble","bucket:bucket_water", "group:marble" }, }, }) diff --git a/mods/homedecor_modpack/homedecor/handlers/expansion.lua b/mods/homedecor_modpack/homedecor/handlers/expansion.lua index b7bb553e..e05ce3a1 100755 --- a/mods/homedecor_modpack/homedecor/handlers/expansion.lua +++ b/mods/homedecor_modpack/homedecor/handlers/expansion.lua @@ -1,5 +1,28 @@ local S = homedecor.gettext +-- vectors to place one node next to or behind another + +homedecor.fdir_to_right = { + { 1, 0 }, + { 0, -1 }, + { -1, 0 }, + { 0, 1 }, +} + +homedecor.fdir_to_left = { + { -1, 0 }, + { 0, 1 }, + { 1, 0 }, + { 0, -1 }, +} + +homedecor.fdir_to_fwd = { + { 0, 1 }, + { 1, 0 }, + { 0, -1 }, + { -1, 0 }, +} + -- selects which node was pointed at based on it being known, and either clickable or buildable_to local function select_node(pointed_thing) local pos = pointed_thing.under @@ -63,12 +86,7 @@ end -- Stack one door node above another -- like homedecor.stack_vertically but tests first if it was placed as a right wing, then uses node1_right and node2_right instead -local fdir_to_left = { - { -1, 0 }, - { 0, 1 }, - { 1, 0 }, - { 0, -1 }, -} + function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, node1_right, node2_right) local pos, def = select_node(pointed_thing) if not def then return end -- rare corner case, but happened in #205 @@ -80,7 +98,7 @@ function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, no local forceright = placer:get_player_control()["sneak"] local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local is_right_wing = node1 == minetest.get_node({ x = pos.x + fdir_to_left[fdir+1][1], y=pos.y, z = pos.z + fdir_to_left[fdir+1][2] }).name + local is_right_wing = node1 == minetest.get_node({ x = pos.x + homedecor.fdir_to_left[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_left[fdir+1][2] }).name if forceright or is_right_wing then node1, node2 = node1_right, node2_right end @@ -89,21 +107,6 @@ function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, no return stack(itemstack, placer, fdir, pos, def, top_pos, node1, node2) end --- Place one node right of or behind another -homedecor.fdir_to_right = { - { 1, 0 }, - { 0, -1 }, - { -1, 0 }, - { 0, 1 }, -} - -homedecor.fdir_to_fwd = { - { 0, 1 }, - { 1, 0 }, - { 0, -1 }, - { -1, 0 }, -} - function homedecor.stack_sideways(itemstack, placer, pointed_thing, node1, node2, dir) local pos, def = select_node(pointed_thing) if not def then return end -- rare corner case, but happened in #205 @@ -119,3 +122,78 @@ function homedecor.stack_sideways(itemstack, placer, pointed_thing, node1, node2 return stack(itemstack, placer, fdir, pos, def, pos2, node1, node2) end + +function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color) + + local thisnode = minetest.get_node(pos) + local fdir = thisnode.param2 + + local fxd = homedecor.fdir_to_fwd[fdir+1][1] + local fzd = homedecor.fdir_to_fwd[fdir+1][2] + + local forwardpos = {x=pos.x+fxd, y=pos.y, z=pos.z+fzd} + local forwardnode = minetest.get_node(forwardpos) + + local def = minetest.registered_nodes[forwardnode.name] + local placer_name = placer:get_player_name() + + if not (def and def.buildable_to) then + minetest.chat_send_player( placer:get_player_name(), "Not enough room - the space for the headboard is occupied!" ) + minetest.set_node(pos, {name = "air"}) + return true + end + + if minetest.is_protected(forwardpos, placer_name) then + minetest.chat_send_player( placer:get_player_name(), "Someone already owns the spot where the headboard goes." ) + return true + end + + minetest.set_node(forwardpos, {name = "air"}) + + local lxd = homedecor.fdir_to_left[fdir+1][1] + local lzd = homedecor.fdir_to_left[fdir+1][2] + local leftpos = {x=pos.x+lxd, y=pos.y, z=pos.z+lzd} + local leftnode = minetest.get_node(leftpos) + + local rxd = homedecor.fdir_to_right[fdir+1][1] + local rzd = homedecor.fdir_to_right[fdir+1][2] + local rightpos = {x=pos.x+rxd, y=pos.y, z=pos.z+rzd} + local rightnode = minetest.get_node(rightpos) + + if leftnode.name == "homedecor:bed_"..color.."_regular" then + local newname = string.gsub(thisnode.name, "_regular", "_kingsize") + minetest.set_node(pos, {name = "air"}) + minetest.set_node(leftpos, { name = newname, param2 = fdir}) + elseif rightnode.name == "homedecor:bed_"..color.."_regular" then + local newname = string.gsub(thisnode.name, "_regular", "_kingsize") + minetest.set_node(rightpos, {name = "air"}) + minetest.set_node(pos, { name = newname, param2 = fdir}) + end + + local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) + local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) + + if string.find(topnode.name, "homedecor:bed_.*_regular$") then + if fdir == topnode.param2 then + local newname = string.gsub(thisnode.name, "_regular", "_extended") + minetest.set_node(pos, { name = newname, param2 = fdir}) + end + end + + if string.find(bottomnode.name, "homedecor:bed_.*_regular$") then + if fdir == bottomnode.param2 then + local newname = string.gsub(bottomnode.name, "_regular", "_extended") + minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newname, param2 = fdir}) + end + end +end + +function homedecor.unextend_bed(pos, color) + local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) + local fdir = bottomnode.param2 + if string.find(bottomnode.name, "homedecor:bed_.*_extended$") then + local newname = string.gsub(bottomnode.name, "_extended", "_regular") + minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newname, param2 = fdir}) + end +end + diff --git a/mods/homedecor_modpack/homedecor/init.lua b/mods/homedecor_modpack/homedecor/init.lua index fea85109..dd36ff61 100755 --- a/mods/homedecor_modpack/homedecor/init.lua +++ b/mods/homedecor_modpack/homedecor/init.lua @@ -117,7 +117,6 @@ dofile(homedecor.modpath.."/shutters.lua") dofile(homedecor.modpath.."/shingles.lua") dofile(homedecor.modpath.."/slopes.lua") -dofile(homedecor.modpath.."/door_models.lua") dofile(homedecor.modpath.."/doors_and_gates.lua") dofile(homedecor.modpath.."/fences.lua") diff --git a/mods/homedecor_modpack/homedecor/lighting.lua b/mods/homedecor_modpack/homedecor/lighting.lua index 75419ae2..2bee15f0 100755 --- a/mods/homedecor_modpack/homedecor/lighting.lua +++ b/mods/homedecor_modpack/homedecor/lighting.lua @@ -172,12 +172,12 @@ homedecor.register("candle", { local c_cbox = { type = "fixed", fixed = { - { -0.1, -0.5, -0.1, 0.125, 0.05, 0.125 }, + { -0.125, -0.5, -0.125, 0.125, 0.05, 0.125 }, } } homedecor.register("candle_thin", { - description = S("Little Candle"), + description = S("Thin Candle"), mesh = "homedecor_candle_thin.obj", tiles = { 'homedecor_candle_sides.png', @@ -192,6 +192,47 @@ homedecor.register("candle_thin", { light_source = LIGHT_MAX-4, }) +local cs_cbox = { + type = "fixed", + fixed = { + { -0.15625, -0.5, -0.15625, 0.15625, 0.3125, 0.15625 }, + } +} + +homedecor.register("candlestick_wrought_iron", { + description = S("Candlestick (wrought iron)"), + mesh = "homedecor_candlestick.obj", + tiles = { + "homedecor_candle_sides.png", + {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, + "homedecor_tile_wrought_iron2.png", + }, + inventory_image = "homedecor_candlestick_wrought_iron_inv.png", + selection_box = cs_cbox, + collision_box = cs_cbox, + sunlight_propagates = true, + walkable = false, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-4, +}) + +homedecor.register("candlestick_brass", { + description = S("Candlestick (brass)"), + mesh = "homedecor_candlestick.obj", + tiles = { + "homedecor_candle_sides.png", + {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, + "homedecor_tile_brass2.png", + }, + inventory_image = "homedecor_candlestick_brass_inv.png", + selection_box = cs_cbox, + collision_box = cs_cbox, + sunlight_propagates = true, + walkable = false, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-4, +}) + homedecor.register("wall_sconce", { description = S("Wall sconce"), mesh = "homedecor_wall_sconce.obj", @@ -442,3 +483,37 @@ for _, color in ipairs(dlamp_colors) do groups = {snappy=3}, }) end + +homedecor.register("ceiling_lamp", { + description = S("Ceiling Lamp"), + mesh = "homedecor_ceiling_lamp.obj", + tiles = { + "homedecor_tile_brass2.png", + "homedecor_ceiling_lamp_glass.png", + "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", + "homedecor_generic_brown_plastic.png", + }, + inventory_image = "homedecor_ceiling_lamp_inv.png", + light_source = LIGHT_MAX, + groups = {snappy=3}, + on_punch = function(pos, node, puncher) + minetest.set_node(pos, {name = "homedecor:ceiling_lamp_off"}) + end, +}) + +homedecor.register("ceiling_lamp_off", { + description = S("Ceiling Lamp (off)"), + mesh = "homedecor_ceiling_lamp.obj", + tiles = { + "homedecor_tile_brass2.png", + "homedecor_ceiling_lamp_glass.png", + "homedecor_table_standing_lamp_lightbulb.png", + "homedecor_generic_brown_plastic.png", + }, + groups = {snappy=3, not_in_creative_inventory=1}, + on_punch = function(pos, node, puncher) + minetest.set_node(pos, {name = "homedecor:ceiling_lamp"}) + end, + drop = "homedecor:ceiling_lamp" +}) + diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 43c2ccf9..735ea36a 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -687,7 +687,11 @@ for _, i in ipairs(n) do homedecor.register("picture_frame"..i, { description = S("Picture Frame"), mesh = "homedecor_picture_frame.obj", - tiles = { "homedecor_picture_frame"..i..".png" }, + tiles = { + "homedecor_picture_frame_image"..i..".png", + "homedecor_picture_frame_edges.png", + "homedecor_picture_frame_back.png", + }, inventory_image = "homedecor_picture_frame"..i.."_inv.png", wield_image = "homedecor_picture_frame"..i.."_inv.png", groups = {snappy = 3}, @@ -695,3 +699,4 @@ for _, i in ipairs(n) do collision_box = pframe_cbox, }) end + diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png new file mode 100644 index 00000000..981c5999 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png new file mode 100644 index 00000000..0e976a29 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png new file mode 100644 index 00000000..d3f80486 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png new file mode 100644 index 00000000..c87713dd Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png new file mode 100644 index 00000000..86f1aaf2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png new file mode 100644 index 00000000..b045c262 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png new file mode 100644 index 00000000..6ae61d06 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png new file mode 100644 index 00000000..cddbc702 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png new file mode 100644 index 00000000..f62ea75f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_brass_inv.png new file mode 100644 index 00000000..ed1c6da2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_brass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png new file mode 100644 index 00000000..ab247ca2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png new file mode 100644 index 00000000..ac590f90 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png new file mode 100644 index 00000000..1df87fe3 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png new file mode 100644 index 00000000..2eb8a1bf Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png new file mode 100644 index 00000000..7362346e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_bottom.png deleted file mode 100644 index 96ef49a3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_inv.png deleted file mode 100644 index 3a036b8d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_top.png deleted file mode 100644 index 39aaa721..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrb.png deleted file mode 100644 index 8b5eb902..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrt.png deleted file mode 100644 index a71b4001..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_bottom.png deleted file mode 100644 index dc0e3a96..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_top.png deleted file mode 100644 index 3294ad2e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_tb.png deleted file mode 100644 index aaa38f03..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png new file mode 100644 index 00000000..cdd43459 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_inv.png new file mode 100644 index 00000000..08cd6f3d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_bottom.png deleted file mode 100644 index 7a78c707..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_inv.png deleted file mode 100644 index 401138b1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_top.png deleted file mode 100644 index 4a7b7801..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrb.png deleted file mode 100644 index 76d9784d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrt.png deleted file mode 100644 index 76d9784d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_bottom.png deleted file mode 100644 index 7562476d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_top.png deleted file mode 100644 index 53d1b47a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_tb.png deleted file mode 100644 index ea98dda1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png new file mode 100644 index 00000000..2ae813e9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_inv.png new file mode 100644 index 00000000..42cdc9b3 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_bottom.png deleted file mode 100644 index b9930a4f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_inv.png deleted file mode 100644 index 9ae0be4d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_top.png deleted file mode 100644 index 8f3c4e2b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrb.png deleted file mode 100644 index 76d46c72..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrt.png deleted file mode 100644 index 76d46c72..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_bottom.png deleted file mode 100644 index 1f0ee7bd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_top.png deleted file mode 100644 index 19b88759..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_tb.png deleted file mode 100644 index ba9e4832..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png new file mode 100644 index 00000000..856526e4 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png new file mode 100644 index 00000000..a76ddfd2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png new file mode 100644 index 00000000..80b5210b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_bottom.png deleted file mode 100644 index 2a5362bd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_inv.png deleted file mode 100644 index 8d56a327..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_top.png deleted file mode 100644 index 35aa70fd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrb.png deleted file mode 100644 index 2871d4a4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrt.png deleted file mode 100644 index 2871d4a4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_bottom.png deleted file mode 100644 index 27d93f6c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_top.png deleted file mode 100644 index 798154fa..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_tb.png deleted file mode 100644 index 90805bb0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png new file mode 100644 index 00000000..9cae490b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_left.png deleted file mode 100644 index 8e96410a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_right.png deleted file mode 100644 index 5f88c610..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png new file mode 100644 index 00000000..65387889 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_bottom.png deleted file mode 100644 index cc5711bf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_inv.png deleted file mode 100644 index 99305a61..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_top.png deleted file mode 100644 index 7fad89c5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrb.png deleted file mode 100644 index 79de5bd1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrt.png deleted file mode 100644 index 79de5bd1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_bottom.png deleted file mode 100644 index cd465c27..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_top.png deleted file mode 100644 index b473cf9f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_tb.png deleted file mode 100644 index b15a3883..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_left.png deleted file mode 100644 index 9749cdfa..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_right.png deleted file mode 100644 index b05bc9bf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png new file mode 100644 index 00000000..7f2605a7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png new file mode 100644 index 00000000..e6676c2e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_inv.png deleted file mode 100644 index 1f6107cd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_bottom.png deleted file mode 100644 index ab6f8977..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_inv.png deleted file mode 100644 index ca631d0e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_top.png deleted file mode 100644 index 58a456eb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrb.png deleted file mode 100644 index a604d057..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrt.png deleted file mode 100644 index a604d057..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png new file mode 100644 index 00000000..97b56134 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png index dbd7d9ee..ce18333c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_bottom.png deleted file mode 100644 index 844a1f79..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_inv.png deleted file mode 100644 index 64807a42..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_top.png deleted file mode 100644 index 39523889..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrb.png deleted file mode 100644 index fd0b22af..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrt.png deleted file mode 100644 index fd0b22af..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_bottom.png deleted file mode 100644 index f71859e9..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_top.png deleted file mode 100644 index aef4300d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_tb.png deleted file mode 100644 index 7ce4e72a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png new file mode 100644 index 00000000..52916b78 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png new file mode 100644 index 00000000..85c6198d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_bottom.png deleted file mode 100644 index dfe129a5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_top.png deleted file mode 100644 index 7e37f20b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_tb.png deleted file mode 100644 index 1e483e46..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png new file mode 100644 index 00000000..9d35964f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png index eeb6524c..a6c1e74a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_bottom.png deleted file mode 100644 index 106a90a5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_inv.png deleted file mode 100644 index 7153a836..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_top.png deleted file mode 100644 index fdb20274..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrb.png deleted file mode 100644 index 47d6be99..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrt.png deleted file mode 100644 index 47d6be99..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_bottom.png deleted file mode 100644 index d4af08f2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_top.png deleted file mode 100644 index 28817f60..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_tb.png deleted file mode 100644 index dcdf5d8e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain.png new file mode 100644 index 00000000..6b12552c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_inv.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_inv.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_inv.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_bottom.png deleted file mode 100644 index 1db0a8fc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_top.png deleted file mode 100644 index e824e577..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrb.png deleted file mode 100644 index 06062dff..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrt.png deleted file mode 100644 index 06062dff..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_bottom.png deleted file mode 100644 index acfc4d41..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_top.png deleted file mode 100644 index 03d33ddc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_tb.png deleted file mode 100644 index fcd5c3f0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png new file mode 100644 index 00000000..beaabbd3 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_inv.png similarity index 72% rename from mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_inv.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_inv.png index 4b6f7381..9afd7cf4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_bottom.png deleted file mode 100644 index b09252af..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_top.png deleted file mode 100644 index 93fab81c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrb.png deleted file mode 100644 index 2edb0006..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrt.png deleted file mode 100644 index 2edb0006..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_bottom.png deleted file mode 100644 index 52d99a8b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_top.png deleted file mode 100644 index 0b0b9811..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_tb.png deleted file mode 100644 index 547d830d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png new file mode 100644 index 00000000..43331df6 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_bottom.png deleted file mode 100644 index a985f33e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_inv.png deleted file mode 100644 index 646e17cf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_top.png deleted file mode 100644 index b9c8a18c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrb.png deleted file mode 100644 index d03c99ba..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrt.png deleted file mode 100644 index 54ebda35..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_bottom.png deleted file mode 100644 index 3ab50bf7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_top.png deleted file mode 100644 index 524b09cf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_tb.png deleted file mode 100644 index b3b5c934..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png new file mode 100644 index 00000000..e5a04d34 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png new file mode 100644 index 00000000..fb348853 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png new file mode 100644 index 00000000..14d9ce2c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png new file mode 100644 index 00000000..9fbd6f46 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_bottom.png deleted file mode 100644 index 27a8cd47..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_inv.png deleted file mode 100644 index 1ee1ed54..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_top.png deleted file mode 100644 index 6daac97d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_left_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrb.png deleted file mode 100644 index 74e6647d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrt.png deleted file mode 100644 index 4e891639..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_bottom.png deleted file mode 100644 index e5ba5a2c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_top.png deleted file mode 100644 index dc30d38a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_right_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_tb.png deleted file mode 100644 index 6e36033a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_brown_plastic.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_brown_plastic.png new file mode 100644 index 00000000..f5d6484e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_brown_plastic.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_bottom.png deleted file mode 100644 index 3a657c96..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_top.png deleted file mode 100644 index ccdee506..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_door_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png new file mode 100644 index 00000000..7c4e7a90 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_bottom.png deleted file mode 100644 index adcaf79a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_edges.png deleted file mode 100644 index cefc6764..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_edges.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_middle.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_middle.png deleted file mode 100644 index f6a6bd3e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_middle.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_top.png deleted file mode 100644 index ed8af435..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wall_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wood.png new file mode 100644 index 00000000..b281909e Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1.png deleted file mode 100644 index e07854c2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png index c984196b..4bdef43e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2.png deleted file mode 100644 index 6917fbdd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png index e6fae20f..51494da5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png new file mode 100644 index 00000000..800e1f44 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png new file mode 100644 index 00000000..a134b745 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png new file mode 100644 index 00000000..ba3cb7e8 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png new file mode 100644 index 00000000..ec13c2a9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/depends.txt b/mods/homedecor_modpack/homedecor_3d_extras/depends.txt index 2daa1313..e6de01ae 100755 --- a/mods/homedecor_modpack/homedecor_3d_extras/depends.txt +++ b/mods/homedecor_modpack/homedecor_3d_extras/depends.txt @@ -1,3 +1,3 @@ default moreblocks? - +vessels? diff --git a/mods/homedecor_modpack/homedecor_3d_extras/init.lua b/mods/homedecor_modpack/homedecor_3d_extras/init.lua index 0a45ee3e..32b25f3f 100755 --- a/mods/homedecor_modpack/homedecor_3d_extras/init.lua +++ b/mods/homedecor_modpack/homedecor_3d_extras/init.lua @@ -10,6 +10,20 @@ minetest.override_item("default:bookshelf", { paramtype2 = "facedir", }) +if minetest.get_modpath("vessels") and minetest.registered_nodes["vessels:shelf"] then + minetest.override_item("vessels:shelf", { + drawtype = "mesh", + mesh = "3dvesselshelf.obj", + tiles = { + "default_wood.png", + "default_wood.png^3dbookshelf_inside_back.png", + "3dvesselshelf_glass.png", + }, + use_texture_alpha = true, + paramtype = "light", + paramtype2 = "facedir", + }) +end if minetest.get_modpath("moreblocks") then minetest.override_item("moreblocks:empty_bookshelf", { diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png new file mode 100644 index 00000000..7ae79c68 Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png differ diff --git a/mods/homedecor_modpack/signs_lib/init.lua b/mods/homedecor_modpack/signs_lib/init.lua index d4b01767..29d4784e 100755 --- a/mods/homedecor_modpack/signs_lib/init.lua +++ b/mods/homedecor_modpack/signs_lib/init.lua @@ -553,7 +553,8 @@ signs_lib.update_sign = function(pos, fields, owner) elseif signnode.name == "signs:sign_hanging" then sign_info = signs_lib.hanging_sign_model.textpos[minetest.get_node(pos).param2 + 1] elseif string.find(signnode.name, "sign_wall") then - if signnode.name == "default:sign_wall" then + if signnode.name == "default:sign_wall" + or signnode.name == "locked_sign:sign_wall_locked" then sign_info = signs_lib.regular_wall_sign_model.textpos[minetest.get_node(pos).param2 + 1] else sign_info = signs_lib.metal_wall_sign_model.textpos[minetest.get_node(pos).param2 + 1]