diff --git a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua index 57a297f6..dfe742d7 100755 --- a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua @@ -148,7 +148,7 @@ homedecor.register("shower_tray", { --Shower Head local sh_cbox = { type = "fixed", - fixed = { -0.2, -0.4, -0.1, 0.2, 0.1, 0.5 } + fixed = { -0.2, -0.4, -0.05, 0.2, 0.1, 0.5 } } homedecor.register("shower_head", { @@ -177,6 +177,7 @@ homedecor.register("bathroom_set", { "homedecor_bathroom_set_cup.png", "homedecor_bathroom_set_toothpaste.png", }, + inventory_image = "homedecor_bathroom_set_inv.png", description = "Bathroom sundries set", groups = {snappy=3}, selection_box = bs_cbox, diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index ac950054..6ba000a4 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -3039,6 +3039,15 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:ceiling_lantern 2", + recipe = { + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + { "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" }, + { "", "default:iron_lump", "" }, + }, +}) + minetest.register_craft({ output = "homedecor:desk_globe", recipe = { @@ -3066,6 +3075,24 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:bathroom_set", + recipe = { + { "", "homedecor:glass_table_small_round", "" }, + { "homedecor:plastic_sheeting", "homedecor:glass_table_small_round", "homedecor:plastic_sheeting" }, + { "group:stick", "homedecor:plastic_sheeting", "group:stick" } + }, +}) + +minetest.register_craft({ + output = "homedecor:trash_can_green", + recipe = { + { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "dye:green", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + }, +}) + 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/furniture.lua b/mods/homedecor_modpack/homedecor/furniture.lua index 49d53ba6..6e53c22a 100755 --- a/mods/homedecor_modpack/homedecor/furniture.lua +++ b/mods/homedecor_modpack/homedecor/furniture.lua @@ -210,16 +210,16 @@ local function bed_extension(pos, color) local fdir = thisnode.param2 - if string.find(topnode.name, "homedecor:bed_.*_foot$") then + if string.find(topnode.name, "homedecor:bed_.*_regular$") then if fdir == topnode.param2 then - local newnode = string.gsub(thisnode.name, "_foot", "_footext") + 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_.*_foot$") then + if string.find(bottomnode.name, "homedecor:bed_.*_regular$") then if fdir == bottomnode.param2 then - local newnode = string.gsub(bottomnode.name, "_foot", "_footext") + 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 @@ -228,161 +228,99 @@ 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_.*_footext$") then - local newnode = string.gsub(bottomnode.name, "_footext", "_foot") + 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 } +} + for _, color in ipairs(bedcolors) do - - homedecor.register("bed_"..color.."_head", { + local color2=color + if color == "darkgrey" then + color2 = "dark_grey" + end + homedecor.register("bed_"..color.."_regular", { + mesh = "homedecor_bed_regular.obj", tiles = { - "homedecor_bed_"..color.."_top1.png", - "homedecor_bed_bottom1.png", - "homedecor_bed_"..color.."_side1.png", - "homedecor_bed_"..color.."_side1.png^[transformFX", - "homedecor_bed_head1.png", - "homedecor_bed_"..color.."_head2.png" - }, - groups = {snappy=3, not_in_creative_inventory=1}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.4375, -0.375, 0.5, 0.5}, -- NodeBox1 - {0.375, -0.5, 0.4375, 0.5, 0.5, 0.5}, -- NodeBox2 - {-0.5, 0.25, 0.4375, 0.5, 0.4375, 0.5}, -- NodeBox3 - {-0.5, -0.0625, 0.4375, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox5 - {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6 - {-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375}, -- NodeBox7 - {-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox8 - } - }, - selection_box = homedecor.nodebox.null - }) - - homedecor.register("bed_"..color.."_foot", { - tiles = { - "homedecor_bed_"..color.."_top2.png", - "homedecor_bed_bottom2.png", - "homedecor_bed_"..color.."_side2.png", - "homedecor_bed_"..color.."_side2.png^[transformFX", - "homedecor_bed_foot2.png", - "homedecor_bed_"..color.."_foot1.png" + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", -- pillow }, inventory_image = "homedecor_bed_"..color.."_inv.png", description = S("Bed (%s)"):format(color), groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, -0.375, 0.1875, -0.4375}, -- NodeBox1 - {0.375, -0.5, -0.5, 0.5, 0.1875, -0.4375}, -- NodeBox2 - {-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3 - {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox4 - {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, -- NodeBox5 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } - }, + selection_box = bed_cbox, + collision_box = bed_cbox, on_construct = function(pos) bed_extension(pos, color) end, - expand = { forward = "homedecor:bed_"..color.."_head" }, + expand = { forward = "air" }, after_unexpand = function(pos) unextend_bed(pos, color) end, }) - homedecor.register("bed_"..color.."_footext", { + homedecor.register("bed_"..color.."_extended", { + mesh = "homedecor_bed_extended.obj", tiles = { - "homedecor_bed_"..color.."_top2.png", - "homedecor_bed_bottom2.png", - "homedecor_bed_"..color.."_side2ext.png", - "homedecor_bed_"..color.."_side2ext.png^[transformFX", - "homedecor_bed_foot2ext.png", - "homedecor_bed_"..color.."_foot1ext.png" + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", }, groups = {snappy=3, not_in_creative_inventory=1}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, -0.375, 0.5, -0.4375}, -- NodeBox1 - {0.375, -0.5, -0.5, 0.5, 0.5, -0.4375}, -- NodeBox2 - {-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3 - {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox4 - {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, -- NodeBox5 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } - }, - expand = { forward = "homedecor:bed_"..color.."_head" }, + selection_box = bed_cbox, + collision_box = bed_cbox, + expand = { forward = "air" }, after_unexpand = function(pos) unextend_bed(pos, color) end, - drop = "homedecor:bed_"..color.."_foot" + drop = "homedecor:bed_"..color.."_regular" }) + 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") + end -homedecor.register("wardrobe_top", { - tiles = { - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood.png^[transformR90", - "forniture_wood.png^[transformR270", - "forniture_wood.png^[transformR90", - "homedecor_wardrobe_frontt.png" - }, - groups = {snappy=3, not_in_creative_inventory=1}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {0.0625, -0.4375, -0.5, 0.4375, 0.4375, -0.4375}, -- NodeBox2 - {-0.4375, -0.4375, -0.5, -0.0625, 0.4375, -0.4375}, -- NodeBox3 - } - }, - selection_box = homedecor.nodebox.null, -}) +local wd_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } +} homedecor.register("wardrobe_bottom", { + mesh = "homedecor_bedroom_wardrobe.obj", tiles = { "forniture_wood.png", - "forniture_wood.png^[transformR180", - "forniture_wood.png^[transformR90", - "forniture_wood.png^[transformR270", - "forniture_wood.png^[transformR90", - "homedecor_wardrobe_frontb.png" + "homedecor_wardrobe_drawers.png", + "homedecor_wardrobe_doors.png" }, inventory_image = "homedecor_wardrobe_inv.png", description = "Wardrobe", groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.4375, -0.375, -0.5, 0.4375, -0.125, -0.4375}, -- NodeBox2 - {-0.4375, -0.0625, -0.5, 0.4375, 0.1875, -0.4375}, -- NodeBox3 - {-0.4375, 0.25, -0.5, 0.4375, 0.5, -0.4375}, -- NodeBox4 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } - }, - expand = { top="homedecor:wardrobe_top" }, + selection_box = wd_cbox, + collision_box = wd_cbox, + expand = { top="air" }, infotext = S("Wardrobe cabinet"), inventory = { size=24, }, }) +minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") +minetest.register_alias("homedecor:wardrobe_top", "air") + homedecor.register("wall_shelf", { description = "Wall Shelf", tiles = { diff --git a/mods/homedecor_modpack/homedecor/furniture_medieval.lua b/mods/homedecor_modpack/homedecor/furniture_medieval.lua index a780d313..d6b83f17 100755 --- a/mods/homedecor_modpack/homedecor/furniture_medieval.lua +++ b/mods/homedecor_modpack/homedecor/furniture_medieval.lua @@ -42,68 +42,19 @@ homedecor.register("L_binding_bars", { groups = {cracky=1,} }) +local chain_cbox = { + type = "fixed", + fixed = {-1/2, -1/2, 1/4, 1/2, 1/2, 1/2}, +} + homedecor.register("chains", { description = S("Chains"), + mesh = "forniture_chains.obj", tiles = { "forniture_black_metal.png" }, inventory_image="3dforniture_inv_chains.png", sunlight_propagates = true, - node_box = { - type = "fixed", - fixed = { - { -0.45, 0.25, 0.45, -0.20, 0.50, 0.50, }, - { -0.35, 0.40, 0.35, -0.30, 0.45, 0.45, }, - { -0.35, 0.30, 0.35, -0.30, 0.35, 0.45, }, - { -0.35, 0.35, 0.30, -0.30, 0.40, 0.35, }, - { -0.40, 0.35, 0.35, -0.25, 0.40, 0.40, }, - { -0.40, 0.15, 0.35, -0.25, 0.20, 0.40, }, - { -0.45, 0.20, 0.35, -0.40, 0.35, 0.40, }, - { -0.25, 0.20, 0.35, -0.20, 0.35, 0.40, }, - { -0.35, 0.20, 0.30, -0.30, 0.25, 0.45, }, - { -0.35, 0.00, 0.30, -0.30, 0.05, 0.45, }, - { -0.35, 0.05, 0.25, -0.30, 0.20, 0.30, }, - { -0.35, 0.05, 0.45, -0.30, 0.20, 0.50, }, - { -0.40, 0.05, 0.35, -0.25, 0.10, 0.40, }, - { -0.40, -0.15, 0.35, -0.25, -0.10, 0.40, }, - { -0.45, -0.10, 0.35, -0.40, 0.05, 0.40, }, - { -0.25, -0.10, 0.35, -0.20, 0.05, 0.40, }, - { -0.35, -0.10, 0.30, -0.30, -0.05, 0.45, }, - { -0.35, -0.30, 0.30, -0.30, -0.25, 0.45, }, - { -0.35, -0.25, 0.25, -0.30, -0.10, 0.30, }, - { -0.35, -0.25, 0.45, -0.30, -0.10, 0.50, }, - { -0.40, -0.25, 0.35, -0.25, -0.20, 0.40, }, - { -0.40, -0.45, 0.35, -0.25, -0.40, 0.40, }, - { -0.45, -0.40, 0.35, -0.40, -0.25, 0.40, }, - { -0.25, -0.40, 0.35, -0.20, -0.25, 0.40, }, - { 0.20, 0.25, 0.45, 0.45, 0.50, 0.50, }, - { 0.30, 0.40, 0.35, 0.35, 0.45, 0.45, }, - { 0.30, 0.30, 0.35, 0.35, 0.35, 0.45, }, - { 0.30, 0.35, 0.30, 0.35, 0.40, 0.35, }, - { 0.25, 0.35, 0.35, 0.40, 0.40, 0.40, }, - { 0.25, 0.15, 0.35, 0.40, 0.20, 0.40, }, - { 0.20, 0.20, 0.35, 0.25, 0.35, 0.40, }, - { 0.40, 0.20, 0.35, 0.45, 0.35, 0.40, }, - { 0.30, 0.20, 0.30, 0.35, 0.25, 0.45, }, - { 0.30, 0.00, 0.30, 0.35, 0.05, 0.45, }, - { 0.30, 0.05, 0.25, 0.35, 0.20, 0.30, }, - { 0.30, 0.05, 0.45, 0.35, 0.20, 0.50, }, - { 0.25, 0.05, 0.35, 0.40, 0.10, 0.40, }, - { 0.25, -0.15, 0.35, 0.40, -0.10, 0.40, }, - { 0.20, -0.10, 0.35, 0.25, 0.05, 0.40, }, - { 0.40, -0.10, 0.35, 0.45, 0.05, 0.40, }, - { 0.30, -0.10, 0.30, 0.35, -0.05, 0.45, }, - { 0.30, -0.30, 0.30, 0.35, -0.25, 0.45, }, - { 0.30, -0.25, 0.25, 0.35, -0.10, 0.30, }, - { 0.30, -0.25, 0.45, 0.35, -0.10, 0.50, }, - { 0.25, -0.25, 0.35, 0.40, -0.20, 0.40, }, - { 0.25, -0.45, 0.35, 0.40, -0.40, 0.40, }, - { 0.20, -0.40, 0.35, 0.25, -0.25, 0.40, }, - { 0.40, -0.40, 0.35, 0.45, -0.25, 0.40, }, - }, - }, - selection_box = { - type = "fixed", - fixed = {-1/2, -1/2, 1/4, 1/2, 1/2, 1/2}, - }, + selection_box = chain_cbox, + collision_box = chain_cbox, groups = {cracky=1}, }) diff --git a/mods/homedecor_modpack/homedecor/init.lua b/mods/homedecor_modpack/homedecor/init.lua index 8c2b8dd9..fea85109 100755 --- a/mods/homedecor_modpack/homedecor/init.lua +++ b/mods/homedecor_modpack/homedecor/init.lua @@ -149,6 +149,7 @@ dofile(homedecor.modpath.."/climate-control.lua") dofile(homedecor.modpath.."/cobweb.lua") dofile(homedecor.modpath.."/books.lua") dofile(homedecor.modpath.."/exterior.lua") +dofile(homedecor.modpath.."/trash_cans.lua") dofile(homedecor.modpath.."/handlers/locked.lua") diff --git a/mods/homedecor_modpack/homedecor/lighting.lua b/mods/homedecor_modpack/homedecor/lighting.lua index 355babc8..0ad27450 100755 --- a/mods/homedecor_modpack/homedecor/lighting.lua +++ b/mods/homedecor_modpack/homedecor/lighting.lua @@ -246,6 +246,23 @@ homedecor.register("hanging_lantern", { collision_box = hl_cbox }) +local cl_cbox = { + type = "fixed", + fixed = { -0.35, -0.45, -0.35, 0.35, 0.5, 0.35 } +} + +homedecor.register("ceiling_lantern", { + drawtype = "mesh", + mesh = "homedecor_ceiling_lantern.obj", + tiles = { "homedecor_ceiling_lantern.png" }, + inventory_image = "homedecor_ceiling_lantern_inv.png", + description = "Ceiling Lantern", + groups = {snappy=3}, + light_source = 11, + selection_box = cl_cbox, + collision_box = cl_cbox, +}) + homedecor.register("lattice_lantern_large", { description = S("Lattice lantern (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 7e380d90..1132f745 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -318,22 +318,6 @@ homedecor.register("pool_table", { minetest.register_alias("homedecor:pool_table_2", "air") -local trash_cbox = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0.125, 0.25 } -} - -homedecor.register("trash_can", { - drawtype = "mesh", - mesh = "homedecor_trash_can.obj", - tiles = { "homedecor_trash_can.png" }, - inventory_image = "homedecor_trash_can_inv.png", - description = "Trash Can", - groups = {snappy=3}, - selection_box = trash_cbox, - collision_box = trash_cbox, -}) - homedecor.register("coatrack_wallmount", { tiles = { "forniture_wood.png" }, inventory_image = "homedecor_coatrack_wallmount_inv.png", @@ -639,67 +623,28 @@ homedecor.register("beer_mug", { collision_box = beer_cbox }) -homedecor.register("tool_cabinet_bottom", { +homedecor.register("tool_cabinet", { description = "Metal tool cabinet and work table", + mesh = "homedecor_tool_cabinet.obj", tiles = { - "homedecor_tool_cabinet_bottom_top.png", - "homedecor_tool_cabinet_bottom_sides.png", - "homedecor_tool_cabinet_bottom_sides.png", - "homedecor_tool_cabinet_bottom_sides.png", - "homedecor_tool_cabinet_bottom_sides.png", - "homedecor_tool_cabinet_bottom_front.png" + "homedecor_red_metal.png", + "homedecor_tool_cabinet_drawers.png", + "homedecor_green_metal.png", + "forniture_metal.png", + "homedecor_bright_metal.png", + "homedecor_tool_cabinet_misc.png", }, inventory_image = "homedecor_tool_cabinet_inv.png", groups = { snappy=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.4375, -0.4375, -0.375, 0.5}, -- NodeBox1 - {-0.5, -0.5, -0.5, -0.4375, -0.375, -0.4375}, -- NodeBox2 - {0.4375, -0.5, 0.4375, 0.5, -0.375, 0.5}, -- NodeBox3 - {0.4375, -0.5, -0.5, 0.5, -0.375, -0.4375}, -- NodeBox4 - {-0.5, -0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox5 - } - }, selection_box = homedecor.nodebox.slab_y(2), - expand = { top="homedecor:tool_cabinet_top" }, + expand = { top="air" }, inventory = { size=24, } }) -homedecor.register("tool_cabinet_top", { - tiles = { - "homedecor_tool_cabinet_top_top.png", - "homedecor_tool_cabinet_top_bottom.png", - "homedecor_tool_cabinet_top_right.png", - "homedecor_tool_cabinet_top_left.png", - "homedecor_tool_cabinet_top_back.png", - "homedecor_tool_cabinet_top_front.png" - }, - groups = { snappy=3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, 0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.5, -0.5, -0.4375, -0.1875, -0.4375, 0.125}, -- NodeBox2 - {-0.375, -0.4375, 0, -0.3125, 0.1875, 0.0625}, -- NodeBox3 - {-0.4375, -0.1875, -0.375, -0.25, 0.125, 0.125}, -- NodeBox4 - {-0.25, -0.0625, -0.3125, -0.22, 0.3125, -0.2825}, -- NodeBox5 - {-0.375, -0.1875, -0.25, -0.3125, -0.218, -0.3125}, -- NodeBox6 - {-0.35, -0.32, -0.285, -0.3375, -0.218, -0.2725}, -- NodeBox7 - {0, -0.3125, 0.375, 0.0625, 0.1875, 0.4375}, -- NodeBox8 - {0.125, 0.1875, 0.375, 0.1875, 0.25, 0.4375}, -- NodeBox9 - {-0.0625, 0.1875, 0.375, 0.125, 0.3125, 0.4375}, -- NodeBox10 - {0.343, -0.125, 0.42, 0.375, 0.125, 0.4375}, -- NodeBox11 - {0.3125, 0.095, 0.42, 0.343, 0.1575, 0.4375}, -- NodeBox12 - {0.375, 0.095, 0.42, 0.405, 0.1575, 0.4375}, -- NodeBox13 - {0.3125, -0.155, 0.42, 0.343, -0.093, 0.4375}, -- NodeBox14 - {0.375, -0.155, 0.42, 0.405, -0.093, 0.4375}, -- NodeBox15 - } - }, - selection_box = homedecor.nodebox.null -}) +minetest.register_alias("homedecor:tool_cabinet_bottom", "homedecor:tool_cabinet") +minetest.register_alias("homedecor:tool_cabinet_top", "air") homedecor.register("calendar", { description = "Calendar", diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_trash_all.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_trash_all.ogg new file mode 100644 index 00000000..85c3f66c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/sounds/homedecor_trash_all.ogg differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_inv.png new file mode 100644 index 00000000..fb5944a5 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1.png deleted file mode 100755 index 91331503..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1ext.png deleted file mode 100755 index ced2d21e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_head2.png deleted file mode 100755 index 1a3a17bf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png old mode 100755 new mode 100644 index 80dccf30..33d61df7 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side1.png deleted file mode 100755 index 140695f0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2.png deleted file mode 100755 index cf9dd9a7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2ext.png deleted file mode 100755 index 852f1d5f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top1.png deleted file mode 100755 index eb2b6416..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top2.png deleted file mode 100755 index f94d7412..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png new file mode 100644 index 00000000..da22974a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom1.png deleted file mode 100755 index 1fdc017f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom2.png deleted file mode 100755 index 7c966bdf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1.png deleted file mode 100755 index 36c011c5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1ext.png deleted file mode 100755 index f4bf9b95..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_head2.png deleted file mode 100755 index ec1f79bc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png old mode 100755 new mode 100644 index e3e324f1..5a7da3c6 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side1.png deleted file mode 100755 index 4cefd745..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2.png deleted file mode 100755 index 92471902..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2ext.png deleted file mode 100755 index 3df548db..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top1.png deleted file mode 100755 index 80bffcb2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top2.png deleted file mode 100755 index b0de9127..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1.png deleted file mode 100755 index 97d2645c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1ext.png deleted file mode 100755 index 2bc65786..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_head2.png deleted file mode 100755 index dd45fede..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png old mode 100755 new mode 100644 index dad4d492..db27f736 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side1.png deleted file mode 100755 index e27e344a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2.png deleted file mode 100755 index c59f6bf2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2ext.png deleted file mode 100755 index 39a54c30..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top1.png deleted file mode 100755 index f244115c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top2.png deleted file mode 100755 index 87e05ee0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2.png deleted file mode 100755 index 5ff349b9..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png deleted file mode 100755 index 4f999e6f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png new file mode 100644 index 00000000..7ff2ff5d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1.png deleted file mode 100755 index a6b7618d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1ext.png deleted file mode 100755 index 51c10e1a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_head2.png deleted file mode 100755 index 0ec5348e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png old mode 100755 new mode 100644 index a6f32dbd..e3c19af2 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side1.png deleted file mode 100755 index a068ddba..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2.png deleted file mode 100755 index 3143b567..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2ext.png deleted file mode 100755 index c20a0125..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top1.png deleted file mode 100755 index e57abac1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top2.png deleted file mode 100755 index 672dc643..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_head1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_head1.png deleted file mode 100755 index e80496fd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_head1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1.png deleted file mode 100755 index 4ba7d6fc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1ext.png deleted file mode 100755 index dbfa1c5e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_head2.png deleted file mode 100755 index af4e0d4d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png old mode 100755 new mode 100644 index a0832692..bf2dff81 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side1.png deleted file mode 100755 index 7777c3f2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2.png deleted file mode 100755 index 2168e967..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2ext.png deleted file mode 100755 index 37d17c6a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top1.png deleted file mode 100755 index 4f02c140..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top2.png deleted file mode 100755 index 3352185f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1.png deleted file mode 100755 index 56cb6d40..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1ext.png deleted file mode 100755 index d7943075..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_head2.png deleted file mode 100755 index 66db14de..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png old mode 100755 new mode 100644 index b6f33ecf..d261a724 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side1.png deleted file mode 100755 index 866d6719..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2.png deleted file mode 100755 index fab74ebd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2ext.png deleted file mode 100755 index 88509183..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top1.png deleted file mode 100755 index 09774c5b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top2.png deleted file mode 100755 index 92f7d148..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1.png deleted file mode 100755 index 39e9dd95..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1ext.png deleted file mode 100755 index 51370fab..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_head2.png deleted file mode 100755 index 8ea7a2dc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png old mode 100755 new mode 100644 index bb0c00fd..166bf4ee Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side1.png deleted file mode 100755 index d744e0e1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2.png deleted file mode 100755 index 132a2b54..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2ext.png deleted file mode 100755 index 6022e11a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top1.png deleted file mode 100755 index e7729ab2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top2.png deleted file mode 100755 index 5fb4eae0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1.png deleted file mode 100755 index 706436fe..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1ext.png deleted file mode 100755 index c46a2c61..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_head2.png deleted file mode 100755 index f3723ef1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png old mode 100755 new mode 100644 index 23e74c72..9e4f963b Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side1.png deleted file mode 100755 index fe7a1e5f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2.png deleted file mode 100755 index 3d1a8ac3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2ext.png deleted file mode 100755 index 84f0585d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top1.png deleted file mode 100755 index c3f36442..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top2.png deleted file mode 100755 index 850ac973..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1.png deleted file mode 100755 index 92543d5a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1ext.png deleted file mode 100755 index 0578713b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_foot1ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_head2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_head2.png deleted file mode 100755 index 16697188..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_head2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png old mode 100755 new mode 100644 index 7da1c5a6..8ab16537 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side1.png deleted file mode 100755 index 349621de..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2.png deleted file mode 100755 index 9be30083..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2ext.png deleted file mode 100755 index 56d05d20..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_side2ext.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top1.png deleted file mode 100755 index 86dd0b81..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top2.png deleted file mode 100755 index fe5028cf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern.png new file mode 100644 index 00000000..77a00923 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png new file mode 100644 index 00000000..14e01720 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_green_metal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_green_metal.png new file mode 100644 index 00000000..90cde47c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_green_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_red_metal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_red_metal.png new file mode 100644 index 00000000..ed579d94 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_red_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_front.png deleted file mode 100755 index bc548ac4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_sides.png deleted file mode 100755 index 16651c3c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_top.png deleted file mode 100755 index b736d9f3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_bottom_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png new file mode 100644 index 00000000..8233f928 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png old mode 100755 new mode 100644 index 234a40c5..56f8b208 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png new file mode 100644 index 00000000..161fbc03 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_back.png deleted file mode 100755 index 87eacdd9..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_bottom.png deleted file mode 100755 index f7bce987..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_front.png deleted file mode 100755 index 3c119e55..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_left.png deleted file mode 100755 index bb4fe636..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_right.png deleted file mode 100755 index dd32dcb0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_top.png deleted file mode 100755 index f816f889..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png new file mode 100644 index 00000000..e76f1b91 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_back2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_back2.png deleted file mode 100755 index 59c00188..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_back2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png new file mode 100644 index 00000000..047e836f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png new file mode 100644 index 00000000..f96356f1 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontb.png deleted file mode 100755 index 94cc3dae..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontt.png deleted file mode 100755 index bc1d2e46..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_frontt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png new file mode 100644 index 00000000..254bb33b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/trash_cans.lua b/mods/homedecor_modpack/homedecor/trash_cans.lua new file mode 100644 index 00000000..e9367c35 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/trash_cans.lua @@ -0,0 +1,88 @@ +local S = homedecor.gettext + +local tg_cbox = { + type = "fixed", + fixed = { -0.35, -0.5, -0.35, 0.35, 0.4, 0.35 } +} + +homedecor.register("trash_can_green", { + drawtype = "mesh", + mesh = "homedecor_trash_can_green.obj", + tiles = { "homedecor_pool_table_baize.png" }, + inventory_image = "homedecor_trash_can_green_inv.png", + description = "Trash Can (green)", + groups = {snappy=3}, + selection_box = tg_cbox, + collision_box = tg_cbox, + on_punch = function(pos, node, puncher, pointed_thing) + minetest.set_node(pos, {name = "homedecor:trash_can_green_open", param2 = node.param2}) + end + +}) + +homedecor.register("trash_can_green_open", { + drawtype = "mesh", + mesh = "homedecor_trash_can_green_open.obj", + tiles = { "homedecor_pool_table_baize.png" }, + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = tg_cbox, + collision_box = tg_cbox, + on_punch = function(pos, node, puncher, pointed_thing) + minetest.set_node(pos, {name = "homedecor:trash_can_green", param2 = node.param2}) + end, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[8,9]".. default.gui_bg .. default.gui_bg_img .. default.gui_slots .. + "button[2.5,3.8;3,1;empty;Empty Trash]".. + "list[current_name;main;2.5,0.5;3,3;]".. + "list[current_player;main;0,5;8,4;]") + meta:set_string("infotext", "Trash Can") + local inv = meta:get_inventory() + inv:set_size("main", 8*4) + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + minetest.log("action", S("%s moves stuff in %s at %s"):format( + player:get_player_name(), name, minetest.pos_to_string(pos) + )) + end, + on_metadata_inventory_put = function(pos, listname, index, stack, player) + minetest.log("action", S("%s moves stuff in %s at %s"):format( + player:get_player_name(), name, minetest.pos_to_string(pos) + )) + end, + on_metadata_inventory_take = function(pos, listname, index, stack, player) + minetest.log("action", S("%s takes stuff in %s at %s"):format( + player:get_player_name(), name, minetest.pos_to_string(pos) + )) + end, + on_receive_fields = function(pos, formname, fields, sender) + if fields.empty then + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + inv:set_list("main", {}) + minetest.sound_play("homedecor_trash_all", {to_player=sender:get_player_name(), gain = 1.0}) + end + end, +}) + +local trash_cbox = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0.125, 0.25 } +} + +homedecor.register("trash_can", { + drawtype = "mesh", + mesh = "homedecor_trash_can.obj", + tiles = { "homedecor_trash_can.png" }, + inventory_image = "homedecor_trash_can_inv.png", + description = "Trash Can (small)", + groups = {snappy=3}, + selection_box = trash_cbox, + collision_box = trash_cbox, +}) diff --git a/mods/homedecor_modpack/homedecor/window_treatments.lua b/mods/homedecor_modpack/homedecor/window_treatments.lua index ea55625b..73e67892 100755 --- a/mods/homedecor_modpack/homedecor/window_treatments.lua +++ b/mods/homedecor_modpack/homedecor/window_treatments.lua @@ -73,6 +73,7 @@ local wb1_cbox = { homedecor.register("blinds_thick", { description = "Window Blinds (thick)", mesh = "homedecor_windowblind_thick.obj", + inventory_image = "homedecor_windowblind_thick_inv.png", tiles = { "homedecor_windowblind_strings.png", "homedecor_windowblinds.png" @@ -92,6 +93,7 @@ local wb2_cbox = { homedecor.register("blinds_thin", { description = "Window Blinds (thin)", mesh = "homedecor_windowblind_thin.obj", + inventory_image = "homedecor_windowblind_thick_inv.png", tiles = { "homedecor_windowblind_strings.png", "homedecor_windowblinds.png"