diff --git a/mods/homedecor_modpack/building_blocks/depends.txt b/mods/homedecor_modpack/building_blocks/depends.txt index b5fb120d..9771003c 100644 --- a/mods/homedecor_modpack/building_blocks/depends.txt +++ b/mods/homedecor_modpack/building_blocks/depends.txt @@ -1,2 +1,2 @@ -default +default moreblocks? \ No newline at end of file diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index e2a8e65b..b6c1753b 100644 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -1,538 +1,571 @@ -minetest.register_node("building_blocks:Adobe", { - tiles = {"building_blocks_Adobe.png"}, - description = "Adobe", - is_ground_content = true, - groups = {crumbly=3}, - sounds = default.node_sound_stone_defaults(), -}) -minetest.register_node("building_blocks:Roofing", { - tiles = {"building_blocks_Roofing.png"}, - is_ground_content = true, - description = "Roof block", - groups = {snappy=3}, -}) -minetest.register_craft({ - output = 'building_blocks:terrycloth_towel 2', - recipe = { - {"farming:string", "farming:string", "farming:string"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Tarmac_spread 4', - recipe = { - {"building_blocks:Tar", "building_blocks:Tar"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:brobble_spread 4', - recipe = { - {"default:brick", "default:cobble", "default:brick"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Fireplace 1', - recipe = { - {"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Adobe 3', - recipe = { - {"default:sand"}, - {"default:clay"}, - {"group:stick"}, - } -}) - -minetest.register_craft({ - output = 'building_blocks:Roofing 10', - recipe = { - {"building_blocks:Adobe", "building_blocks:Adobe"}, - {"building_blocks:Adobe", "building_blocks:Adobe"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:BWtile 10', - recipe = { - {"building_blocks:Marble", "building_blocks:Tar"}, - {"building_blocks:Tar", "building_blocks:Marble"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:grate 1', - recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"default:glass", "default:glass"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:woodglass 1', - recipe = { - {"default:wood"}, - {"default:glass"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:hardwood 2', - recipe = { - {"default:wood", "default:junglewood"}, - {"default:junglewood", "default:wood"}, - } -}) - -minetest.register_craft({ - output = 'building_blocks:hardwood 2', - recipe = { - {"default:junglewood", "default:wood"}, - {"default:wood", "default:junglewood"}, - } -}) - -minetest.register_craft({ - output = 'building_blocks:sticks', - recipe = { - {'group:stick', 'group:stick'}, - {'group:stick', 'group:stick'}, - } -}) - -minetest.register_craft({ - output = 'building_blocks:fakegrass 2', - recipe = { - {'default:leaves'}, - {"default:dirt"}, - } -}) - -minetest.register_craft({ - output = 'building_blocks:tar_base 2', - recipe = { - {"default:coal_lump", "default:gravel"}, - {"default:gravel", "default:coal_lump"} - } -}) - -minetest.register_craft({ - output = 'building_blocks:tar_base 2', - recipe = { - {"default:gravel", "default:coal_lump"}, - {"default:coal_lump", "default:gravel"} - } -}) - -minetest.register_craft({ - type = "cooking", - output = "building_blocks:smoothglass", - recipe = "default:glass" -}) -minetest.register_node("building_blocks:smoothglass", { - drawtype = "glasslike", - description = "Streak Free Glass", - tiles = {"building_blocks_sglass.png"}, - inventory_image = minetest.inventorycube("building_blocks_sglass.png"), - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), -}) -minetest.register_node("building_blocks:grate", { - drawtype = "glasslike", - description = "Grate", - tiles = {"building_blocks_grate.png"}, - inventory_image = minetest.inventorycube("building_blocks_grate.png"), - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - groups = {cracky=1}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("building_blocks:Fireplace", { - description = "Fireplace", - tiles = { - "building_blocks_cast_iron.png", - "building_blocks_cast_iron.png", - "building_blocks_cast_iron.png", - "building_blocks_cast_iron_fireplace.png" - }, - paramtype = "light", - paramtype2 = "facedir", - light_source = LIGHT_MAX, - sunlight_propagates = true, - is_ground_content = true, - groups = {cracky=2}, -}) - -minetest.register_node("building_blocks:woodglass", { - drawtype = "glasslike", - description = "Wood Framed Glass", - tiles = {"building_blocks_wglass.png"}, - inventory_image = minetest.inventorycube("building_blocks_wglass.png"), - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), -}) -minetest.register_node("building_blocks:terrycloth_towel", { - drawtype = "raillike", - description = "Terrycloth towel", - tiles = {"building_blocks_towel.png"}, - inventory_image = "building_blocks_towel_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=3}, -}) -minetest.register_node("building_blocks:Tarmac_spread", { - drawtype = "raillike", - description = "Tarmac Spread", - tiles = {"building_blocks_tar.png"}, - inventory_image = "building_blocks_tar_spread_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {cracky=3}, -}) -minetest.register_node("building_blocks:BWtile", { - drawtype = "raillike", - description = "Chess board tiling", - tiles = {"building_blocks_BWtile.png"}, - inventory_image = "building_blocks_bwtile_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=3}, -}) -minetest.register_node("building_blocks:brobble_spread", { - drawtype = "raillike", - description = "Brobble Spread", - tiles = {"building_blocks_brobble.png"}, - inventory_image = "building_blocks_brobble_spread_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=3}, -}) -minetest.register_node("building_blocks:gravel_spread", { - drawtype = "raillike", - description = "Gravel Spread", - tiles = {"default_gravel.png"}, - inventory_image = "building_blocks_gravel_spread_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=2}, -}) -minetest.register_node("building_blocks:hardwood", { - tiles = {"building_blocks_hardwood.png"}, - is_ground_content = true, - description = "Hardwood", - groups = {choppy=1,flammable=1}, - sounds = default.node_sound_wood_defaults(), -}) - -if minetest.get_modpath("moreblocks") then - - stairsplus:register_all( - "building_blocks", - "marble", - "building_blocks:Marble", - { - description = "Marble", - tiles = {"building_blocks_marble.png"}, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - } - ) - stairsplus:register_all( - "building_blocks", - "hardwood", - "building_blocks:hardwood", - { - description = "Hardwood", - tiles = {"building_blocks_hardwood.png"}, - groups = {choppy=1,flammable=1}, - sounds = default.node_sound_wood_defaults(), - } - ) - stairsplus:register_all( - "building_blocks", - "fakegrass", - "building_blocks:fakegrass", - { - description = "Grass", - tiles = {"default_grass.png"}, - groups = {crumbly=3}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.4}, - }), - } - ) - stairsplus:register_all( - "building_blocks", - "tar", - "building_blocks:Tar", - { - description = "Tar", - tiles = {"building_blocks_tar.png"}, - groups = {crumbly=1}, - sounds = default.node_sound_stone_defaults(), - } - ) - stairsplus:register_all( - "building_blocks", - "grate", - "building_blocks:grate", - { - description = "Grate", - tiles = {"building_blocks_grate.png"}, - groups = {cracky=1}, - sounds = default.node_sound_stone_defaults(), - } - ) - -else - bb_stairs = {} - - -- Node will be called stairs:stair_ - function bb_stairs.register_stair(subname, recipeitem, groups, images, description) - minetest.register_node("building_blocks:stair_" .. subname, { - description = description, - drawtype = "nodebox", - tiles = images, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, - groups = groups, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - {-0.5, 0, 0, 0.5, 0.5, 0.5}, - }, - }, - }) - - minetest.register_craft({ - output = 'building_blocks:stair_' .. subname .. ' 4', - recipe = { - {recipeitem, "", ""}, - {recipeitem, recipeitem, ""}, - {recipeitem, recipeitem, recipeitem}, - }, - }) - - -- Flipped recipe for the silly minecrafters - minetest.register_craft({ - output = 'building_blocks:stair_' .. subname .. ' 4', - recipe = { - {"", "", recipeitem}, - {"", recipeitem, recipeitem}, - {recipeitem, recipeitem, recipeitem}, - }, - }) - end - - -- Node will be called stairs:slab_ - function bb_stairs.register_slab(subname, recipeitem, groups, images, description) - minetest.register_node("building_blocks:slab_" .. subname, { - description = description, - drawtype = "nodebox", - tiles = images, - paramtype = "light", - is_ground_content = true, - groups = groups, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - }) - - minetest.register_craft({ - output = 'building_blocks:slab_' .. subname .. ' 3', - recipe = { - {recipeitem, recipeitem, recipeitem}, - }, - }) - end - - -- Nodes will be called stairs:{stair,slab}_ - function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab) - bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair) - bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab) - end - bb_stairs.register_stair_and_slab("marble","building_blocks:Marble", - {cracky=3}, - {"building_blocks_marble.png"}, - "Marble stair", - "Marble slab" - ) - bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood", - {choppy=1,flammable=1}, - {"building_blocks_hardwood.png"}, - "Hardwood stair", - "Hardwood slab" - ) - bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass", - {crumbly=3}, - {"default_grass.png"}, - "Grass stair", - "Grass slab" - ) - bb_stairs.register_stair_and_slab("tar","building_blocks:Tar", - {crumbly=1}, - {"building_blocks_tar.png"}, - "Tar stair", - "Tar slab" - ) - bb_stairs.register_stair_and_slab("grate","building_blocks:grate", - {cracky=1}, - {"building_blocks_grate.png"}, - "Grate Stair", - "Grate Slab" - ) -end - - -minetest.register_craft({ - type = "fuel", - recipe = "building_blocks:hardwood", - burntime = 28, -}) - -minetest.register_node("building_blocks:fakegrass", { - tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, - description = "Fake Grass", - is_ground_content = true, - groups = {crumbly=3}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.4}, - }), -}) - -minetest.register_craftitem("building_blocks:sticks", { - description = "Small bundle of sticks", - image = "building_blocks_sticks.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem("building_blocks:tar_base", { - description = "Tar base", - image = "building_blocks_tar_base.png", -}) - ---Tar -minetest.register_craft({ - output = 'building_blocks:knife 1', - recipe = { - {"building_blocks:Tar"}, - {"group:stick"}, - } -}) - -minetest.register_alias("tar", "building_blocks:Tar") -minetest.register_alias("fakegrass", "building_blocks:fakegrass") -minetest.register_alias("tar_knife", "building_blocks:knife") -minetest.register_alias("adobe", "building_blocks:Adobe") -minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") -minetest.register_alias("hardwood", "building_blocks:hardwood") -minetest.register_alias("sticks", "building_blocks:sticks") -minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") -minetest.register_alias("marble", "building_blocks:Marble") - -minetest.register_node("building_blocks:Tar", { - description = "Tar", - tiles = {"building_blocks_tar.png"}, - is_ground_content = true, - groups = {crumbly=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}, - sounds = default.node_sound_stone_defaults(), -}) -minetest.register_craft({ - type = "fuel", - recipe = "building_blocks:sticks", - burntime = 5, -}) -minetest.register_craft({ - type = "fuel", - recipe = "building_blocks:Tar", - burntime = 40, -}) - -minetest.register_craft({ - type = "cooking", - output = "building_blocks:Tar", - recipe = "building_blocks:tar_base", -}) - -minetest.register_tool("building_blocks:knife", { - description = "Tar Knife", - inventory_image = "building_blocks_knife.png", - tool_capabilities = { - max_drop_level=0, - groupcaps={ - choppy={times={[2]=7.50, [3]=2.80}, maxwear=0.01, maxlevel=1}, - fleshy={times={[2]=5.50, [3]=2.80}, maxwear=0.01, maxlevel=1} - } - }, -}) - -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"}, - } -}) - +minetest.register_node("building_blocks:Adobe", { + tiles = {"building_blocks_Adobe.png"}, + description = "Adobe", + is_ground_content = true, + groups = {crumbly=3}, + sounds = default.node_sound_stone_defaults(), +}) +minetest.register_node("building_blocks:Roofing", { + tiles = {"building_blocks_Roofing.png"}, + is_ground_content = true, + description = "Roof block", + groups = {snappy=3}, +}) +minetest.register_craft({ + output = 'building_blocks:terrycloth_towel 2', + recipe = { + {"farming:string", "farming:string", "farming:string"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:Tarmac_spread 4', + recipe = { + {"building_blocks:Tar", "building_blocks:Tar"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:gravel_spread 4', + recipe = { + {"default:gravel", "default:gravel", "default:gravel"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:brobble_spread 4', + recipe = { + {"default:brick", "default:cobble", "default:brick"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:Fireplace 1', + recipe = { + {"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:Adobe 3', + recipe = { + {"default:sand"}, + {"default:clay"}, + {"group:stick"}, + } +}) + +minetest.register_craft({ + output = 'building_blocks:Roofing 10', + recipe = { + {"building_blocks:Adobe", "building_blocks:Adobe"}, + {"building_blocks:Adobe", "building_blocks:Adobe"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:BWtile 10', + recipe = { + {"building_blocks:Marble", "building_blocks:Tar"}, + {"building_blocks:Tar", "building_blocks:Marble"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:grate 1', + recipe = { + {"default:steel_ingot", "default:steel_ingot"}, + {"default:glass", "default:glass"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:woodglass 1', + recipe = { + {"default:wood"}, + {"default:glass"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:hardwood 2', + recipe = { + {"default:wood", "default:junglewood"}, + {"default:junglewood", "default:wood"}, + } +}) + +minetest.register_craft({ + output = 'building_blocks:hardwood 2', + recipe = { + {"default:junglewood", "default:wood"}, + {"default:wood", "default:junglewood"}, + } +}) + +minetest.register_craft({ + output = 'building_blocks:sticks', + recipe = { + {'group:stick', 'group:stick'}, + {'group:stick', 'group:stick'}, + } +}) + +minetest.register_craft({ + output = 'building_blocks:fakegrass 2', + recipe = { + {'default:leaves'}, + {"default:dirt"}, + } +}) + +minetest.register_craft({ + output = 'building_blocks:tar_base 2', + recipe = { + {"default:coal_lump", "default:gravel"}, + {"default:gravel", "default:coal_lump"} + } +}) + +minetest.register_craft({ + output = 'building_blocks:tar_base 2', + recipe = { + {"default:gravel", "default:coal_lump"}, + {"default:coal_lump", "default:gravel"} + } +}) + +minetest.register_craft({ + type = "cooking", + output = "building_blocks:smoothglass", + recipe = "default:glass" +}) +minetest.register_node("building_blocks:smoothglass", { + drawtype = "glasslike", + description = "Streak Free Glass", + tiles = {"building_blocks_sglass.png"}, + inventory_image = minetest.inventorycube("building_blocks_sglass.png"), + paramtype = "light", + sunlight_propagates = true, + is_ground_content = true, + groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), +}) +minetest.register_node("building_blocks:grate", { + drawtype = "glasslike", + description = "Grate", + tiles = {"building_blocks_grate.png"}, + inventory_image = minetest.inventorycube("building_blocks_grate.png"), + paramtype = "light", + sunlight_propagates = true, + is_ground_content = true, + groups = {cracky=1}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("building_blocks:Fireplace", { + description = "Fireplace", + tiles = { + "building_blocks_cast_iron.png", + "building_blocks_cast_iron.png", + "building_blocks_cast_iron.png", + "building_blocks_cast_iron_fireplace.png" + }, + paramtype = "light", + paramtype2 = "facedir", + light_source = LIGHT_MAX, + sunlight_propagates = true, + is_ground_content = true, + groups = {cracky=2}, +}) + +minetest.register_node("building_blocks:woodglass", { + drawtype = "glasslike", + description = "Wood Framed Glass", + tiles = {"building_blocks_wglass.png"}, + inventory_image = minetest.inventorycube("building_blocks_wglass.png"), + paramtype = "light", + sunlight_propagates = true, + is_ground_content = true, + groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), +}) +minetest.register_node("building_blocks:terrycloth_towel", { + drawtype = "raillike", + description = "Terrycloth towel", + tiles = {"building_blocks_towel.png"}, + inventory_image = "building_blocks_towel_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=3}, +}) +minetest.register_node("building_blocks:Tarmac_spread", { + drawtype = "raillike", + description = "Tarmac Spread", + tiles = {"building_blocks_tar.png"}, + inventory_image = "building_blocks_tar_spread_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {cracky=3}, +}) +minetest.register_node("building_blocks:BWtile", { + drawtype = "raillike", + description = "Chess board tiling", + tiles = {"building_blocks_BWtile.png"}, + inventory_image = "building_blocks_bwtile_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=3}, +}) +minetest.register_node("building_blocks:brobble_spread", { + drawtype = "raillike", + description = "Brobble Spread", + tiles = {"building_blocks_brobble.png"}, + inventory_image = "building_blocks_brobble_spread_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=3}, +}) +minetest.register_node("building_blocks:gravel_spread", { + drawtype = "raillike", + description = "Gravel Spread", + tiles = {"default_gravel.png"}, + inventory_image = "building_blocks_gravel_spread_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=2}, +}) +minetest.register_node("building_blocks:hardwood", { + tiles = {"building_blocks_hardwood.png"}, + is_ground_content = true, + description = "Hardwood", + groups = {choppy=1,flammable=1}, + sounds = default.node_sound_wood_defaults(), +}) + +if minetest.get_modpath("moreblocks") then + + stairsplus:register_all( + "building_blocks", + "marble", + "building_blocks:Marble", + { + description = "Marble", + tiles = {"building_blocks_marble.png"}, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + } + ) + stairsplus:register_all( + "building_blocks", + "hardwood", + "building_blocks:hardwood", + { + description = "Hardwood", + tiles = {"building_blocks_hardwood.png"}, + groups = {choppy=1,flammable=1}, + sounds = default.node_sound_wood_defaults(), + } + ) + stairsplus:register_all( + "building_blocks", + "fakegrass", + "building_blocks:fakegrass", + { + description = "Grass", + tiles = {"default_grass.png"}, + groups = {crumbly=3}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.4}, + }), + } + ) + stairsplus:register_all( + "building_blocks", + "tar", + "building_blocks:Tar", + { + description = "Tar", + tiles = {"building_blocks_tar.png"}, + groups = {crumbly=1}, + sounds = default.node_sound_stone_defaults(), + } + ) + stairsplus:register_all( + "building_blocks", + "grate", + "building_blocks:grate", + { + description = "Grate", + tiles = {"building_blocks_grate.png"}, + groups = {cracky=1}, + sounds = default.node_sound_stone_defaults(), + } + ) + stairsplus:register_all( + "building_blocks", + "Adobe", + "building_blocks:Adobe", + { + description = "Adobe", + tiles = {"building_blocks_Adobe.png"}, + groups = {crumbly=3}, + sounds = default.node_sound_stone_defaults(), + } + ) + stairsplus:register_all( + "building_blocks", + "Roofing", + "building_blocks:Roofing", + { + description = "Roofing", + tiles = {"building_blocks_Roofing.png"}, + groups = {snappy=3}, + sounds = default.node_sound_stone_defaults(), + } + ) +else + bb_stairs = {} + + -- Node will be called stairs:stair_ + function bb_stairs.register_stair(subname, recipeitem, groups, images, description) + minetest.register_node("building_blocks:stair_" .. subname, { + description = description, + drawtype = "nodebox", + tiles = images, + paramtype = "light", + paramtype2 = "facedir", + is_ground_content = true, + groups = groups, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + {-0.5, 0, 0, 0.5, 0.5, 0.5}, + }, + }, + }) + + minetest.register_craft({ + output = 'building_blocks:stair_' .. subname .. ' 4', + recipe = { + {recipeitem, "", ""}, + {recipeitem, recipeitem, ""}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + + -- Flipped recipe for the silly minecrafters + minetest.register_craft({ + output = 'building_blocks:stair_' .. subname .. ' 4', + recipe = { + {"", "", recipeitem}, + {"", recipeitem, recipeitem}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + end + + -- Node will be called stairs:slab_ + function bb_stairs.register_slab(subname, recipeitem, groups, images, description) + minetest.register_node("building_blocks:slab_" .. subname, { + description = description, + drawtype = "nodebox", + tiles = images, + paramtype = "light", + is_ground_content = true, + groups = groups, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + }, + }) + + minetest.register_craft({ + output = 'building_blocks:slab_' .. subname .. ' 3', + recipe = { + {recipeitem, recipeitem, recipeitem}, + }, + }) + end + + -- Nodes will be called stairs:{stair,slab}_ + function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab) + bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair) + bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab) + end + bb_stairs.register_stair_and_slab("marble","building_blocks:Marble", + {cracky=3}, + {"building_blocks_marble.png"}, + "Marble stair", + "Marble slab" + ) + bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood", + {choppy=1,flammable=1}, + {"building_blocks_hardwood.png"}, + "Hardwood stair", + "Hardwood slab" + ) + bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass", + {crumbly=3}, + {"default_grass.png"}, + "Grass stair", + "Grass slab" + ) + bb_stairs.register_stair_and_slab("tar","building_blocks:Tar", + {crumbly=1}, + {"building_blocks_tar.png"}, + "Tar stair", + "Tar slab" + ) + bb_stairs.register_stair_and_slab("grate","building_blocks:grate", + {cracky=1}, + {"building_blocks_grate.png"}, + "Grate Stair", + "Grate Slab" + ) + bb_stairs.register_stair_and_slab("Adobe", "building_blocks:Adobe", + {crumbly=3}, + {"building_blocks_Adobe.png"}, + "Adobe stair", + "Adobe slab" + ) + bb_stairs.register_stair_and_slab("Roofing", "building_blocks:Roofing", + {snappy=3}, + {"building_blocks_Roofing.png"}, + "Roofing stair", + "Roofing slab" + ) +end + + +minetest.register_craft({ + type = "fuel", + recipe = "building_blocks:hardwood", + burntime = 28, +}) + +minetest.register_node("building_blocks:fakegrass", { + tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, + description = "Fake Grass", + is_ground_content = true, + groups = {crumbly=3}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.4}, + }), +}) + +minetest.register_craftitem("building_blocks:sticks", { + description = "Small bundle of sticks", + image = "building_blocks_sticks.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craftitem("building_blocks:tar_base", { + description = "Tar base", + image = "building_blocks_tar_base.png", +}) + +--Tar +minetest.register_craft({ + output = 'building_blocks:knife 1', + recipe = { + {"building_blocks:Tar"}, + {"group:stick"}, + } +}) + +minetest.register_alias("tar", "building_blocks:Tar") +minetest.register_alias("fakegrass", "building_blocks:fakegrass") +minetest.register_alias("tar_knife", "building_blocks:knife") +minetest.register_alias("adobe", "building_blocks:Adobe") +minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") +minetest.register_alias("hardwood", "building_blocks:hardwood") +minetest.register_alias("sticks", "building_blocks:sticks") +minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") +minetest.register_alias("marble", "building_blocks:Marble") + +minetest.register_node("building_blocks:Tar", { + description = "Tar", + tiles = {"building_blocks_tar.png"}, + is_ground_content = true, + groups = {crumbly=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}, + sounds = default.node_sound_stone_defaults(), +}) +minetest.register_craft({ + type = "fuel", + recipe = "building_blocks:sticks", + burntime = 5, +}) +minetest.register_craft({ + type = "fuel", + recipe = "building_blocks:Tar", + burntime = 40, +}) + +minetest.register_craft({ + type = "cooking", + output = "building_blocks:Tar", + recipe = "building_blocks:tar_base", +}) + +minetest.register_tool("building_blocks:knife", { + description = "Tar Knife", + inventory_image = "building_blocks_knife.png", + tool_capabilities = { + max_drop_level=0, + groupcaps={ + choppy={times={[2]=7.50, [3]=2.80}, maxwear=0.01, maxlevel=1}, + fleshy={times={[2]=5.50, [3]=2.80}, maxwear=0.01, maxlevel=1} + } + }, +}) + +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"}, + } +}) + diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png index 28bd3fb1..46ee0550 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png index c76846fd..483c3d37 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png index 54f2bacc..9526b8b0 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png index 218c1a3a..6d4e38c0 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png index e3a6bd4d..8bb9743b 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png index 6ecd512d..fa824b8f 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png index d2a17d86..c5d750bf 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png index 507199f4..3d7987d6 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png index 844fd403..3a934fda 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png differ diff --git a/mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png index 64c505eb..be4f1d21 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png and b/mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png differ diff --git a/mods/homedecor_modpack/chains/init.lua b/mods/homedecor_modpack/chains/init.lua index 69afdd78..d0352ff1 100644 --- a/mods/homedecor_modpack/chains/init.lua +++ b/mods/homedecor_modpack/chains/init.lua @@ -107,7 +107,7 @@ minetest.register_craft({ output = 'chains:chain_top', recipe = { {'default:steel_ingot'}, - {'glooptest:chainlink'}, + {'glooptest:chainlink'}, }, }) @@ -135,7 +135,7 @@ minetest.register_craft({ output = 'chains:chain_top_brass', recipe = { {'technic:brass_ingot'}, - {'homedecor:chainlink_brass'}, + {'homedecor:chainlink_brass'}, }, }) diff --git a/mods/homedecor_modpack/chains/textures/chains_chain.png b/mods/homedecor_modpack/chains/textures/chains_chain.png index 36cb2258..1cddbfd8 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chain.png and b/mods/homedecor_modpack/chains/textures/chains_chain.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_chain_brass.png b/mods/homedecor_modpack/chains/textures/chains_chain_brass.png index d2d88aa6..950a893e 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chain_brass.png and b/mods/homedecor_modpack/chains/textures/chains_chain_brass.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_chandelier.png b/mods/homedecor_modpack/chains/textures/chains_chandelier.png index 18a61f77..bcb1cd6e 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chandelier.png and b/mods/homedecor_modpack/chains/textures/chains_chandelier.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_chandelier_brass.png b/mods/homedecor_modpack/chains/textures/chains_chandelier_brass.png index f67d7255..f58a9ad6 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chandelier_brass.png and b/mods/homedecor_modpack/chains/textures/chains_chandelier_brass.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_chandelier_brass_inv.png b/mods/homedecor_modpack/chains/textures/chains_chandelier_brass_inv.png index d5d693ad..88d2c595 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chandelier_brass_inv.png and b/mods/homedecor_modpack/chains/textures/chains_chandelier_brass_inv.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_chandelier_inv.png b/mods/homedecor_modpack/chains/textures/chains_chandelier_inv.png index 164d2fd0..86abf7b8 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_chandelier_inv.png and b/mods/homedecor_modpack/chains/textures/chains_chandelier_inv.png differ diff --git a/mods/homedecor_modpack/computer/computers.lua b/mods/homedecor_modpack/computer/computers.lua index 2d7f83ff..f622199c 100644 --- a/mods/homedecor_modpack/computer/computers.lua +++ b/mods/homedecor_modpack/computer/computers.lua @@ -1,402 +1,312 @@ -- Amiga 500 lookalike --- Fun fact: "Amiga" is spanish for "female friend" ("Amigo" is for male); --- that's why this computer was named "She Friend". computer.register("computer:shefriendSOO", { - description = "SheFriendSOO"; - tiles_off = { front=true; }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 17, 32, 32, 12 }, -- Monitor Screen - { 3, 3, 29, 26, 26, 3 }, -- Monitor Tube - { 0, 0, 0, 32, 4, 17 }, -- Keyboard - }); + description = "SheFriendSOO"; + tiles_off = { front=true; }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 17, 32, 32, 12 }, -- Monitor Screen + { 3, 3, 29, 26, 26, 3 }, -- Monitor Tube + { 0, 0, 0, 32, 4, 17 }, -- Keyboard + }); }); --- Some generic laptop. Sony VAIO came to mind when thinking about a name :) --- Fun fact: "Vanio" sounds like "baño" ("bathroom" in spanish, pronounced --- as something like "bah-nee-oh") +-- Some generic laptop computer.register("computer:vanio", { - description = "Pony Vanio"; - tiles_off = { front=true; top=true; left=true; right=true; back=true; }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 4, 32, 3, 24 }, -- Keyboard - { 0, 3, 25, 32, 21, 3 }, -- Screen - }); - node_box_off = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 4, 32, 3, 24 }, -- Keyboard - { 0, 3, 4, 32, 3, 24 }, -- Screen - }); + description = "Pony Vanio"; + tiles_off = { front=true; top=true; left=true; right=true; back=true; }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 4, 32, 3, 24 }, -- Keyboard + { 0, 3, 25, 32, 21, 3 }, -- Screen + }); + node_box_off = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 4, 32, 3, 24 }, -- Keyboard + { 0, 3, 4, 32, 3, 24 }, -- Screen + }); }); -- Sony PlayStation lookalike --- Fun fact: Swapping the first letters gives valid words :) --- Pony SureiSutteshun!!! computer.register("computer:slaystation", { - description = "Pony SlayStation"; - tiles_off = { top=true; }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 11, 32, 6, 21 }, -- Console - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 4, 5, 2, 5 }, -- Controller 2 Center - }); + description = "Pony SlayStation"; + tiles_off = { top=true; }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 11, 32, 6, 21 }, -- Console + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 4, 5, 2, 5 }, -- Controller 2 Center + }); }); -- Sony PlayStation 2 lookalike --- Fun fact: Swapping the first letters gives valid words :) --- Pony SureiSutteshun!!! computer.register("computer:slaystation2", { - description = "Pony SlayStation 2"; - tiles_off = { front=true; }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) - { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 1, 5, 2, 8 }, -- Controller 2 Center - }); + description = "Pony SlayStation 2"; + tiles_off = { front=true; }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) + { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 1, 5, 2, 8 }, -- Controller 2 Center + }); }); -- Sinclair ZX Spectrum lookalike computer.register("computer:specter", { - description = "SX Specter"; - tiles_off = { }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 3, 0, 0, 26, 4, 17 }, -- Keyboard - { 18, 0, 18, 12, 6, 14 }, -- Tape Player - }); + description = "SX Specter"; + tiles_off = { }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 3, 0, 0, 26, 4, 17 }, -- Keyboard + { 18, 0, 18, 12, 6, 14 }, -- Tape Player + }); }); --- Nintendo Wii lookalike. +-- Nintendo Wii lookalike computer.register("computer:wee", { - description = "Nientiendo Wee"; - tiles_off = { front=true; }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 11, 0, 3, 10, 6, 26 }, -- Base - { 12, 6, 4, 8, 22, 24 }, -- Top - }); + description = "Nientiendo Wee"; + tiles_off = { front=true; }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 11, 0, 3, 10, 6, 26 }, -- Base + { 12, 6, 4, 8, 22, 24 }, -- Top + }); }); --- Apple iPad lookalike. +-- Apple iPad lookalike minetest.register_node("computer:piepad", { - description = "Snapple Piepad", - drawtype = "signlike", - tiles = {"computer_piepad_inv.png"}, - inventory_image = "computer_piepad_inv.png", - wield_image = "computer_piepad_inv.png", - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "wallmounted", - light_source = 10, - walkable = false, - groups = { snappy=3, cracky=3, choppy=3, oddly_breakable_by_hand=3}, - selection_box = {type = "wallmounted"}, - sounds = default.node_sound_wood_defaults() + description = "Snapple Piepad", + drawtype = "signlike", + tiles = {"computer_piepad_inv.png"}, + inventory_image = "computer_piepad_inv.png", + wield_image = "computer_piepad_inv.png", + sunlight_propagates = false, + paramtype = "light", + paramtype2 = "wallmounted", + light_source = 10, + walkable = false, + groups = { snappy=3, cracky=3, choppy=3, oddly_breakable_by_hand=3}, + selection_box = {type = "wallmounted"}, + sounds = default.node_sound_wood_defaults() }) -- Commodore 64 lookalike computer.register("computer:admiral64", { - description = "Admiral64"; - tiles_off = { }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 0, 32, 4, 18 }, -- Keyboard - }); + description = "Admiral64"; + tiles_off = { }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 0, 32, 4, 18 }, -- Keyboard + }); }); -- Commodore 128 lookalike computer.register("computer:admiral128", { - description = "Admiral128"; - tiles_off = { }; - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 0, 32, 4, 27 }, -- Keyboard - }); + description = "Admiral128"; + tiles_off = { }; + node_box = computer.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 0, 32, 4, 27 }, -- Keyboard + }); }); --------------------------------------------------------------------------------- ----------------------------added by crazyginger72------------------------------- --------------------------------------------------------------------------------- - - -- Generic Flat Screen LCD (16x9) with keyboard - minetest.register_node("computer:monitor_on", { +minetest.register_node("computer:monitor_on", { description = "Monitor and keyboard", tiles = {"computer_monitor_t.png","computer_monitor_bt.png", - "computer_monitor_l.png","computer_monitor_r.png", - "computer_monitor_b.png","computer_monitor_f_desktop.png"}, --"computer_monitor_f_on.png"}, --till i get a boot abm inplace - --inventory_image = + "computer_monitor_l.png","computer_monitor_r.png", + "computer_monitor_b.png","computer_monitor_f_desktop.png"}, --"computer_monitor_f_on.png"}, --till i get a boot abm inplace paramtype = "light", light_source = 4, paramtype2 = "facedir", walkable = false, is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), + groups = {snappy=3,not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), drawtype = "nodebox", node_box = { type = "fixed", fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, }, }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:monitor"; - minetest.set_node(pos, node); - nodeupdate(pos) - end -}) - - minetest.register_node("computer:monitor_bios", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png","computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_bios.png"}, - --inventory_image = - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , -}) - - minetest.register_node("computer:monitor_loading", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png","computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_loading.png"}, - --inventory_image = - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , -}) - - minetest.register_node("computer:monitor_login", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png","computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_login.png"}, - --inventory_image = - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , -}) - - minetest.register_node("computer:monitor_desktop", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png","computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_desktop.png"}, - --inventory_image = - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , -}) - - minetest.register_node("computer:monitor", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t_off.png","computer_monitor_bt.png","computer_monitor_l.png","computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_off.png"}, - --inventory_image = - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {crumbly=3}, - --sounds = default.node_sound_dirt_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor' , - + drop = 'computer:monitor', on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:monitor_on"; - minetest.set_node(pos, node); - nodeupdate(pos) + node.name = "computer:monitor"; + minetest.set_node(pos, node); + nodeupdate(pos) end +}) +minetest.register_node("computer:monitor_bios", { + description = "Monitor and keyboard", + tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", + "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_bios.png"}, + paramtype = "light", + light_source = 4, + paramtype2 = "facedir", + walkable = false, + is_ground_content = true, + groups = {snappy=3,not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, + }, + }, + drop = 'computer:monitor', +}) + +minetest.register_node("computer:monitor_loading", { + description = "Monitor and keyboard", + tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", + "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_loading.png"}, + paramtype = "light", + light_source = 4, + paramtype2 = "facedir", + walkable = false, + is_ground_content = true, + groups = {snappy=3,not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, + }, + }, + drop = 'computer:monitor', +}) + +minetest.register_node("computer:monitor_login", { + description = "Monitor and keyboard", + tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", + "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_login.png"}, + paramtype = "light", + light_source = 4, + paramtype2 = "facedir", + walkable = false, + is_ground_content = true, + groups = {snappy=3,not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, + }, + }, + drop = 'computer:monitor', +}) + +minetest.register_node("computer:monitor_desktop", { + description = "Monitor and keyboard", + tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", + "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_desktop.png"}, + paramtype = "light", + light_source = 4, + paramtype2 = "facedir", + walkable = false, + is_ground_content = true, + groups = {snappy=3,not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, + }, + }, + drop = 'computer:monitor', +}) + +minetest.register_node("computer:monitor", { + description = "Monitor and keyboard", + tiles = {"computer_monitor_t_off.png","computer_monitor_bt.png","computer_monitor_l.png", + "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_off.png"}, + paramtype = "light", + light_source = 4, + paramtype2 = "facedir", + walkable = false, + is_ground_content = true, + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, + {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, + {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, + {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, + {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, + {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, + }, + }, + on_rightclick = function ( pos, node, clicker, itemstack) + node.name = "computer:monitor_on"; + minetest.set_node(pos, node); + nodeupdate(pos) + end }) --WIFI Router (linksys look-a-like) - - minetest.register_node("computer:router", { +minetest.register_node("computer:router", { description = "WIFI Router", - tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png",{name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"}, - --inventory_image = + tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png", + {name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"}, paramtype = "light", paramtype2 = "facedir", walkable = false, is_ground_content = true, - groups = {crumbly=3}, - --sounds = default.node_sound_dirt_defaults(), + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), drawtype = "nodebox", node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.0625, 0.25, -0.375, 0.3125}, - {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, - {0.125, -0.4375, 0.3125, 0.1875, -0.1875, 0.375}, - {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375}, - }, - }, - selection_box = { type = "fixed", fixed = { {-0.25, -0.5, -0.0625, 0.25, -0.375, 0.3125}, - {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, + {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, {0.125, -0.4375, 0.3125, 0.1875, -0.1875, 0.375}, {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375}, }, @@ -404,197 +314,170 @@ computer.register("computer:admiral128", { }) --Modern PC Tower - - minetest.register_node("computer:tower_on", { +minetest.register_node("computer:tower_on", { description = "Computer Tower", - tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png","computer_tower_r.png","computer_tower_b.png","computer_tower_f_on.png"}, - --inventory_image = + tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png", + "computer_tower_r.png","computer_tower_b.png","computer_tower_f_on.png"}, paramtype = "light", paramtype2 = "facedir", walkable = true, is_ground_content = true, - groups = {crumbly=3,not_in_creative_inventory=1}, - --sounds = default.node_sound_dirt_defaults(), + groups = {snappy=3,not_in_creative_inventory=1}, + sound = default.node_sound_wood_defaults(), drawtype = "nodebox", node_box = { type = "fixed", fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, - {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, + {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, + {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, + {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, }, }, selection_box = { type = "fixed", fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, + {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, }, }, - drop = 'computer:tower' , - + drop = 'computer:tower', on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:tower"; - minetest.set_node(pos, node); - nodeupdate(pos) - end + node.name = "computer:tower"; + minetest.set_node(pos, node); + nodeupdate(pos) + end }) - minetest.register_node("computer:tower", { +minetest.register_node("computer:tower", { description = "Computer Tower", - tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png","computer_tower_r.png","computer_tower_b.png","computer_tower_f_off.png"}, - --inventory_image = + tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png","computer_tower_r.png", + "computer_tower_b.png","computer_tower_f_off.png"}, paramtype = "light", paramtype2 = "facedir", walkable = true, is_ground_content = true, - groups = {crumbly=3}, - --sounds = default.node_sound_dirt_defaults(), + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), drawtype = "nodebox", node_box = { type = "fixed", fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, - {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, + {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, + {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, + {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, }, }, selection_box = { type = "fixed", fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, + {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, }, }, on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:tower_on"; - minetest.set_node(pos, node); - nodeupdate(pos) - end + node.name = "computer:tower_on"; + minetest.set_node(pos, node); + nodeupdate(pos) + end }) -- Printer/scaner combo - minetest.register_node("computer:printer", { description = "Printer Scaner Combo", - tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png","computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"}, - --inventory_image = + tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png", + "computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"}, paramtype = "light", paramtype2 = "facedir", walkable = true, is_ground_content = true, - groups = {crumbly=3}, - --sounds = default.node_sound_dirt_defaults(), + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), drawtype = "nodebox", node_box = { type = "fixed", fixed = { {-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375}, - {-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375}, - {0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, - {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, - {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, - {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375}, - {-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375}, - {0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, - {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, - {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, - {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}, + {-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375}, + {-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375}, + {0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375}, + {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, + {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, + {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, + {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}, }, }, }) --Rack Server - minetest.register_node("computer:server", { - drawtype = "nodebox", - description = "Rack Server", - tiles = { - 'computer_server_t.png', - 'computer_server_bt.png', - 'computer_server_l.png', - 'computer_server_r.png', - 'computer_server_bt.png', - 'computer_server_f_off.png' - }, - inventory_image = "computer_server_inv.png", - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, - - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - --drop = 'computer:server', - sounds = default.node_sound_wood_defaults(), - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:server_on"; - minetest.set_node(pos, node); - nodeupdate(pos) - end, - on_place = function(itemstack, placer, pointed_thing) - local pos = pointed_thing.above - if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then - minetest.chat_send_player( placer:get_player_name(), "Not enough vertical space to place a server!" ) - return - end - return minetest.item_place(itemstack, placer, pointed_thing) - end, - - - + drawtype = "nodebox", + description = "Rack Server", + tiles = { + 'computer_server_t.png', + 'computer_server_bt.png', + 'computer_server_l.png', + 'computer_server_r.png', + 'computer_server_bt.png', + 'computer_server_f_off.png' + }, + inventory_image = "computer_server_inv.png", + sunlight_propagates = false, + paramtype = "light", + paramtype2 = "facedir", + walkable = true, + groups = {snappy=3}, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, + }, + sounds = default.node_sound_wood_defaults(), + on_rightclick = function ( pos, node, clicker, itemstack) + node.name = "computer:server_on"; + minetest.set_node(pos, node); + nodeupdate(pos) + end, + on_place = function(itemstack, placer, pointed_thing) + local pos = pointed_thing.above + if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then + minetest.chat_send_player( placer:get_player_name(), "Not enough vertical space to place a server!" ) + return + end + return minetest.item_place(itemstack, placer, pointed_thing) + end }) minetest.register_node("computer:server_on", { - drawtype = "nodebox", - description = "Rack Server", - tiles = { - 'computer_server_t.png', - 'computer_server_bt.png', - 'computer_server_r.png', - 'computer_server_l.png', - 'computer_server_bt.png', - 'computer_server_f_on.png', - }, - inventory_image = "computer_server_inv.png", - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3,not_in_creative_inventory=1 }, - - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - - sounds = default.node_sound_wood_defaults(), + drawtype = "nodebox", + description = "Rack Server", + tiles = { + 'computer_server_t.png', + 'computer_server_bt.png', + 'computer_server_r.png', + 'computer_server_l.png', + 'computer_server_bt.png', + 'computer_server_f_on.png', + }, + inventory_image = "computer_server_inv.png", + sunlight_propagates = false, + paramtype = "light", + paramtype2 = "facedir", + walkable = true, + groups = {snappy=3,not_in_creative_inventory=1}, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, + }, + sounds = default.node_sound_wood_defaults(), drop = 'computer:server', on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:server"; - minetest.set_node(pos, node); - nodeupdate(pos) - end , - + node.name = "computer:server"; + minetest.set_node(pos, node); + nodeupdate(pos) + end }) - - diff --git a/mods/homedecor_modpack/computer/init.lua b/mods/homedecor_modpack/computer/init.lua index ee16c351..bd1c434b 100644 --- a/mods/homedecor_modpack/computer/init.lua +++ b/mods/homedecor_modpack/computer/init.lua @@ -2,99 +2,99 @@ computer = { }; computer.register = function ( name, def ) - local nodename = name; - if (name:sub(1, 1) == ":") then name = name:sub(2); end - local modname, basename = name:match("^([^:]+):(.*)"); - local TEXPFX = modname.."_"..basename.."_"; - local ONSTATE = modname..":"..basename; - local OFFSTATE = modname..":"..basename.."_off"; - local def = def; - minetest.register_node(ONSTATE, { - drawtype = "nodebox"; - paramtype = "light"; - paramtype2 = "facedir"; - description = def.description; - groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2 }; - tiles = { - TEXPFX.."tp.png", - TEXPFX.."bt.png", - TEXPFX.."rt.png", - TEXPFX.."lt.png", - TEXPFX.."bk.png", - TEXPFX.."ft.png", - }; - node_box = def.node_box; - selection_box = def.node_box; - on_rightclick = function ( pos, node, clicker, itemstack) - if (def.on_turn_off) then - if (def.on_turn_off(pos, node, clicker, itemstack)) then return; end - end - node.name = OFFSTATE; - minetest.set_node(pos, node); - nodeupdate(pos); - end; - }); - minetest.register_node(OFFSTATE, { - drawtype = "nodebox"; - paramtype = "light"; - paramtype2 = "facedir"; - groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, - not_in_creative_inventory=1 }; - tiles = { - (TEXPFX.."tp"..(def.tiles_off.top and "_off" or "")..".png"), - (TEXPFX.."bt"..(def.tiles_off.bottom and "_off" or "")..".png"), - (TEXPFX.."rt"..(def.tiles_off.right and "_off" or "")..".png"), - (TEXPFX.."lt"..(def.tiles_off.left and "_off" or "")..".png"), - (TEXPFX.."bk"..(def.tiles_off.back and "_off" or "")..".png"), - (TEXPFX.."ft"..(def.tiles_off.front and "_off" or "")..".png"), - }; - node_box = def.node_box_off or def.node_box; - selection_box = def.node_box_off or def.node_box; - on_rightclick = function ( pos, node, clicker, itemstack) - if (def.on_turn_on) then - if (def.on_turn_on(pos, node, clicker, itemstack)) then return; end - end - node.name = ONSTATE; - minetest.set_node(pos, node); - nodeupdate(pos); - end; - drop = ONSTATE; - }); + local nodename = name; + if (name:sub(1, 1) == ":") then name = name:sub(2); end + local modname, basename = name:match("^([^:]+):(.*)"); + local TEXPFX = modname.."_"..basename.."_"; + local ONSTATE = modname..":"..basename; + local OFFSTATE = modname..":"..basename.."_off"; + local def = def; + minetest.register_node(ONSTATE, { + drawtype = "nodebox"; + paramtype = "light"; + paramtype2 = "facedir"; + description = def.description; + groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2 }; + tiles = { + TEXPFX.."tp.png", + TEXPFX.."bt.png", + TEXPFX.."rt.png", + TEXPFX.."lt.png", + TEXPFX.."bk.png", + TEXPFX.."ft.png", + }; + node_box = def.node_box; + selection_box = def.node_box; + on_rightclick = function ( pos, node, clicker, itemstack) + if (def.on_turn_off) then + if (def.on_turn_off(pos, node, clicker, itemstack)) then return; end + end + node.name = OFFSTATE; + minetest.set_node(pos, node); + nodeupdate(pos); + end; + }); + minetest.register_node(OFFSTATE, { + drawtype = "nodebox"; + paramtype = "light"; + paramtype2 = "facedir"; + groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, + not_in_creative_inventory=1 }; + tiles = { + (TEXPFX.."tp"..(def.tiles_off.top and "_off" or "")..".png"), + (TEXPFX.."bt"..(def.tiles_off.bottom and "_off" or "")..".png"), + (TEXPFX.."rt"..(def.tiles_off.right and "_off" or "")..".png"), + (TEXPFX.."lt"..(def.tiles_off.left and "_off" or "")..".png"), + (TEXPFX.."bk"..(def.tiles_off.back and "_off" or "")..".png"), + (TEXPFX.."ft"..(def.tiles_off.front and "_off" or "")..".png"), + }; + node_box = def.node_box_off or def.node_box; + selection_box = def.node_box_off or def.node_box; + on_rightclick = function ( pos, node, clicker, itemstack) + if (def.on_turn_on) then + if (def.on_turn_on(pos, node, clicker, itemstack)) then return; end + end + node.name = ONSTATE; + minetest.set_node(pos, node); + nodeupdate(pos); + end; + drop = ONSTATE; + }); end computer.register_handheld = function ( name, def ) - local nodename = name; - if (name:sub(1, 1) == ":") then name = name:sub(2); end - local modname, basename = name:match("^([^:]+):(.*)"); - local TEXPFX = modname.."_"..basename.."_inv"; - local ONSTATE = modname..":"..basename; - local OFFSTATE = modname..":"..basename.."_off"; - local on_use = def.on_use; - minetest.register_craftitem(ONSTATE, { - description = def.description; - inventory_image = TEXPFX..".png"; - wield_image = TEXPFX..".png"; - }); + local nodename = name; + if (name:sub(1, 1) == ":") then name = name:sub(2); end + local modname, basename = name:match("^([^:]+):(.*)"); + local TEXPFX = modname.."_"..basename.."_inv"; + local ONSTATE = modname..":"..basename; + local OFFSTATE = modname..":"..basename.."_off"; + local on_use = def.on_use; + minetest.register_craftitem(ONSTATE, { + description = def.description; + inventory_image = TEXPFX..".png"; + wield_image = TEXPFX..".png"; + }); end computer.pixelnodebox = function ( size, boxes ) - local fixed = { }; - local i, box; - for i, box in ipairs(boxes) do - local x, y, z, w, h, l = unpack(box); - fixed[#fixed + 1] = { - (x / size) - 0.5, - (y / size) - 0.5, - (z / size) - 0.5, - ((x + w) / size) - 0.5, - ((y + h) / size) - 0.5, - ((z + l) / size) - 0.5, - }; - end - return { - type = "fixed"; - fixed = fixed; - }; + local fixed = { }; + local i, box; + for i, box in ipairs(boxes) do + local x, y, z, w, h, l = unpack(box); + fixed[#fixed + 1] = { + (x / size) - 0.5, + (y / size) - 0.5, + (z / size) - 0.5, + ((x + w) / size) - 0.5, + ((y + h) / size) - 0.5, + ((z + l) / size) - 0.5, + }; + end + return { + type = "fixed"; + fixed = fixed; + }; end local MODPATH = minetest.get_modpath("computer"); diff --git a/mods/homedecor_modpack/computer/miscitems.lua b/mods/homedecor_modpack/computer/miscitems.lua index 15e66a93..9703e1cd 100644 --- a/mods/homedecor_modpack/computer/miscitems.lua +++ b/mods/homedecor_modpack/computer/miscitems.lua @@ -14,63 +14,63 @@ end if (not minetest.get_modpath("homedecor")) then - minetest.register_craftitem(":homedecor:plastic_sheeting", { - description = S("Plastic sheet"), - inventory_image = "homedecor_plastic_sheeting.png", - }) + minetest.register_craftitem(":homedecor:plastic_sheeting", { + description = S("Plastic sheet"), + inventory_image = "homedecor_plastic_sheeting.png", + }) - minetest.register_craftitem(":homedecor:plastic_base", { - description = S("Unprocessed Plastic base"), - wield_image = "homedecor_plastic_base.png", - inventory_image = "homedecor_plastic_base_inv.png", - }) + minetest.register_craftitem(":homedecor:plastic_base", { + description = S("Unprocessed Plastic base"), + wield_image = "homedecor_plastic_base.png", + inventory_image = "homedecor_plastic_base_inv.png", + }) - minetest.register_craft({ - type = "shapeless", - output = 'homedecor:plastic_base 6', - recipe = { "default:junglegrass", - "default:junglegrass", - "default:junglegrass" - } - }) - - minetest.register_craft({ - type = "shapeless", - output = 'homedecor:plastic_base 3', - recipe = { "default:dry_shrub", - "default:dry_shrub", - "default:dry_shrub" - }, - }) - - minetest.register_craft({ - type = "shapeless", - output = 'homedecor:plastic_base 4', - recipe = { "default:leaves", - "default:leaves", - "default:leaves", - "default:leaves", - "default:leaves", - "default:leaves" - } - }) - - minetest.register_craft({ - type = "cooking", - output = "homedecor:plastic_sheeting", - recipe = "homedecor:plastic_base", - }) - - minetest.register_craft({ - type = 'fuel', - recipe = 'homedecor:plastic_base', - burntime = 30, - }) - - minetest.register_craft({ - type = 'fuel', - recipe = 'homedecor:plastic_sheeting', - burntime = 30, - }) + minetest.register_craft({ + type = "shapeless", + output = 'homedecor:plastic_base 6', + recipe = { "default:junglegrass", + "default:junglegrass", + "default:junglegrass" + } + }) + + minetest.register_craft({ + type = "shapeless", + output = 'homedecor:plastic_base 3', + recipe = { "default:dry_shrub", + "default:dry_shrub", + "default:dry_shrub" + }, + }) + + minetest.register_craft({ + type = "shapeless", + output = 'homedecor:plastic_base 4', + recipe = { "default:leaves", + "default:leaves", + "default:leaves", + "default:leaves", + "default:leaves", + "default:leaves" + } + }) + + minetest.register_craft({ + type = "cooking", + output = "homedecor:plastic_sheeting", + recipe = "homedecor:plastic_base", + }) + + minetest.register_craft({ + type = 'fuel', + recipe = 'homedecor:plastic_base', + burntime = 30, + }) + + minetest.register_craft({ + type = 'fuel', + recipe = 'homedecor:plastic_sheeting', + burntime = 30, + }) end -- not homedecor diff --git a/mods/homedecor_modpack/computer/recipes.lua b/mods/homedecor_modpack/computer/recipes.lua index 663d6b79..e4335a1c 100644 --- a/mods/homedecor_modpack/computer/recipes.lua +++ b/mods/homedecor_modpack/computer/recipes.lua @@ -3,132 +3,132 @@ -- License is WTFPL (see README.txt). minetest.register_craft({ - output = "computer:shefriendSOO"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, - }; + output = "computer:shefriendSOO"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:slaystation"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, - }; + output = "computer:slaystation"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:vanio"; - recipe = { - { "homedecor:plastic_sheeting", "", "", }, - { "default:glass", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; + output = "computer:vanio"; + recipe = { + { "homedecor:plastic_sheeting", "", "", }, + { "default:glass", "", "" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:specter"; - recipe = { - { "", "", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; + output = "computer:specter"; + recipe = { + { "", "", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:slaystation2"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - }; + output = "computer:slaystation2"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:admiral64"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:wood", "default:wood", "default:wood", }, - }; + output = "computer:admiral64"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "default:wood", "default:wood", "default:wood", }, + }; }); minetest.register_craft({ - output = "computer:admiral128"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - }; + output = "computer:admiral128"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, + }; }); minetest.register_craft({ - output = "computer:wee"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting", }, - }; + output = "computer:wee"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:piepad"; - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, - }; + output = "computer:piepad"; + recipe = { + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, + }; }); --new stuff minetest.register_craft({ - output = "computer:monitor"; - recipe = { - { "homedecor:plastic_sheeting", "default:glass","", }, - { "homedecor:plastic_sheeting", "default:glass","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting", }, - }; + output = "computer:monitor"; + recipe = { + { "homedecor:plastic_sheeting", "default:glass","", }, + { "homedecor:plastic_sheeting", "default:glass","", }, + { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:router"; - recipe = { - { "default:steel_ingot","","", }, - { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; + output = "computer:router"; + recipe = { + { "default:steel_ingot","","", }, + { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:tower"; - recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - }; + output = "computer:tower"; + recipe = { + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:printer"; - recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting", }, - }; + output = "computer:printer"; + recipe = { + { "homedecor:plastic_sheeting", "default:steel_ingot","", }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:printer"; - recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", }, - }; + output = "computer:printer"; + recipe = { + { "homedecor:plastic_sheeting", "default:steel_ingot","", }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, + { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", }, + }; }); minetest.register_craft({ - output = "computer:server"; - recipe = { - { "computer:tower", "computer:tower", "computer:tower", }, - { "computer:tower", "computer:tower", "computer:tower", }, - { "computer:tower", "computer:tower", "computer:tower", }, - }; + output = "computer:server"; + recipe = { + { "computer:tower", "computer:tower", "computer:tower", }, + { "computer:tower", "computer:tower", "computer:tower", }, + { "computer:tower", "computer:tower", "computer:tower", }, + }; }); diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_back.png b/mods/homedecor_modpack/computer/textures/computer_babytower_back.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_back.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_back.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png b/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_front.png b/mods/homedecor_modpack/computer/textures/computer_babytower_front.png index d164fd82..f6fc9711 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_front.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_front.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_left.png b/mods/homedecor_modpack/computer/textures/computer_babytower_left.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_left.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_left.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_right.png b/mods/homedecor_modpack/computer/textures/computer_babytower_right.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_right.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_right.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_top.png b/mods/homedecor_modpack/computer/textures/computer_babytower_top.png index d82eea87..624d131c 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_top.png and b/mods/homedecor_modpack/computer/textures/computer_babytower_top.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_b.png b/mods/homedecor_modpack/computer/textures/computer_monitor_b.png index c04d33d1..ee1a604e 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_b.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_b.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png b/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png index 4575e36e..7cc0c059 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png b/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png index 10ee8be3..652d24ca 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png index 3755a63e..506cd07e 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png index 72ec0948..449f1b32 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png index bd0f4963..0d699aa5 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png index 20095638..d65b5483 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png index 35c7899e..2c4157a3 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png index 220e37ab..fadabef2 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_l.png b/mods/homedecor_modpack/computer/textures/computer_monitor_l.png index 9f9efcf0..b6b35171 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_l.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_l.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_r.png b/mods/homedecor_modpack/computer/textures/computer_monitor_r.png index 9f9efcf0..b6b35171 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_r.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_r.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_t.png b/mods/homedecor_modpack/computer/textures/computer_monitor_t.png index 28300db5..a9ef1e1a 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_t.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_t.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png b/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png index d2502f2e..b4d34dab 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png b/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png index 85d40445..74cbd8b4 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png and b/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_bt.png b/mods/homedecor_modpack/computer/textures/computer_printer_bt.png index 762eb27c..6e03ece9 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_printer_bt.png and b/mods/homedecor_modpack/computer/textures/computer_printer_bt.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_router_bt.png b/mods/homedecor_modpack/computer/textures/computer_router_bt.png index c07500a2..872d2e69 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_router_bt.png and b/mods/homedecor_modpack/computer/textures/computer_router_bt.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png b/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png index fb9cfabd..8516cf00 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png and b/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_server_bt.png b/mods/homedecor_modpack/computer/textures/computer_server_bt.png index d9b72e68..aac403db 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_server_bt.png and b/mods/homedecor_modpack/computer/textures/computer_server_bt.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_server_f_off.png b/mods/homedecor_modpack/computer/textures/computer_server_f_off.png index 4b92fe65..39132667 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_server_f_off.png and b/mods/homedecor_modpack/computer/textures/computer_server_f_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_server_f_on.png b/mods/homedecor_modpack/computer/textures/computer_server_f_on.png index cb6b47af..b1e74c7b 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_server_f_on.png and b/mods/homedecor_modpack/computer/textures/computer_server_f_on.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_server_t.png b/mods/homedecor_modpack/computer/textures/computer_server_t.png index d9b72e68..aac403db 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_server_t.png and b/mods/homedecor_modpack/computer/textures/computer_server_t.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png index 8305e289..eb7811d4 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png and b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png index 9a9e9a80..a7ae9d6b 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png and b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png index 2fbf46fc..0f0316cb 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png and b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png index 20dd999e..f8326b4c 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png and b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_top.png b/mods/homedecor_modpack/computer/textures/computer_spectre_top.png index 058f6102..4716ad2f 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_spectre_top.png and b/mods/homedecor_modpack/computer/textures/computer_spectre_top.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_b.png b/mods/homedecor_modpack/computer/textures/computer_tower_b.png index 4ff13f49..2aa583eb 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_b.png and b/mods/homedecor_modpack/computer/textures/computer_tower_b.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_bt.png b/mods/homedecor_modpack/computer/textures/computer_tower_bt.png index 9f9efcf0..b6b35171 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_bt.png and b/mods/homedecor_modpack/computer/textures/computer_tower_bt.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_r.png b/mods/homedecor_modpack/computer/textures/computer_tower_r.png index 516dd726..64e0e82f 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_r.png and b/mods/homedecor_modpack/computer/textures/computer_tower_r.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_t.png b/mods/homedecor_modpack/computer/textures/computer_tower_t.png index 9f9efcf0..b6b35171 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_t.png and b/mods/homedecor_modpack/computer/textures/computer_tower_t.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_vanio_bk.png b/mods/homedecor_modpack/computer/textures/computer_vanio_bk.png index 54f3d928..15f7d1bd 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_vanio_bk.png and b/mods/homedecor_modpack/computer/textures/computer_vanio_bk.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_vanio_tp_off.png b/mods/homedecor_modpack/computer/textures/computer_vanio_tp_off.png index 21fb0df7..dfd1f6fe 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_vanio_tp_off.png and b/mods/homedecor_modpack/computer/textures/computer_vanio_tp_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_ft.png b/mods/homedecor_modpack/computer/textures/computer_wee_ft.png index eacfc210..ee91940a 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_wee_ft.png and b/mods/homedecor_modpack/computer/textures/computer_wee_ft.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png b/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png index 27db57e8..d40e7cbf 100644 Binary files a/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png and b/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png index d164fd82..f6fc9711 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png index b94088d0..48a40cd7 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png index d82eea87..624d131c 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png and b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png index 058f6102..4716ad2f 100644 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png and b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png differ diff --git a/mods/homedecor_modpack/fake_fire/init.lua b/mods/homedecor_modpack/fake_fire/init.lua index 207e06b1..db264dae 100644 --- a/mods/homedecor_modpack/fake_fire/init.lua +++ b/mods/homedecor_modpack/fake_fire/init.lua @@ -1,37 +1,37 @@ ---[[ - -The 'Fake-Fire' mod was originally created by Semmett9. - -URL to the 'Fake-Fire' thread on Minetest.net: -http://forum.minetest.net/viewtopic.php?id=6145 - -I've customized it a bit. Please see the changelog.txt file for more details. - -~ LazyJ, 2014_03_15 - ---]] - -dofile(minetest.get_modpath("fake_fire").."/modfiles/nodes.lua") -dofile(minetest.get_modpath("fake_fire").."/modfiles/crafts.lua") -dofile(minetest.get_modpath("fake_fire").."/modfiles/abms.lua") - - - ---[[ - - The lines below, at the end, are from the original author, Semmett9. - - Thanks for a nice mod, Semmett9. ;) - - ~ LazyJ, 2014_03_14 - ---]] - - - --- Thanks- - --- Many thanks for addi for his help in coding. -- - --- Many thanks for the players on the King Arthur's land server for giving -- --- me support, ideas and allowing me to add the mod to the server itself. -- +--[[ + +The 'Fake-Fire' mod was originally created by Semmett9. + +URL to the 'Fake-Fire' thread on Minetest.net: +http://forum.minetest.net/viewtopic.php?id=6145 + +I've customized it a bit. Please see the changelog.txt file for more details. + +~ LazyJ, 2014_03_15 + +--]] + +dofile(minetest.get_modpath("fake_fire").."/modfiles/nodes.lua") +dofile(minetest.get_modpath("fake_fire").."/modfiles/crafts.lua") +dofile(minetest.get_modpath("fake_fire").."/modfiles/abms.lua") + + + +--[[ + + The lines below, at the end, are from the original author, Semmett9. + + Thanks for a nice mod, Semmett9. ;) + + ~ LazyJ, 2014_03_14 + +--]] + + + +-- Thanks- + +-- Many thanks for addi for his help in coding. -- + +-- Many thanks for the players on the King Arthur's land server for giving -- +-- me support, ideas and allowing me to add the mod to the server itself. -- diff --git a/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua b/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua index 830dde48..8aea6bd0 100644 --- a/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua +++ b/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua @@ -1,193 +1,91 @@ local cp = nil --- FLAME TYPES +local function register_fake_fire(name, def) + assert(name, "local registration called without name") + assert(def, "local registration called without node definition") --- SMOKEY FIRE (TRIGGERS SMOKE ABM) -minetest.register_node("fake_fire:fake_fire", { - description = "Smokey, Fake Fire", - tiles = { - {name="fake_fire_animated.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=1.5}}, - }, - is_ground_content = true, - inventory_image = 'fake_fire.png', - wield_image = { - {name="fake_fire_animated.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=1.5}}, - }, - drawtype = "plantlike", - -- Waving wasn't an option when this mod was written. ~ LazyJ, 2014_03_13 - waving = 1, - light_source = 14, + -- make sure shared definitions are set + def.is_ground_content = true + def.inventory_image = def.inventory_image or name.. ".png" + def.drawtype = "plantlike" + def.waving = 1 -- Waving wasn't an option when this mod was written. ~ LazyJ, 2014_03_13 + def.light_source = def.lightsource or 14 -- Adding sunlight_propagtes and leaving comments as a future reference. -- If true, sunlight will go infinitely through this (no shadow is cast). -- Because fire produces light it should be "true" so fire *doesn't* have -- a shadow. - sunlight_propagates = true, + def.sunlight_propagates = true -- damage_per_second = 2*0.5, -- It's *fake* fire. PvP on our server has -- been disabled for a reason. I don't want griefers lighting players on -- fire or trapping them in blazes. ~ LazyJ, 2014_0_13 - --groups = {dig_immediate=3,attached_node=1}, - groups = { - oddly_breakable_by_hand=3, dig_immediate=2, attached_node=1, - not_in_creative_inventory=1 - }, - paramtype = "light", - walkable = false, - drop = "", -- So fire won't return to the inventory. ~ LazyJ - sounds = minetest.sound_play("fire_small", {pos=cp, loop=true}), - on_punch = function (pos,node,puncher) + + def.groups = def.groups or { + oddly_breakable_by_hand=3, dig_immediate=2, + attached_node=1, not_in_creative_inventory=1 + } + def.paramtype = "light" + def.walkable = false + def.drop = "" -- So fire won't return to the inventory. ~ LazyJ + def.sounds = def.sounds or minetest.sound_play("fire_small", {pos=cp, loop=true}) + def.buildable_to = true + + local swap_on_punch = def.swap_on_punch + def.on_punch = def.on_punch or function (pos, node, puncher) -- A max_hear_distance of 20 may freak some players out by the "hiss" -- so I reduced it to 5. - minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, - max_hear_distance = 5,}) - -- This swaps the smoky version with the smokeless version. ~ LazyJ - minetest.set_node(pos, {name = "fake_fire:smokeless_fire"}) + minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, max_hear_distance = 5,}) + -- swap the node on_punch if def.swap_on_punch is set + if swap_on_punch then + minetest.set_node(pos, {name = swap_on_punch}) + end end -}) + -- no need to add these to the global registration table + def.swap_on_punch = nil + def.smoking = nil + minetest.register_node("fake_fire:" .. name, def) +end - --- SMOKELESS FIRE (DOES NOT TRIGGER SMOKE ABM) -minetest.register_node("fake_fire:smokeless_fire", { - description = "Smokeless, Fake Fire", +-- FLAME TYPES +register_fake_fire("fake_fire", { + description = "Smokey, Fake Fire", tiles = { {name="fake_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - is_ground_content = true, - inventory_image = 'fake_fire.png', - wield_image = { + }, + swap_on_punch = "fake_fire:smokeless_fire", +}) + +register_fake_fire("smokeless_fire", { + description = "Smokeless, Fake Fire", + tiles = { {name="fake_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - drawtype = "plantlike", - -- Waving wasn't an option when this mod was written. ~ LazyJ, 2014_03_13 - waving = 1, - light_source = 14, - -- Adding sunlight_propagtes and leaving comments as a future reference. - -- If true, sunlight will go infinitely through this (no shadow is cast). - -- Because fire produces light it should be "true" so fire *doesn't* have - -- a shadow. - sunlight_propagates = true, - -- damage_per_second = 2*0.5, -- It's *fake* fire. PvP on our server has - -- been disabled for a reason. I don't want griefers lighting players on - -- fire or trapping them in blazes. ~ LazyJ, 2014_0_13 - --groups = {dig_immediate=3,attached_node=1}, - groups = { - oddly_breakable_by_hand=3, dig_immediate=2, attached_node=1, - not_in_creative_inventory=1 - }, - paramtype = "light", - walkable = false, - drop = "", -- So fire won't return to the inventory. ~ LazyJ - sounds = minetest.sound_play("fire_small", {pos=cp, loop=true}), - on_punch = function (pos,node,puncher) - -- A max_hear_distance of 20 may freak some players out by the "hiss" - -- so I reduced it to 5. - minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, - max_hear_distance = 5,}) - -- This swaps the smokeless version with the smoky version. ~ LazyJ - minetest.set_node(pos, {name = "fake_fire:fake_fire"}) - end + }, + inventory_image = 'fake_fire.png', + swap_on_punch = "fake_fire:fake_fire", }) - - --- SMOKEY ICE FIRE (TRIGGERS SMOKE ABM) -minetest.register_node("fake_fire:ice_fire", { - description = "Smoky, Fake, Ice Fire", +register_fake_fire("ice_fire", { + description = "Smoky, Fake, Ice Fire", tiles = { {name="ice_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - is_ground_content = true, - inventory_image = 'ice_fire.png', - wield_image = { - {name="ice_fire_animated.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=1.5}}, - }, - drawtype = "plantlike", - -- Waving wasn't an option when this mod was written. ~ LazyJ, 2014_03_13 - waving = 1, - light_source = 14, - -- Adding sunlight_propagtes and leaving comments as a future reference. - -- If true, sunlight will go infinitely through this (no shadow is cast). - -- Because fire produces light it should be "true" so fire *doesn't* have - -- a shadow. - sunlight_propagates = true, - -- damage_per_second = 2*0.5, -- It's *fake* fire. PvP on our server has - -- been disabled for a reason. I don't want griefers lighting players on - -- fire or trapping them in blazes. ~ LazyJ, 2014_0_13 - --groups = {dig_immediate=3,attached_node=1}, - groups = { - oddly_breakable_by_hand=3, dig_immediate=2, attached_node=1, - not_in_creative_inventory=1 - }, - paramtype = "light", - walkable = false, - drop = "", -- So fire won't return to the inventory. ~ LazyJ - sounds = minetest.sound_play("fire_small", {pos=cp, loop=true}), - on_punch = function (pos,node,puncher) - -- A max_hear_distance of 20 may freak some players out by the "hiss" - -- so I reduced it to 5. - minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, - max_hear_distance = 5,}) - -- This swaps the smoky version with the smokeless version. ~ LazyJ - minetest.set_node(pos, {name = "fake_fire:smokeless_ice_fire"}) - end + }, + swap_on_punch = "fake_fire:smokeless_ice_fire", }) - - --- SMOKELESS ICE FIRE (DOES NOT TRIGGER SMOKE ABM) -minetest.register_node("fake_fire:smokeless_ice_fire", { - description = "Smokeless, Fake, Ice Fire", +register_fake_fire("smokeless_ice_fire", { + description = "Smokeless, Fake, Ice Fire", tiles = { {name="ice_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - is_ground_content = true, + }, inventory_image = 'ice_fire.png', - wield_image = { - {name="ice_fire_animated.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=1.5}}, - }, - drawtype = "plantlike", - -- Waving wasn't an option when this mod was written. ~ LazyJ, 2014_03_13 - waving = 1, - light_source = 14, - -- Adding sunlight_propagtes and leaving comments as a future reference. - -- If true, sunlight will go infinitely through this (no shadow is cast). - -- Because fire produces light it should be "true" so fire *doesn't* have - -- a shadow. - sunlight_propagates = true, - -- damage_per_second = 2*0.5, -- It's *fake* fire. PvP on our server has - -- been disabled for a reason. I don't want griefers lighting players on - -- fire or trapping them in blazes. ~ LazyJ, 2014_0_13 - --groups = {dig_immediate=3,attached_node=1}, - groups = { - oddly_breakable_by_hand=3, dig_immediate=2, attached_node=1, - not_in_creative_inventory=1 - }, - paramtype = "light", - walkable = false, - drop = "", -- So fire won't return to the inventory. ~ LazyJ - sounds = minetest.sound_play("fire_small", {pos=cp, loop=true}), - on_punch = function (pos,node,puncher) - -- A max_hear_distance of 20 may freak some players out by the "hiss" - -- so I reduced it to 5. - minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, - max_hear_distance = 5,}) - -- This swaps the smokeless version with the smoky version. ~ LazyJ - minetest.set_node(pos, {name = "fake_fire:ice_fire"}) - end + swap_on_punch = "fake_fire:ice_fire", }) - - -- FLINT and STEEL - minetest.register_tool("fake_fire:flint_and_steel", { description = "Flint and steel", inventory_image = "flint_and_steel.png", diff --git a/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png b/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png index afb2ef72..be59a802 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png and b/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/embers_animated.png b/mods/homedecor_modpack/fake_fire/textures/embers_animated.png index 08ee660f..2e7dda5a 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/embers_animated.png and b/mods/homedecor_modpack/fake_fire/textures/embers_animated.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png index a450f2ec..67f50f86 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png and b/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png b/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png index 5ffd88d0..aa4b885b 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png and b/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire.png index 363b03c6..57df9056 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/ice_fire.png and b/mods/homedecor_modpack/fake_fire/textures/ice_fire.png differ diff --git a/mods/homedecor_modpack/homedecor/misc-bathroom.lua b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua similarity index 62% rename from mods/homedecor_modpack/homedecor/misc-bathroom.lua rename to mods/homedecor_modpack/homedecor/bathroom_furniture.lua index e0986cda..50c17316 100644 --- a/mods/homedecor_modpack/homedecor/misc-bathroom.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua @@ -25,15 +25,13 @@ for i in ipairs(bathroom_tile_colors) do "homedecor_bathroom_tiles_"..color..".png^[transformR90", "homedecor_bathroom_tiles_"..color..".png^[transformR90" }, - is_ground_content = true, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), }) end -minetest.register_node("homedecor:towel_rod", { +homedecor.register("towel_rod", { description = "Towel rod with towel", - drawtype = "nodebox", tiles = { "homedecor_towel_rod_top.png", "homedecor_towel_rod_bottom.png", @@ -42,8 +40,6 @@ minetest.register_node("homedecor:towel_rod", { "homedecor_towel_rod_fb.png", "homedecor_towel_rod_fb.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -62,8 +58,7 @@ minetest.register_node("homedecor:towel_rod", { sounds = default.node_sound_defaults(), }) -minetest.register_node('homedecor:medicine_cabinet', { - drawtype = "nodebox", +homedecor.register("medicine_cabinet", { description = S("Medicine Cabinet"), tiles = { 'homedecor_medicine_cabinet_tb.png', @@ -74,60 +69,27 @@ minetest.register_node('homedecor:medicine_cabinet', { 'homedecor_medicine_cabinet_front.png' }, inventory_image = "homedecor_medicine_cabinet_inv.png", - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", + selection_box = { + type = "fixed", fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} - }, - node_box = { + }, + node_box = { type = "fixed", fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher, pointed_thing) - local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:medicine_cabinet_open", param2 = fdir }) - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;1,0;6,1;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Medicine cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 16) - 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 medicine cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to medicine cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from medicine cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) + node.name = "homedecor:medicine_cabinet_open" + minetest.swap_node(pos, node) end, + infotext=S("Medicine cabinet"), + inventory = { + size=6, + }, }) -minetest.register_node("homedecor:medicine_cabinet_open", { +homedecor.register("medicine_cabinet_open", { tiles = { 'homedecor_medicine_cabinet_tb.png', 'homedecor_medicine_cabinet_tb.png', @@ -136,9 +98,6 @@ minetest.register_node("homedecor:medicine_cabinet_open", { 'homedecor_medicine_cabinet_back.png', "homedecor_medicine_cabinet_open_front.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -149,20 +108,17 @@ minetest.register_node("homedecor:medicine_cabinet_open", { }, drop = "homedecor:medicine_cabinet", on_punch = function(pos, node, puncher, pointed_thing) - local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:medicine_cabinet", param2 = fdir }) + node.name = "homedecor:medicine_cabinet" + minetest.swap_node(pos, node) end, }) -minetest.register_node("homedecor:toilet_paper", { +homedecor.register("toilet_paper", { description = S("Toilet paper"), - drawtype = "mesh", mesh = "homedecor_toilet_paper.obj", tiles = { "homedecor_toilet_paper.png" }, inventory_image = "homedecor_toilet_paper_inv.png", - paramtype = "light", - paramtype2 = "facedir", - selection_box = { + selection_box = { type = "fixed", fixed = { -0.1875, 0.125, 0.0625, 0.25, 0.4375, 0.5 } }, diff --git a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua new file mode 100644 index 00000000..cfa37af3 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua @@ -0,0 +1,184 @@ +local S = homedecor.gettext + +homedecor.register("toilet", { + description = S("Toilet"), + tiles = { "forniture_marble.png" }, + node_box = { + type = "fixed", + fixed = { + { -0.20, -0.50, -0.20, 0.20, -0.45, 0.50, }, + { -0.10, -0.45, -0.10, 0.10, 0.00, 0.50, }, + { -0.30, -0.20, -0.30, 0.30, 0.00, 0.35, }, + { -0.25, 0.00, -0.25, 0.25, 0.05, 0.25, }, + { -0.30, 0.00, 0.30, 0.30, 0.40, 0.50, }, + { -0.05, 0.40, 0.35, 0.05, 0.45, 0.45, }, + }, + }, + groups = {cracky=3,}, + sounds = default.node_sound_stone_defaults(), + on_punch = function (pos, node, puncher) + node.name = "homedecor:toilet_open" + minetest.set_node(pos, node) + end, +}) + +homedecor.register("toilet_open", { + tiles = { + "forniture_marble_top_toilet.png", + "forniture_marble.png" + }, + node_box = { + type = "fixed", + fixed = { + { -0.20, -0.50, -0.20, 0.20, -0.45, 0.50, }, + { -0.10, -0.45, -0.10, 0.10, -0.20, 0.50, }, + { -0.10, -0.20, 0.30, 0.10, 0.00, 0.50, }, + { -0.30, -0.20, 0.10, 0.30, 0.00, 0.35, }, + { -0.30, -0.20, -0.30, -0.10, -0.15, 0.10, }, + { -0.10, -0.20, -0.30, 0.10, -0.15, -0.10, }, + { 0.10, -0.20, -0.30, 0.30, -0.15, 0.10, }, + { -0.30, -0.15, -0.30, -0.20, 0.00, 0.10, }, + { -0.20, -0.15, -0.30, 0.20, 0.00, -0.20, }, + { 0.20, -0.15, -0.30, 0.30, 0.00, 0.10, }, + { -0.25, 0.00, 0.20, 0.25, 0.50, 0.25, }, + { -0.30, 0.00, 0.30, 0.30, 0.40, 0.50, }, + }, + }, + drop = "homedecor:toilet", + groups = {cracky = 3,}, + --sounds = {dig = "3dforniture_dig_toilet", gain=0.5}, + sounds = default.node_sound_stone_defaults(), + on_punch = function (pos, node, puncher) + node.name = "homedecor:toilet" + minetest.set_node(pos, node) + minetest.sound_play("homedecor_toilet_flush", { + pos=pos, + max_hear_distance = 5, + gain = 1, + }) + end, +}) + +--Sink +homedecor.register("sink", { + description = S("Sink"), + tiles = { + "forniture_marble_top_sink.png", + "forniture_marble.png" + }, + inventory_image="3dforniture_inv_sink.png", + node_box = { + type = "fixed", + fixed = { + { -0.15, 0.35, 0.20, 0.15, 0.40, 0.50, }, + { -0.25, 0.40, 0.40, 0.25, 0.45, 0.50, }, + { -0.25, 0.40, 0.15, -0.15, 0.45, 0.40, }, + { 0.15, 0.40, 0.15, 0.25, 0.45, 0.40, }, + { -0.15, 0.40, 0.15, 0.15, 0.45, 0.20, }, + { -0.30, 0.45, 0.40, 0.30, 0.50, 0.50, }, + { -0.30, 0.45, 0.10, -0.25, 0.50, 0.40, }, + { 0.25, 0.45, 0.10, 0.30, 0.50, 0.40, }, + { -0.25, 0.45, 0.10, 0.25, 0.50, 0.15, }, + {-0.1, -0.5, 0.3, 0.1, 0.4, 0.5}, + }, + }, + selection_box = { + type = "fixed", + fixed = {-0.3,-0.5,0.1, 0.3,0.5,0.5}, + }, + groups = {cracky=2,}, + sounds = default.node_sound_stone_defaults(), +}) + +--Taps +homedecor.register("taps", { + description = S("Taps"), + tiles = { "forniture_metal.png" }, + inventory_image="3dforniture_inv_taps.png", + sunlight_propagates = true, + node_box = { + type = "fixed", + fixed = { + { -0.25, -0.450, 0.49, 0.25, -0.30, 0.50, }, + { -0.05, -0.400, 0.25, 0.05, -0.35, 0.50, }, + { -0.05, -0.425, 0.25, 0.05, -0.40, 0.30, }, + { -0.20, -0.400, 0.45, -0.15, -0.35, 0.50, }, + { -0.20, -0.450, 0.40, -0.15, -0.30, 0.45, }, + { -0.25, -0.400, 0.40, -0.10, -0.35, 0.45, }, + { 0.15, -0.400, 0.45, 0.20, -0.35, 0.50, }, + { 0.15, -0.450, 0.40, 0.20, -0.30, 0.45, }, + { 0.10, -0.400, 0.40, 0.25, -0.35, 0.45, }, + }, + }, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.45, 0.25, 0.25, -0.3, 0.5 }, + }, + groups = {cracky=2,}, + sounds = default.node_sound_stone_defaults(), +}) + +--Shower Tray +homedecor.register("shower_tray", { + description = S("Shower Tray"), + tiles = { + "forniture_marble_base_ducha_top.png", + "forniture_marble.png" + }, + sunlight_propagates = true, + legacy_facedir_simple = true, + node_box = { + type = "fixed", + fixed = { + { -0.50, -0.50, -0.50, 0.50, -0.45, 0.50, }, + { -0.50, -0.45, -0.50, 0.50, -0.40, -0.45, }, + { -0.50, -0.45, 0.45, 0.50, -0.40, 0.50, }, + { -0.50, -0.45, -0.45, -0.45, -0.40, 0.45, }, + { 0.45, -0.45, -0.45, 0.50, -0.40, 0.45, }, + }, + }, + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 }, + }, + groups = {cracky=2,}, + sounds = default.node_sound_stone_defaults(), +}) + +--Shower Head +homedecor.register("shower_head", { + description = S("Shower Head"), + tiles = { "forniture_metal.png" }, + inventory_image="3dforniture_inv_shower_head.png", + sunlight_propagates = true, + node_box = { + type = "fixed", + fixed = { + { -0.10, -0.50, 0.10, 0.10, -0.40, 0.30, }, + { -0.05, -0.40, 0.15, 0.05, -0.30, 0.25, }, + { -0.05, -0.35, 0.25, 0.05, -0.30, 0.50, }, + { -0.10, -0.40, 0.49, 0.10, -0.25, 0.50, }, + }, + }, + selection_box = { + type = "fixed", + fixed = { -0.1, -0.5, 0.1, 0.1, -0.25, 0.5 }, + }, + groups = {cracky=2,}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_alias("3dforniture:toilet", "homedecor:toilet") +minetest.register_alias("3dforniture:toilet_open", "homedecor:toilet_open") +minetest.register_alias("3dforniture:sink", "homedecor:sink") +minetest.register_alias("3dforniture:taps", "homedecor:taps") +minetest.register_alias("3dforniture:shower_tray", "homedecor:shower_tray") +minetest.register_alias("3dforniture:shower_head", "homedecor:shower_head") +minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_off") + +minetest.register_alias("toilet", "homedecor:toilet") +minetest.register_alias("sink", "homedecor:sink") +minetest.register_alias("taps", "homedecor:taps") +minetest.register_alias("shower_tray", "homedecor:shower_tray") +minetest.register_alias("shower_head", "homedecor:shower_head") +minetest.register_alias("table_lamp", "homedecor:table_lamp_off") diff --git a/mods/homedecor_modpack/homedecor/climate-control.lua b/mods/homedecor_modpack/homedecor/climate-control.lua index 9dbcb88e..b3e08335 100644 --- a/mods/homedecor_modpack/homedecor/climate-control.lua +++ b/mods/homedecor_modpack/homedecor/climate-control.lua @@ -2,8 +2,7 @@ local S = homedecor.gettext -minetest.register_node('homedecor:air_conditioner', { - drawtype = "nodebox", +homedecor.register("air_conditioner", { description = S("Air Conditioner"), tiles = { 'homedecor_ac_tb.png', 'homedecor_ac_tb.png', @@ -11,10 +10,6 @@ minetest.register_node('homedecor:air_conditioner', { 'homedecor_ac_sides.png', 'homedecor_ac_back.png', 'homedecor_ac_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), node_box = { @@ -24,25 +19,22 @@ minetest.register_node('homedecor:air_conditioner', { {-0.5, 0.125, -0.5, 0.5, 0.5, 0.5 }, } }, - selection_box = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } + selection_box = { type="regular" }, }) -- fans minetest.register_entity("homedecor:mesh_desk_fan", { - collisionbox = { 0, 0, 0, 0, 0, 0 }, - visual = "mesh", + collisionbox = homedecor.nodebox.null, + visual = "mesh", mesh = "homedecor_desk_fan.b3d", - textures = {"homedecor_desk_fan_uv.png"}, + textures = {"homedecor_desk_fan_uv.png"}, visual_size = {x=10, y=10}, }) -minetest.register_node("homedecor:desk_fan", { +homedecor.register("desk_fan", { description = "Desk Fan", - drawtype = "nodebox", - paramtype2 = "facedir", legacy_facedir_simple = true, - paramtype = "light", groups = {oddly_breakable_by_hand=2}, node_box = { type = "fixed", @@ -53,12 +45,7 @@ minetest.register_node("homedecor:desk_fan", { tiles = {"homedecor_desk_fan_body.png"}, inventory_image = "homedecor_desk_fan_inv.png", wield_image = "homedecor_desk_fan_inv.png", - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - } - }, + selection_box = { type = "regular" }, on_construct = function(pos) local entity_remove = minetest.get_objects_inside_radius(pos, 0.1) local meta = minetest.get_meta(pos) @@ -88,7 +75,7 @@ minetest.register_node("homedecor:desk_fan", { speedy_meta:set_string("active", "no") print (speedy_meta:get_string("active")) end - + if entity_anim[1] == nil then minetest.add_entity({x=pos.x, y=pos.y, z=pos.z}, "homedecor:mesh_desk_fan") --+(0.0625*10) local entity_remove = minetest.get_objects_inside_radius(pos, 0.1) @@ -117,9 +104,8 @@ minetest.register_node("homedecor:desk_fan", { -- ceiling fan -minetest.register_node('homedecor:ceiling_fan', { +homedecor.register("ceiling_fan", { description = S("Ceiling Fan"), - drawtype = "nodebox", tiles = { { name="homedecor_ceiling_fan_top.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.5} }, @@ -135,10 +121,6 @@ minetest.register_node('homedecor:ceiling_fan', { { -0.0625, 0.375, -0.0625, 0.0625, 0.5, 0.0625 } } }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), @@ -146,8 +128,7 @@ minetest.register_node('homedecor:ceiling_fan', { -- heating devices -minetest.register_node('homedecor:space_heater', { - drawtype = "nodebox", +homedecor.register("space_heater", { description = S("Space heater"), tiles = { 'homedecor_heater_tb.png', 'homedecor_heater_tb.png', @@ -158,9 +139,6 @@ minetest.register_node('homedecor:space_heater', { }, inventory_image = "homedecor_heater_inv.png", sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), node_box = { @@ -175,14 +153,11 @@ minetest.register_node('homedecor:space_heater', { } }) -minetest.register_node("homedecor:radiator", { +homedecor.register("radiator", { tiles = { "homedecor_white_metal.png" }, inventory_image = "homedecor_radiator_inv.png", description = "Radiator heater", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3}, node_box = { type = "fixed", fixed = { diff --git a/mods/homedecor_modpack/homedecor/clocks.lua b/mods/homedecor_modpack/homedecor/clocks.lua index bf90fba4..c51a4b25 100644 --- a/mods/homedecor_modpack/homedecor/clocks.lua +++ b/mods/homedecor_modpack/homedecor/clocks.lua @@ -1,12 +1,9 @@ -minetest.register_node("homedecor:analog_clock_plastic", { +homedecor.register("analog_clock_plastic", { description = "Analog clock (plastic)", - drawtype = "mesh", mesh = "homedecor_analog_clock.obj", tiles = { "homedecor_analog_clock_plastic.png" }, inventory_image = "homedecor_analog_clock_plastic_inv.png", - paramtype = "light", - paramtype2 = "facedir", - node_box = { + collision_box = { type = "fixed", fixed = { { -8/32, -3/32, 15/32, 8/32, 3/32, 16/32 }, @@ -23,15 +20,12 @@ minetest.register_node("homedecor:analog_clock_plastic", { groups = {snappy=3}, }) -minetest.register_node("homedecor:analog_clock_wood", { +homedecor.register("analog_clock_wood", { description = "Analog clock (wood)", - drawtype = "mesh", mesh = "homedecor_analog_clock.obj", tiles = { "homedecor_analog_clock_wood.png" }, inventory_image = "homedecor_analog_clock_wood_inv.png", - paramtype = "light", - paramtype2 = "facedir", - node_box = { + collision_box = { type = "fixed", fixed = { { -8/32, -3/32, 15/32, 8/32, 3/32, 16/32 }, @@ -48,9 +42,8 @@ minetest.register_node("homedecor:analog_clock_wood", { groups = {snappy=3}, }) -minetest.register_node("homedecor:digital_clock", { +homedecor.register("digital_clock", { description = "Digital clock", - drawtype = "nodebox", tiles = { "homedecor_digital_clock_edges.png", "homedecor_digital_clock_edges.png", @@ -60,8 +53,6 @@ minetest.register_node("homedecor:digital_clock", { "homedecor_digital_clock_front.png" }, inventory_image = "homedecor_digital_clock_inv.png", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -71,9 +62,8 @@ minetest.register_node("homedecor:digital_clock", { groups = {snappy=3}, }) -minetest.register_node("homedecor:alarm_clock", { +homedecor.register("alarm_clock", { description = "Alarm clock", - drawtype = "nodebox", tiles = { "homedecor_alarm_clock_top.png", "homedecor_alarm_clock_bottom.png", @@ -83,8 +73,6 @@ minetest.register_node("homedecor:alarm_clock", { "homedecor_alarm_clock_front.png" }, inventory_image = "homedecor_alarm_clock_inv.png", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { diff --git a/mods/homedecor_modpack/homedecor/cobweb.lua b/mods/homedecor_modpack/homedecor/cobweb.lua index 01cdb88b..dacdeba6 100644 --- a/mods/homedecor_modpack/homedecor/cobweb.lua +++ b/mods/homedecor_modpack/homedecor/cobweb.lua @@ -8,19 +8,16 @@ minetest.register_node("homedecor:cobweb_corner", { paramtype2 = "wallmounted", sunlight_propagates = true, liquid_viscosity = 8, - liquidtype = "source", - liquid_alternative_flowing = "homedecor:cobweb_corner", - liquid_alternative_source = "homedecor:cobweb_corner", - liquid_renewable = false, - liquid_range = 0, + liquidtype = "source", + liquid_alternative_flowing = "homedecor:cobweb_corner", + liquid_alternative_source = "homedecor:cobweb_corner", + liquid_renewable = false, + liquid_range = 0, walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} - }, + selection_box = { type = "regular" }, visual_scale = 1.4, groups = { snappy = 3, liquid=3 }, - after_place_node = function(pos, placer, itemstack, pointed_thing) + after_place_node = function(pos, placer, itemstack, pointed_thing) homedecor.rotate_cobweb(pos) end }) @@ -34,11 +31,11 @@ minetest.register_node("homedecor:cobweb_centered", { paramtype2 = "facedir", sunlight_propagates = true, liquid_viscosity = 8, - liquidtype = "source", - liquid_alternative_flowing = "homedecor:cobweb_centered", - liquid_alternative_source = "homedecor:cobweb_centered", - liquid_renewable = false, - liquid_range = 0, + liquidtype = "source", + liquid_alternative_flowing = "homedecor:cobweb_centered", + liquid_alternative_source = "homedecor:cobweb_centered", + liquid_renewable = false, + liquid_range = 0, walkable = false, selection_box = { type = "fixed", @@ -61,11 +58,11 @@ minetest.register_node("homedecor:cobweb_flat", { paramtype2 = "facedir", sunlight_propagates = true, liquid_viscosity = 8, - liquidtype = "source", - liquid_alternative_flowing = "homedecor:cobweb_flat", - liquid_alternative_source = "homedecor:cobweb_flat", - liquid_renewable = false, - liquid_range = 0, + liquidtype = "source", + liquid_alternative_flowing = "homedecor:cobweb_flat", + liquid_alternative_source = "homedecor:cobweb_flat", + liquid_renewable = false, + liquid_range = 0, walkable = false, selection_box = { type = "fixed", @@ -88,16 +85,13 @@ minetest.register_node("homedecor:cobweb_plantlike", { paramtype2 = "facedir", sunlight_propagates = true, liquid_viscosity = 8, - liquidtype = "source", - liquid_alternative_flowing = "homedecor:cobweb_plantlike", - liquid_alternative_source = "homedecor:cobweb_plantlike", - liquid_renewable = false, - liquid_range = 0, + liquidtype = "source", + liquid_alternative_flowing = "homedecor:cobweb_plantlike", + liquid_alternative_source = "homedecor:cobweb_plantlike", + liquid_renewable = false, + liquid_range = 0, walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} - }, + selection_box = { type = "regular" }, visual_scale = 1.189, groups = { snappy = 3, liquid=3, not_in_creative_inventory = 1 }, drop = "homedecor:cobweb_corner" @@ -119,23 +113,23 @@ function homedecor.rotate_cobweb(pos) -- only xm+zp, or only xp+zm means on-floor torchlike if (iswall_xm and iswall_zp and not iswall_xp and not iswall_zm) - or (iswall_xp and iswall_zm and not iswall_xm and not iswall_zp) then + or (iswall_xp and iswall_zm and not iswall_xm and not iswall_zp) then minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 1}) - + -- only xm+zm, or only xp+zp means on-ceiling torchlike - elseif (iswall_xm and iswall_zm and not iswall_xp and not iswall_zp) - or (iswall_xp and iswall_zp and not iswall_xm and not iswall_zm) then + elseif (iswall_xm and iswall_zm and not iswall_xp and not iswall_zp) + or (iswall_xp and iswall_zp and not iswall_xm and not iswall_zm) then minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 0}) - + -- only xm+xp means nodebox (not rotated, 0 degrees) - elseif iswall_xm and iswall_xp and not iswall_zm and not iswall_zp then + elseif iswall_xm and iswall_xp and not iswall_zm and not iswall_zp then minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 0}) - + -- only zm+zp means nodebox rotated to 90 degrees - elseif iswall_zm and iswall_zp and not iswall_xm and not iswall_xp then + elseif iswall_zm and iswall_zp and not iswall_xm and not iswall_xp then minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 1}) -- ok, there aren't any simple two-wall corners or opposing walls. @@ -152,7 +146,7 @@ function homedecor.rotate_cobweb(pos) elseif iswall_zp and not iswall_xm and not iswall_xp and not iswall_zm then minetest.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 0}) - + -- if all else fails, place the plantlike version as a fallback. else diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index 84f56778..b35d1f08 100644 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -406,7 +406,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:glass_table_large_b 2", - recipe = { + recipe = { { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, } }) @@ -424,14 +424,14 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:wood_table_small_square_b 2", - recipe = { + recipe = { { "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }, } }) minetest.register_craft( { output = "homedecor:wood_table_large_b 2", - recipe = { + recipe = { { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, } }) @@ -495,7 +495,7 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:skylight 4", - recipe = { + recipe = { { "homedecor:glass_table_large", "homedecor:glass_table_large" }, { "homedecor:glass_table_large", "homedecor:glass_table_large" }, }, @@ -1842,7 +1842,7 @@ minetest.register_craft( { }, }) --- woodglass door +-- woodglass door minetest.register_craft( { output = "homedecor:door_woodglass_bottom_left", @@ -2133,6 +2133,15 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:cardboard_box_big 2", + recipe = { + { "default:paper", "", "default:paper" }, + { "default:paper", "", "default:paper" }, + { "default:paper", "default:paper", "default:paper" }, + }, +}) + minetest.register_craft({ output = "homedecor:desk", recipe = { @@ -2370,7 +2379,7 @@ minetest.register_craft( { -- bathroom/kitchen tiles -local color_pairings = { +local color_pairings = { { "grey", "white", "1" }, { "dark_grey", "white", "2" }, { "black", "white", "3" }, @@ -2879,7 +2888,10 @@ minetest.register_craft({ local bookcolors = { "red", "green", - "blue" + "blue", + "violet", + "grey", + "brown" } for _, color in ipairs(bookcolors) do @@ -2917,7 +2929,7 @@ minetest.register_craft({ "homedecor:bottle_brown", "homedecor:bottle_brown", "homedecor:bottle_brown", - "homedecor:bottle_brown" + "homedecor:bottle_brown" }, }) @@ -2928,7 +2940,7 @@ minetest.register_craft({ "homedecor:bottle_green", "homedecor:bottle_green", "homedecor:bottle_green", - "homedecor:bottle_green" + "homedecor:bottle_green" }, }) diff --git a/mods/homedecor_modpack/homedecor/door_models.lua b/mods/homedecor_modpack/homedecor/door_models.lua index 5315df09..32baf210 100644 --- a/mods/homedecor_modpack/homedecor/door_models.lua +++ b/mods/homedecor_modpack/homedecor/door_models.lua @@ -22,7 +22,7 @@ homedecor.door_models = { { -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, 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 }, @@ -54,7 +54,7 @@ homedecor.door_models = { { -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, 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 }, @@ -93,7 +93,7 @@ homedecor.door_models = { { -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, 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 }, @@ -125,7 +125,7 @@ homedecor.door_models = { { -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, 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 }, diff --git a/mods/homedecor_modpack/homedecor/doors_and_gates.lua b/mods/homedecor_modpack/homedecor/doors_and_gates.lua index 789a9c34..7eedb516 100644 --- a/mods/homedecor_modpack/homedecor/doors_and_gates.lua +++ b/mods/homedecor_modpack/homedecor/doors_and_gates.lua @@ -20,12 +20,7 @@ local function countSolids(pos,node,level) local solids = 0 for x = -1, 1 do for z = -1, 1 do - local y = 0 - if node.param2 == 5 then - y = -level - else - y = level - end + local y = (node.param2 == 5) and -level or level -- special cases when x == z == 0 if x == 0 and z == 0 then if level == 1 then @@ -76,12 +71,7 @@ local function calculateClosed(pos) return true end end - local x - if direction == 1 then - x = 1 - else - x = -1 - end + local x = (direction == 1) and 1 or -1 if isSolid(pos,{x,0,-1}) and not isSolid(pos,{x,0,0}) and isSolid(pos,{x,0,1}) then if string.find(node.name,'_bottom_') then return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) @@ -89,9 +79,9 @@ local function calculateClosed(pos) return true end end - return false + return false else - -- direction == 3 or 4 + -- direction == 3 or 4 if isSolid(pos,{-1,0,0}) and isSolid(pos,{1,0,0}) then if string.find(node.name,'_bottom_') then return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) @@ -99,12 +89,7 @@ local function calculateClosed(pos) return true end end - local z - if direction == 3 then - z = 1 - else - z = -1 - end + local z = (direction == 3) and 1 or -1 if isSolid(pos,{-1,0,z}) and not isSolid(pos,{0,0,z}) and isSolid(pos,{1,0,z}) then if string.find(node.name,'_bottom_') then return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) @@ -122,11 +107,7 @@ end local function getClosed(pos) local isClosed = minetest.get_meta(pos):get_string('closed') if isClosed=='' then - if calculateClosed(pos) then - return true - else - return false - end + return calculateClosed(pos) else isClosed = tonumber(isClosed) -- may be closed or open (1 or 0) @@ -135,13 +116,8 @@ local function getClosed(pos) end local function addDoorNode(pos,def,isClosed) - if isClosed then - isClosed = 1 - else - isClosed = 0 - end - minetest.add_node(pos, def) - minetest.get_meta(pos):set_int('closed',isClosed) + minetest.set_node(pos, def) + minetest.get_meta(pos):set_int('closed', isClosed and 1 or 0) end local sides = {"left", "right"} @@ -210,7 +186,6 @@ for i in ipairs(sides) do paramtype2 = "facedir", groups = {snappy=3, not_in_creative_inventory=1}, sounds = default.node_sound_wood_defaults(), - walkable = true, use_texture_alpha = texalpha, selection_box = selectboxes_top, node_box = { @@ -229,7 +204,7 @@ for i in ipairs(sides) do }) local dgroups = {snappy=3, not_in_creative_inventory=1} - if side == "left" then + if side == "left" then dgroups = {snappy=3} end @@ -243,7 +218,6 @@ for i in ipairs(sides) do paramtype2 = "facedir", groups = dgroups, sounds = default.node_sound_wood_defaults(), - walkable = true, use_texture_alpha = texalpha, selection_box = selectboxes_bottom, node_box = { @@ -256,9 +230,12 @@ for i in ipairs(sides) do end end, on_place = function(itemstack, placer, pointed_thing) - local keys=placer:get_player_control() - homedecor.place_door(itemstack, placer, pointed_thing, doorname, keys["sneak"]) - return itemstack + 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") + end, + on_construct = function(pos) + minetest.get_meta(pos):set_int("closed", 1) end, on_rightclick = function(pos, node, clicker) homedecor.flip_door(pos, node, clicker, doorname, side) @@ -319,7 +296,7 @@ local gate_models_open = { {{ 0.498, -0.5, -0.5, 0.498, 0.5, 0.5 }}, {{ 0.498, -0.5, -0.5, 0.498, 0.5, 0.5 }}, - + {{ 6/16, -8/16, -8/16, 8/16, 8/16, -6/16 }, -- left post { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post { 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece @@ -350,10 +327,8 @@ for i in ipairs(gates_list) do "homedecor_gate_"..gate.."_front.png" }, paramtype = "light", - is_ground_content = true, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, paramtype2 = "facedir", selection_box = { type = "fixed", @@ -410,78 +385,6 @@ minetest.register_alias("homedecor:fence_picket_gate_closed", "homedecor:g minetest.register_alias("homedecor:fence_picket_gate_white_open", "homedecor:gate_picket_white_open") minetest.register_alias("homedecor:fence_picket_gate_white_closed", "homedecor:gate_picket_white_closed") ------ helper functions - -function homedecor.place_door(itemstack, placer, pointed_thing, name, forceright) - - local pointed = pointed_thing.under - local pnode = minetest.get_node(pointed) - local pname = pnode.name - local rnodedef = minetest.registered_nodes[pname] - - if rnodedef then - - if rnodedef.on_rightclick then - rnodedef.on_rightclick(pointed_thing.under, pnode, placer, itemstack) - return - end - - local pos1 = nil - local pos2 = nil - - if rnodedef["buildable_to"] then - pos1 = pointed - pos2 = {x=pointed.x, y=pointed.y+1, z=pointed.z} - else - pos1 = pointed_thing.above - pos2 = {x=pointed_thing.above.x, y=pointed_thing.above.y+1, z=pointed_thing.above.z} - end - - local node_bottom = minetest.get_node(pos1) - local node_top = minetest.get_node(pos2) - - if minetest.is_protected(pos1, placer:get_player_name()) then - minetest.record_protection_violation(pos1, - placer:get_player_name()) - return - end - - if minetest.is_protected(pos2, placer:get_player_name()) then - minetest.record_protection_violation(pos2, - placer:get_player_name()) - return - end - - if not homedecor.get_nodedef_field(node_bottom.name, "buildable_to") - or not homedecor.get_nodedef_field(node_top.name, "buildable_to") then - minetest.chat_send_player( placer:get_player_name(), S('Not enough space above that spot to place a door!') ) - else - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local p_tests = { - {x=pos1.x-1, y=pos1.y, z=pos1.z}, - {x=pos1.x, y=pos1.y, z=pos1.z+1}, - {x=pos1.x+1, y=pos1.y, z=pos1.z}, - {x=pos1.x, y=pos1.y, z=pos1.z-1}, - } - print("fdir="..fdir) - local testnode = minetest.get_node(p_tests[fdir+1]) - local side = "left" - - if string.find(testnode.name, "homedecor:door_"..name.."_bottom_left") or forceright then - side = "right" - end - - local def = { name = "homedecor:door_"..name.."_bottom_"..side, param2=fdir} - addDoorNode(pos1, def, true) - minetest.add_node(pos2, { name = "homedecor:door_"..name.."_top_"..side, param2=fdir}) - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - end - end -end - -- to open a door, you switch left for right and subtract from param2, or vice versa right for left -- that is to say open "right" doors become left door nodes, and open left doors right door nodes. -- also adjusting param2 so the node is at 90 degrees. @@ -507,12 +410,7 @@ function homedecor.flip_door(pos, node, player, name, side, isClosed) nfdir=ofdir + 1 if nfdir > 3 then nfdir = 0 end end - local sound; - if isClosed then - sound = 'close' - else - sound = 'open' - end + local sound = isClosed and 'close' or 'open' minetest.sound_play("homedecor_door_"..sound, { pos=pos, max_hear_distance = 5, @@ -598,7 +496,7 @@ minetest.register_node("homedecor:japanese_wall_top", { }, selection_box = { type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, } }) @@ -634,7 +532,7 @@ minetest.register_node("homedecor:japanese_wall_middle", { }, selection_box = { type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, } }) @@ -669,7 +567,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", { }, selection_box = { type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, } }) @@ -694,7 +592,7 @@ minetest.register_node("homedecor:tatami_mat", { } }) -minetest.register_node("homedecor:jpn_door_bottom", { +homedecor.register("jpn_door_bottom", { description = "Japanese-style door", inventory_image = "homedecor_jpn_door_inv.png", tiles = { @@ -704,13 +602,10 @@ minetest.register_node("homedecor:jpn_door_bottom", { "homedecor_japanese_wall_edges.png", "homedecor_japanese_door_bottom.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", - 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 @@ -724,29 +619,9 @@ minetest.register_node("homedecor:jpn_door_bottom", { }, selection_box = { type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 1.5, 0.0625}, + fixed = {-0.5, -0.5, 0, 0.5, 1.5, 0.0625}, }, - on_place = function(itemstack, placer, pointed_thing) - - local pointed = pointed_thing.under - local pnode = minetest.get_node(pointed) - local pname = pnode.name - local rnodedef = minetest.registered_nodes[pname] - - if rnodedef.on_rightclick then - rnodedef.on_rightclick(pointed, pnode, placer) - return - end - - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:jpn_door_bottom", "homedecor:jpn_door_top") - 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" then - minetest.remove_node(pos2) - end - end, + expand = { top = "homedecor:jpn_door_top" }, on_rightclick = function(pos, node, clicker) fdir = minetest.get_node(pos).param2 minetest.set_node(pos, {name = "homedecor:jpn_door_bottom_open", param2 = fdir}) @@ -768,7 +643,7 @@ minetest.register_node("homedecor:jpn_door_top", { groups = { snappy = 3, not_in_creative_inventory = 1 }, node_box = { type = "fixed", - 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 @@ -780,10 +655,7 @@ minetest.register_node("homedecor:jpn_door_top", { {0.1565, -0.5, 0, 0.2185, 0.5, 0.0625}, -- NodeBox9 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 }, - }, + selection_box = homedecor.nodebox.null, }) minetest.register_node("homedecor:jpn_door_bottom_open", { @@ -800,7 +672,7 @@ minetest.register_node("homedecor:jpn_door_bottom_open", { groups = { snappy = 3, not_in_creative_inventory = 1 }, node_box = { type = "fixed", - 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 @@ -844,7 +716,7 @@ minetest.register_node("homedecor:jpn_door_top_open", { groups = { snappy = 3, not_in_creative_inventory = 1 }, node_box = { type = "fixed", - 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 @@ -856,10 +728,7 @@ minetest.register_node("homedecor:jpn_door_top_open", { {-0.84375, -0.5, -0.0625, -0.7815, 0.5, 0}, -- NodeBox9 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 }, - }, + selection_box = homedecor.nodebox.null, }) diff --git a/mods/homedecor_modpack/homedecor/electronics.lua b/mods/homedecor_modpack/homedecor/electronics.lua index cbd62665..85cf8fe7 100644 --- a/mods/homedecor_modpack/homedecor/electronics.lua +++ b/mods/homedecor_modpack/homedecor/electronics.lua @@ -2,7 +2,7 @@ local S = homedecor.gettext -minetest.register_node('homedecor:speaker', { +homedecor.register("speaker", { description = S("Large Stereo Speaker"), tiles = { 'homedecor_speaker_top.png', 'homedecor_speaker_bottom.png', @@ -10,17 +10,12 @@ minetest.register_node('homedecor:speaker', { 'homedecor_speaker_left.png', 'homedecor_speaker_back.png', 'homedecor_speaker_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:speaker_small', { +homedecor.register("speaker_small", { description = S("Small Surround Speaker"), - drawtype = "nodebox", tiles = { 'homedecor_speaker_top.png', 'homedecor_speaker_bottom.png', @@ -29,24 +24,19 @@ minetest.register_node('homedecor:speaker_small', { 'homedecor_speaker_back.png', 'homedecor_speaker_front.png' }, - selection_box = { - type = "fixed", - fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } - }, - node_box = { - type = "fixed", - fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = { + type = "fixed", + fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } + }, + node_box = { + type = "fixed", + fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } + }, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:stereo', { +homedecor.register("stereo", { description = S("Stereo Receiver"), tiles = { 'homedecor_stereo_top.png', 'homedecor_stereo_bottom.png', @@ -54,22 +44,16 @@ minetest.register_node('homedecor:stereo', { 'homedecor_stereo_left.png', 'homedecor_stereo_back.png', 'homedecor_stereo_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:projection_screen', { +homedecor.register("projection_screen", { description = S("Projection Screen Material"), drawtype = 'signlike', tiles = { 'homedecor_projection_screen.png' }, wield_image = 'homedecor_projection_screen_inv.png', inventory_image = 'homedecor_projection_screen_inv.png', - sunlight_propagates = false, - paramtype = 'light', walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -80,7 +64,7 @@ minetest.register_node('homedecor:projection_screen', { }, }) -minetest.register_node('homedecor:television', { +homedecor.register("television", { description = S("Small CRT Television"), tiles = { 'homedecor_television_top.png', 'homedecor_television_bottom.png', @@ -93,21 +77,16 @@ minetest.register_node('homedecor:television', { aspect_w=16, aspect_h=16, length=80.0 - } + } } }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, light_source = LIGHT_MAX - 1, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("homedecor:dvd_vcr", { +homedecor.register("dvd_vcr", { description = S("DVD and VCR"), - drawtype = "nodebox", tiles = { "homedecor_dvdvcr_top.png", "homedecor_dvdvcr_bottom.png", @@ -117,8 +96,6 @@ minetest.register_node("homedecor:dvd_vcr", { "homedecor_dvdvcr_front.png", }, inventory_image = "homedecor_dvdvcr_inv.png", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -130,7 +107,7 @@ minetest.register_node("homedecor:dvd_vcr", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("homedecor:telephone", { +homedecor.register("telephone", { tiles = { "homedecor_telephone_sides.png^[transformR180", "homedecor_telephone_sides.png", @@ -141,17 +118,14 @@ minetest.register_node("homedecor:telephone", { }, inventory_image = "homedecor_telephone_inv.png", description = "Telephone", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3}, node_box = { type = "fixed", fixed = { {-0.1875, -0.5, -0.1875, 0.1875, -0.4375, 0.15}, -- NodeBox1 {-0.125, -0.5, -0.130, 0.125, -0.3675, 0.15}, -- NodeBox2 {-0.175, -0.4375, -0.175, 0.175, -0.42, 0.15}, -- NodeBox3 - {-0.16, -0.42, -0.16, 0.16, -0.4025, 0.15}, -- NodeBox4 + {-0.16, -0.42, -0.16, 0.16, -0.4025, 0.15}, -- NodeBox4 {-0.145, -0.4025, -0.145, 0.145, -0.385, 0.15}, -- NodeBox5 {-0.11, -0.385, -0.115, 0.11, -0.35, 0.15}, -- NodeBox6 {-0.095, -0.5, -0.1, 0.095, -0.3325, 0.15}, -- NodeBox7 @@ -168,6 +142,6 @@ minetest.register_node("homedecor:telephone", { selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.1875, 0.25, -0.21, 0.15 } - } + } }) diff --git a/mods/homedecor_modpack/homedecor/fences.lua b/mods/homedecor_modpack/homedecor/fences.lua index 0ea258b7..27b33be5 100644 --- a/mods/homedecor_modpack/homedecor/fences.lua +++ b/mods/homedecor_modpack/homedecor/fences.lua @@ -16,41 +16,30 @@ end local S = homedecor.gettext -minetest.register_node("homedecor:fence_brass", { +homedecor.register("fence_brass", { description = S("Brass Fence/railing"), drawtype = "fencelike", tiles = {"homedecor_tile_brass.png"}, inventory_image = "homedecor_fence_brass.png", - paramtype = "light", - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, + selection_box = homedecor.nodebox.bar_y(1/7), groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, }) -minetest.register_node("homedecor:fence_wrought_iron", { +homedecor.register("fence_wrought_iron", { description = S("Wrought Iron Fence/railing"), drawtype = "fencelike", tiles = {"homedecor_tile_wrought_iron.png"}, inventory_image = "homedecor_fence_wrought_iron.png", - paramtype = "light", - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, + selection_box = homedecor.nodebox.bar_y(1/7), groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, }) -- brass/wrought iron with signs: -minetest.register_node("homedecor:fence_brass_with_sign", { +homedecor.register("fence_brass_with_sign", { description = S("Brass Fence/railing with sign"), - drawtype = "nodebox", tiles = { "homedecor_sign_brass_post_top.png", "homedecor_sign_brass_post_bottom.png", @@ -60,12 +49,9 @@ minetest.register_node("homedecor:fence_brass_with_sign", { "homedecor_sign_brass_post_front.png", }, wield_image = "homedecor_sign_brass_post.png", - paramtype = "light", - paramtype2 = "facedir", node_box = sign_post_model, groups = {snappy=3,not_in_creative_inventory=1}, sounds = default.node_sound_wood_defaults(), - walkable = true, sunlight_propagates = true, drop = { max_items = 2, @@ -76,9 +62,8 @@ minetest.register_node("homedecor:fence_brass_with_sign", { }, }) -minetest.register_node("homedecor:fence_wrought_iron_with_sign", { +homedecor.register("fence_wrought_iron_with_sign", { description = S("Wrought Iron Fence/railing with sign"), - drawtype = "nodebox", tiles = { "homedecor_sign_wrought_iron_post_top.png", "homedecor_sign_wrought_iron_post_bottom.png", @@ -88,12 +73,9 @@ minetest.register_node("homedecor:fence_wrought_iron_with_sign", { "homedecor_sign_wrought_iron_post_front.png", }, wield_image = "homedecor_sign_wrought_iron_post.png", - paramtype = "light", - paramtype2 = "facedir", node_box = sign_post_model, groups = {snappy=3,not_in_creative_inventory=1}, sounds = default.node_sound_wood_defaults(), - walkable = true, sunlight_propagates = true, drop = { max_items = 2, @@ -106,10 +88,9 @@ minetest.register_node("homedecor:fence_wrought_iron_with_sign", { -- other types of fences -minetest.register_node("homedecor:fence_picket", { - drawtype = "nodebox", - description = S("Unpainted Picket Fence"), - tiles = { +homedecor.register("fence_picket", { + description = S("Unpainted Picket Fence"), + tiles = { "homedecor_blanktile.png", "homedecor_blanktile.png", "homedecor_fence_picket.png", @@ -117,24 +98,19 @@ minetest.register_node("homedecor:fence_picket", { "homedecor_fence_picket_backside.png", "homedecor_fence_picket.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 } - }, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 } + }, }) -minetest.register_node("homedecor:fence_picket_corner", { - drawtype = "nodebox", +homedecor.register("fence_picket_corner", { description = S("Unpainted Picket Fence Corner"), tiles = { "homedecor_blanktile.png", @@ -144,12 +120,8 @@ minetest.register_node("homedecor:fence_picket_corner", { "homedecor_fence_picket_backside.png", "homedecor_fence_picket.png", }, - paramtype = "light", - is_ground_content = true, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", selection_box = { type = "fixed", fixed = { @@ -166,10 +138,9 @@ minetest.register_node("homedecor:fence_picket_corner", { }, }) -minetest.register_node("homedecor:fence_picket_white", { - drawtype = "nodebox", - description = S("White Picket Fence"), - tiles = { +homedecor.register("fence_picket_white", { + description = S("White Picket Fence"), + tiles = { "homedecor_blanktile.png", "homedecor_blanktile.png", "homedecor_fence_picket_white.png", @@ -177,24 +148,19 @@ minetest.register_node("homedecor:fence_picket_white", { "homedecor_fence_picket_white_backside.png", "homedecor_fence_picket_white.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 } - }, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 } + }, }) -minetest.register_node("homedecor:fence_picket_corner_white", { - drawtype = "nodebox", +homedecor.register("fence_picket_corner_white", { description = S("White Picket Fence Corner"), tiles = { "homedecor_blanktile.png", @@ -204,12 +170,8 @@ minetest.register_node("homedecor:fence_picket_corner_white", { "homedecor_fence_picket_white_backside.png", "homedecor_fence_picket_white.png", }, - paramtype = "light", - is_ground_content = true, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", selection_box = { type = "fixed", fixed = { @@ -226,10 +188,9 @@ minetest.register_node("homedecor:fence_picket_corner_white", { }, }) -minetest.register_node("homedecor:fence_privacy", { - drawtype = "nodebox", - description = S("Wooden Privacy Fence"), - tiles = { +homedecor.register("fence_privacy", { + description = S("Wooden Privacy Fence"), + tiles = { "homedecor_fence_privacy_tb.png", "homedecor_fence_privacy_tb.png", "homedecor_fence_privacy_sides.png", @@ -237,31 +198,26 @@ minetest.register_node("homedecor:fence_privacy", { "homedecor_fence_privacy_backside.png", "homedecor_fence_privacy_front.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 5/16, 0.5, 0.5, 8/16 } - }, - node_box = { - type = "fixed", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 5/16, 0.5, 0.5, 8/16 } + }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, 5/16, -5/16, 8/16, 7/16 }, -- left part { -4/16, -8/16, 5/16, 3/16, 8/16, 7/16 }, -- middle part { 4/16, -8/16, 5/16, 8/16, 8/16, 7/16 }, -- right part { -8/16, -2/16, 7/16, 8/16, 2/16, 8/16 }, -- connecting rung } - }, + }, }) -minetest.register_node("homedecor:fence_privacy_corner", { - drawtype = "nodebox", - description = S("Wooden Privacy Fence Corner"), - tiles = { +homedecor.register("fence_privacy_corner", { + description = S("Wooden Privacy Fence Corner"), + tiles = { "homedecor_fence_privacy_corner_top.png", "homedecor_fence_privacy_corner_bottom.png", "homedecor_fence_privacy_corner_right.png", @@ -269,21 +225,17 @@ minetest.register_node("homedecor:fence_privacy_corner", { "homedecor_fence_privacy_backside.png", "homedecor_fence_privacy_corner_front.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { { -0.5, -0.5, 5/16, 0.5, 0.5, 0.5 }, { -0.5, -0.5, -0.5, -5/16, 0.5, 5/16 }, - } - }, - node_box = { - type = "fixed", + } + }, + node_box = { + type = "fixed", fixed = { { -7/16, -8/16, 5/16, -5/16, 8/16, 7/16 }, -- left part { -4/16, -8/16, 5/16, 3/16, 8/16, 7/16 }, -- middle part @@ -295,54 +247,44 @@ minetest.register_node("homedecor:fence_privacy_corner", { { -7/16, -8/16, -8/16, -5/16, 8/16, -5/16 }, -- front-most part { -8/16, -2/16, -8/16, -7/16, 2/16, 7/16 }, -- left-side connecting rung } - }, + }, }) -minetest.register_node("homedecor:fence_barbed_wire", { - drawtype = "nodebox", - description = S("Barbed Wire Fence"), - tiles = {"homedecor_fence_barbed_wire.png"}, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.375, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", +homedecor.register("fence_barbed_wire", { + description = S("Barbed Wire Fence"), + tiles = {"homedecor_fence_barbed_wire.png"}, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.375, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post { -6/16, -8/16, 7/16, 6/16, 8/16, 7/16 } -- the wire - } - }, + } + }, }) -minetest.register_node("homedecor:fence_barbed_wire_corner", { - drawtype = "nodebox", - description = S("Barbed Wire Fence Corner"), - tiles = { +homedecor.register("fence_barbed_wire_corner", { + description = S("Barbed Wire Fence Corner"), + tiles = { "homedecor_fence_barbed_wire.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { { -0.5, -0.5, 0.375, 0.5, 0.5, 0.5 }, - { -0.5, -0.5, -0.5, -0.375, 0.5, 0.375 } + { -0.5, -0.5, -0.5, -0.375, 0.5, 0.375 } } - }, - node_box = { - type = "fixed", + }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post @@ -350,14 +292,13 @@ minetest.register_node("homedecor:fence_barbed_wire_corner", { { -8/16, -8/16, -8/16, -6/16, 8/16, -6/16 }, -- front post { -7/16, -8/16, -6/16, -7/16, 8/16, 6/16 } -- more wire - } - }, + } + }, }) -minetest.register_node("homedecor:fence_chainlink", { - drawtype = "nodebox", - description = S("Chainlink Fence"), - tiles = { +homedecor.register("fence_chainlink", { + description = S("Chainlink Fence"), + tiles = { "homedecor_fence_chainlink_tb.png", "homedecor_fence_chainlink_tb.png", "homedecor_fence_chainlink_sides.png", @@ -365,30 +306,25 @@ minetest.register_node("homedecor:fence_chainlink", { "homedecor_fence_chainlink_fb.png", "homedecor_fence_chainlink_fb.png", }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.375, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.375, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, 6/16, -7/16, 8/16, 8/16 }, -- left post { 7/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post { -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece { -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 } -- the chainlink itself - } - }, + } + }, }) -minetest.register_node("homedecor:fence_chainlink_corner", { - drawtype = "nodebox", +homedecor.register("fence_chainlink_corner", { description = S("Chainlink Fence Corner"), tiles = { "homedecor_fence_chainlink_corner_top.png", @@ -398,12 +334,8 @@ minetest.register_node("homedecor:fence_chainlink_corner", { "homedecor_fence_chainlink_corner_front.png", "homedecor_fence_chainlink_corner_front.png", }, - paramtype = "light", - is_ground_content = true, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", selection_box = { type = "fixed", fixed = { @@ -427,10 +359,9 @@ minetest.register_node("homedecor:fence_chainlink_corner", { }, }) -minetest.register_node("homedecor:fence_wrought_iron_2", { - drawtype = "nodebox", - description = S("Wrought Iron fence (type 2)"), - tiles = { +homedecor.register("fence_wrought_iron_2", { + description = S("Wrought Iron fence (type 2)"), + tiles = { "homedecor_fence_wrought_iron_2_tb.png", "homedecor_fence_wrought_iron_2_tb.png", "homedecor_fence_wrought_iron_2_sides.png", @@ -438,18 +369,14 @@ minetest.register_node("homedecor:fence_wrought_iron_2", { "homedecor_fence_wrought_iron_2_fb.png", "homedecor_fence_wrought_iron_2_fb.png" }, - paramtype = "light", - is_ground_content = true, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0.42, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, 0.42, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, 14/32, -7.75/16, 8/16, 16/32 }, -- left post { 7.75/16, -8/16, 14/32, 8/16, 8/16, 16/32 }, -- right post @@ -458,12 +385,11 @@ minetest.register_node("homedecor:fence_wrought_iron_2", { { -0.015625, -8/16, 14.75/32, 0.015625, 8/16, 15.25/32 }, -- cross piece { -8/16, -8/16, 14/32, 8/16, -7.75/16, 16/32 }, -- bottom piece { -8/16, -8/16, 15/32, 8/16, 8/16, 15/32 } -- the grid itself - } - }, + } + }, }) -minetest.register_node("homedecor:fence_wrought_iron_2_corner", { - drawtype = "nodebox", +homedecor.register("fence_wrought_iron_2_corner", { description = S("Wrought Iron fence (type 2) Corner"), tiles = { "homedecor_fence_corner_wrought_iron_2_tb.png", @@ -473,12 +399,8 @@ minetest.register_node("homedecor:fence_wrought_iron_2_corner", { "homedecor_fence_corner_wrought_iron_2_fb.png^[transformFX", "homedecor_fence_corner_wrought_iron_2_fb.png" }, - paramtype = "light", - is_ground_content = true, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, - paramtype2 = "facedir", selection_box = { type = "fixed", fixed = { diff --git a/mods/homedecor_modpack/homedecor/furniture.lua b/mods/homedecor_modpack/homedecor/furniture.lua index a8d8ef01..c17cdc22 100644 --- a/mods/homedecor_modpack/homedecor/furniture.lua +++ b/mods/homedecor_modpack/homedecor/furniture.lua @@ -13,28 +13,25 @@ for _, i in ipairs(table_colors) do desc = S("Table") end - minetest.register_node("homedecor:table"..color, { + homedecor.register("table"..color, { description = desc, tiles = { "forniture_wood"..color..".png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", node_box = { - type = "fixed", - fixed = { - { -0.4, -0.5, -0.4, -0.3, 0.4, -0.3 }, - { 0.3, -0.5, -0.4, 0.4, 0.4, -0.3 }, - { -0.4, -0.5, 0.3, -0.3, 0.4, 0.4 }, - { 0.3, -0.5, 0.3, 0.4, 0.4, 0.4 }, - { -0.5, 0.4, -0.5, 0.5, 0.5, 0.5 }, - { -0.4, -0.2, -0.3, -0.3, -0.1, 0.3 }, - { 0.3, -0.2, -0.4, 0.4, -0.1, 0.3 }, - { -0.3, -0.2, -0.4, 0.4, -0.1, -0.3 }, - { -0.3, -0.2, 0.3, 0.3, -0.1, 0.4 }, - }, + type = "fixed", + fixed = { + { -0.4, -0.5, -0.4, -0.3, 0.4, -0.3 }, + { 0.3, -0.5, -0.4, 0.4, 0.4, -0.3 }, + { -0.4, -0.5, 0.3, -0.3, 0.4, 0.4 }, + { 0.3, -0.5, 0.3, 0.4, 0.4, 0.4 }, + { -0.5, 0.4, -0.5, 0.5, 0.5, 0.5 }, + { -0.4, -0.2, -0.3, -0.3, -0.1, 0.3 }, + { 0.3, -0.2, -0.4, 0.4, -0.1, 0.3 }, + { -0.3, -0.2, -0.4, 0.4, -0.1, -0.3 }, + { -0.3, -0.2, 0.3, 0.3, -0.1, 0.4 }, + }, }, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - }) + }) end local chaircolors = { @@ -52,7 +49,7 @@ for i in ipairs(chaircolors) do local color = "_"..chaircolors[i][1] local color2 = chaircolors[i][1] local name = S(chaircolors[i][2]) - local chairtiles = { + local chairtiles = { "forniture_kitchen_chair_top"..color..".png", "forniture_wood.png", "forniture_kitchen_chair_sides"..color..".png", @@ -60,43 +57,37 @@ for i in ipairs(chaircolors) do "forniture_kitchen_chair_back"..color..".png", "forniture_kitchen_chair_front"..color..".png", } - if chaircolors[i][1] == "" then + if chaircolors[i][1] == "" then color = "" chairtiles = { "forniture_wood.png" } end - minetest.register_node("homedecor:chair"..color, { - description = S("Kitchen chair (%s)"):format(name), + homedecor.register("chair"..color, { + description = S("Kitchen chair (%s)"):format(name), tiles = chairtiles, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", node_box = { - type = "fixed", - fixed = { + type = "fixed", + fixed = { {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125}, {-0.3125, -0.5, -0.3125, -0.1875, 0, -0.1875}, {0.1875, -0.5, -0.3125, 0.3125, 0, -0.1875}, {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.3125}, {-0.25, 0.0625, 0.25, 0.25, 0.4375, 0.25}, - }, + }, }, selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}, + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}, }, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, }) - if color ~= "" then - minetest.register_node("homedecor:armchair"..color, { + if color ~= "" then + homedecor.register("armchair"..color, { description = S("Armchair (%s)"):format(name), tiles = { "forniture_armchair_top"..color..".png" }, - drawtype = "nodebox", sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -137,11 +128,11 @@ minetest.register_node(":homedecor:openframe_bookshelf", { drawtype = "mesh", mesh = "homedecor_openframe_bookshelf.obj", tiles = { "homedecor_openframe_bookshelf.png" }, + paramtype = "light", + paramtype2 = "facedir", is_ground_content = false, groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3}, sounds = default.node_sound_wood_defaults(), - paramtype = "light", - paramtype2 = "facedir", selection_box = { type = "fixed", fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 } @@ -179,12 +170,12 @@ local function bed_extension(pos, color) end end - if string.find(bottomnode.name, "homedecor:bed_.*_foot$") then + if string.find(bottomnode.name, "homedecor:bed_.*_foot$") then if fdir == bottomnode.param2 then local newnode = string.gsub(bottomnode.name, "_foot", "_footext") - minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newnode, param2 = fdir}) + minetest.set_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newnode, param2 = fdir}) end - end + end end local function unextend_bed(pos, color) @@ -197,8 +188,8 @@ local function unextend_bed(pos, color) end for _, color in ipairs(bedcolors) do - - minetest.register_node("homedecor:bed_"..color.."_head", { + + homedecor.register("bed_"..color.."_head", { tiles = { "homedecor_bed_"..color.."_top1.png", "homedecor_bed_bottom1.png", @@ -207,9 +198,6 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_head1.png", "homedecor_bed_"..color.."_head2.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3, not_in_creative_inventory=1}, node_box = { type = "fixed", @@ -224,13 +212,10 @@ for _, color in ipairs(bedcolors) do {-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox8 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } + selection_box = homedecor.nodebox.null }) - minetest.register_node("homedecor:bed_"..color.."_foot", { + homedecor.register("bed_"..color.."_foot", { tiles = { "homedecor_bed_"..color.."_top2.png", "homedecor_bed_bottom2.png", @@ -241,9 +226,6 @@ for _, color in ipairs(bedcolors) do }, inventory_image = "homedecor_bed_"..color.."_inv.png", description = S("Bed (%s)"):format(color), - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -262,24 +244,13 @@ for _, color in ipairs(bedcolors) do on_construct = function(pos) bed_extension(pos, color) end, - - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:bed_"..color.."_foot", "homedecor:bed_"..color.."_head", false) - end, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:bed_"..color.."_head" then - minetest.remove_node(pos2) - end + expand = { forward = "homedecor:bed_"..color.."_head" }, + after_unexpand = function(pos) unextend_bed(pos, color) - end + end, }) - - minetest.register_node("homedecor:bed_"..color.."_footext", { + + homedecor.register("bed_"..color.."_footext", { tiles = { "homedecor_bed_"..color.."_top2.png", "homedecor_bed_bottom2.png", @@ -288,9 +259,6 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_foot2ext.png", "homedecor_bed_"..color.."_foot1ext.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3, not_in_creative_inventory=1}, node_box = { type = "fixed", @@ -306,21 +274,16 @@ for _, color in ipairs(bedcolors) do type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } }, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:bed_"..color.."_head" then - minetest.remove_node(pos2) - end + expand = { forward = "homedecor:bed_"..color.."_head" }, + after_unexpand = function(pos) unextend_bed(pos, color) end, drop = "homedecor:bed_"..color.."_foot" }) - + end -minetest.register_node("homedecor:wardrobe_top", { +homedecor.register("wardrobe_top", { tiles = { "forniture_wood.png", "forniture_wood.png", @@ -329,9 +292,6 @@ minetest.register_node("homedecor:wardrobe_top", { "forniture_wood.png^[transformR90", "homedecor_wardrobe_frontt.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3, not_in_creative_inventory=1}, node_box = { type = "fixed", @@ -341,13 +301,10 @@ minetest.register_node("homedecor:wardrobe_top", { {-0.4375, -0.4375, -0.5, -0.0625, 0.4375, -0.4375}, -- NodeBox3 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -minetest.register_node("homedecor:wardrobe_bottom", { +homedecor.register("wardrobe_bottom", { tiles = { "forniture_wood.png", "forniture_wood.png^[transformR180", @@ -358,10 +315,7 @@ minetest.register_node("homedecor:wardrobe_bottom", { }, inventory_image = "homedecor_wardrobe_inv.png", description = "Wardrobe", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3}, node_box = { type = "fixed", fixed = { @@ -375,52 +329,14 @@ minetest.register_node("homedecor:wardrobe_bottom", { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:wardrobe_bottom", "homedecor:wardrobe_top") - 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:wardrobe_top" then - minetest.remove_node(pos2) - end - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,8]".. - "list[current_name;main;0,0;8,3;]".. - "list[current_player;main;0,4;8,4;]") - meta:set_string("infotext", S("Wardrobe cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 24) - 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 wardrobe at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to wardrobe at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from wardrobe at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + expand = { top="homedecor:wardrobe_top" }, + infotext = S("Wardrobe cabinet"), + inventory = { + size=24, + }, }) -minetest.register_node("homedecor:simple_bench", { +homedecor.register("simple_bench", { tiles = { "homedecor_generic_wood.png", "homedecor_generic_wood.png", @@ -430,22 +346,18 @@ minetest.register_node("homedecor:simple_bench", { "homedecor_bench_large_2_left_back.png^[transformFX" }, description = "Simple Bench", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3}, node_box = { type = "fixed", fixed = { - {-0.5, -0.15, 0, 0.5, -0.05, 0.4}, - {-0.4, -0.5, 0.1, -0.3, -0.15, 0.3}, - { 0.3, -0.5, 0.1, 0.4, -0.15, 0.3}, - } + {-0.5, -0.15, 0, 0.5, -0.05, 0.4}, + {-0.4, -0.5, 0.1, -0.3, -0.15, 0.3}, + { 0.3, -0.5, 0.1, 0.4, -0.15, 0.3}, + } }, }) - -minetest.register_node("homedecor:bench_large_1_left", { +homedecor.register("bench_large_1_left", { description = "Garden Bench (style 1)", tiles = { "homedecor_bench_large_1_left_top.png", @@ -456,9 +368,6 @@ minetest.register_node("homedecor:bench_large_1_left", { "homedecor_bench_large_1_left_front.png" }, inventory_image = "homedecor_bench_large_1_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -476,21 +385,10 @@ minetest.register_node("homedecor:bench_large_1_left", { type = "fixed", fixed = { -0.5, -0.5, -0.09375, 1.5, 0.5, 0.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:bench_large_1_left", "homedecor:bench_large_1_right", true) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:bench_large_1_right" then - minetest.remove_node(pos2) - end - end + expand = { right="homedecor:bench_large_1_right" }, }) -minetest.register_node("homedecor:bench_large_1_right", { +homedecor.register("bench_large_1_right", { tiles = { "homedecor_bench_large_1_left_top.png^[transformFX", "homedecor_bench_large_1_left_bottom.png^[transformFX", @@ -499,9 +397,6 @@ minetest.register_node("homedecor:bench_large_1_right", { "homedecor_bench_large_1_left_back.png^[transformFX", "homedecor_bench_large_1_left_front.png^[transformFX" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -515,14 +410,11 @@ minetest.register_node("homedecor:bench_large_1_right", { {0.25, -0.5, -0.0625, 0.3125, -0.25, 0}, -- NodeBox7 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -minetest.register_node("homedecor:bench_large_2_left", { +homedecor.register("bench_large_2_left", { description = "Garden Bench (style 2)", tiles = { "homedecor_generic_wood.png", @@ -533,9 +425,6 @@ minetest.register_node("homedecor:bench_large_2_left", { "homedecor_bench_large_2_left_back.png^[transformFX" }, inventory_image = "homedecor_bench_large_2_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -562,21 +451,10 @@ minetest.register_node("homedecor:bench_large_2_left", { type = "fixed", fixed = { -0.5, -0.5, -0.15625, 1.5, 0.5, 0.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:bench_large_2_left", "homedecor:bench_large_2_right", true) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:bench_large_2_right" then - minetest.remove_node(pos2) - end - end + expand = { right="homedecor:bench_large_2_right" }, }) -minetest.register_node("homedecor:bench_large_2_right", { +homedecor.register("bench_large_2_right", { tiles = { "homedecor_generic_wood.png", "homedecor_generic_wood.png", @@ -585,9 +463,6 @@ minetest.register_node("homedecor:bench_large_2_right", { "homedecor_bench_large_2_right_back.png", "homedecor_bench_large_2_right_back.png^[transformFX" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -610,13 +485,10 @@ minetest.register_node("homedecor:bench_large_2_right", { {-0.5, -0.25, -0.0290173, 0.5, -0.125, 0.0125346}, -- NodeBox16 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -minetest.register_node("homedecor:deckchair_head", { +homedecor.register("deckchair_head", { tiles = { "homedecor_deckchair_top_c1.png", "homedecor_deckchair_sides.png", @@ -625,10 +497,7 @@ minetest.register_node("homedecor:deckchair_head", { "homedecor_deckchair_sides.png", "homedecor_deckchair_front.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3, not_in_creative_inventory = 1 }, + groups = { snappy = 3, not_in_creative_inventory = 1 }, node_box = { type = "fixed", fixed = { @@ -648,13 +517,10 @@ minetest.register_node("homedecor:deckchair_head", { {-0.375, -0.5, 0, -0.3125, -0.25, 0.0625}, -- NodeBox14 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } + selection_box = homedecor.nodebox.null }) -minetest.register_node("homedecor:deckchair_foot", { +homedecor.register("deckchair_foot", { tiles = { "homedecor_deckchair_top_c2.png", "homedecor_deckchair_sides.png", @@ -664,10 +530,7 @@ minetest.register_node("homedecor:deckchair_foot", { }, description = "Deck chair", inventory_image = "homedecor_deckchair_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, + groups = { snappy = 3 }, node_box = { type = "fixed", fixed = { @@ -684,28 +547,14 @@ minetest.register_node("homedecor:deckchair_foot", { type = "fixed", fixed = { -0.45, -0.5, -0.5, 0.45, 0.35, 1.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:deckchair_foot", "homedecor:deckchair_head", false) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:deckchair_head" then - minetest.remove_node(pos2) - end - end + expand = { forward="homedecor:deckchair_head" }, }) -minetest.register_node("homedecor:wall_shelf", { +homedecor.register("wall_shelf", { description = "Wall Shelf", tiles = { "homedecor_wood_table_large_edges.png", }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", @@ -716,7 +565,7 @@ minetest.register_node("homedecor:wall_shelf", { } }) -minetest.register_node("homedecor:grandfather_clock_bottom", { +homedecor.register("grandfather_clock_bottom", { description = "Grandfather Clock", tiles = { "homedecor_grandfather_clock_sides.png", @@ -727,9 +576,6 @@ minetest.register_node("homedecor:grandfather_clock_bottom", { "homedecor_grandfather_clock_bottom.png" }, inventory_image = "homedecor_grandfather_clock_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", @@ -744,19 +590,10 @@ minetest.register_node("homedecor:grandfather_clock_bottom", { type = "fixed", fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock_top") - 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:grandfather_clock_top" then - minetest.remove_node(pos2) - end - end, + expand = { top="homedecor:grandfather_clock_top" }, }) -minetest.register_node("homedecor:grandfather_clock_top", { +homedecor.register("grandfather_clock_top", { tiles = { "homedecor_grandfather_clock_sides.png", "homedecor_grandfather_clock_sides.png", @@ -765,9 +602,6 @@ minetest.register_node("homedecor:grandfather_clock_top", { "homedecor_grandfather_clock_sides.png", "homedecor_grandfather_clock_top.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -778,10 +612,7 @@ minetest.register_node("homedecor:grandfather_clock_top", { {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.4}, -- NodeBox4 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -- Aliases for 3dforniture mod. diff --git a/mods/homedecor_modpack/homedecor/furniture_bathroom.lua b/mods/homedecor_modpack/homedecor/furniture_bathroom.lua deleted file mode 100644 index 02de3c73..00000000 --- a/mods/homedecor_modpack/homedecor/furniture_bathroom.lua +++ /dev/null @@ -1,203 +0,0 @@ -local S = homedecor.gettext - -minetest.register_node("homedecor:toilet", { - description = S("Toilet"), - tiles = { "forniture_marble.png" }, - drawtype = "nodebox", - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.20, -0.50, -0.20, 0.20, -0.45, 0.50, }, - { -0.10, -0.45, -0.10, 0.10, 0.00, 0.50, }, - { -0.30, -0.20, -0.30, 0.30, 0.00, 0.35, }, - { -0.25, 0.00, -0.25, 0.25, 0.05, 0.25, }, - { -0.30, 0.00, 0.30, 0.30, 0.40, 0.50, }, - { -0.05, 0.40, 0.35, 0.05, 0.45, 0.45, }, - }, - }, - groups = {cracky=3,}, - sounds = default.node_sound_stone_defaults(), - on_punch = function (pos, node, puncher) - node.name = "homedecor:toilet_open" - minetest.set_node(pos, node) - end, -}) - -minetest.register_node("homedecor:toilet_open", { - tiles = { - "forniture_marble_top_toilet.png", - "forniture_marble.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.20, -0.50, -0.20, 0.20, -0.45, 0.50, }, - { -0.10, -0.45, -0.10, 0.10, -0.20, 0.50, }, - { -0.10, -0.20, 0.30, 0.10, 0.00, 0.50, }, - { -0.30, -0.20, 0.10, 0.30, 0.00, 0.35, }, - { -0.30, -0.20, -0.30, -0.10, -0.15, 0.10, }, - { -0.10, -0.20, -0.30, 0.10, -0.15, -0.10, }, - { 0.10, -0.20, -0.30, 0.30, -0.15, 0.10, }, - { -0.30, -0.15, -0.30, -0.20, 0.00, 0.10, }, - { -0.20, -0.15, -0.30, 0.20, 0.00, -0.20, }, - { 0.20, -0.15, -0.30, 0.30, 0.00, 0.10, }, - { -0.25, 0.00, 0.20, 0.25, 0.50, 0.25, }, - { -0.30, 0.00, 0.30, 0.30, 0.40, 0.50, }, - }, - }, - drop = "homedecor:toilet", - groups = {cracky = 3,}, - --sounds = {dig = "3dforniture_dig_toilet", gain=0.5}, - sounds = default.node_sound_stone_defaults(), - on_punch = function (pos, node, puncher) - node.name = "homedecor:toilet" - minetest.set_node(pos, node) - minetest.sound_play("homedecor_toilet_flush", { - pos=pos, - max_hear_distance = 5, - gain = 1, - }) - end, -}) - ---Sink -minetest.register_node("homedecor:sink", { - description = S("Sink"), - tiles = { - "forniture_marble_top_sink.png", - "forniture_marble.png" - }, - inventory_image="3dforniture_inv_sink.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.15, 0.35, 0.20, 0.15, 0.40, 0.50, }, - { -0.25, 0.40, 0.40, 0.25, 0.45, 0.50, }, - { -0.25, 0.40, 0.15, -0.15, 0.45, 0.40, }, - { 0.15, 0.40, 0.15, 0.25, 0.45, 0.40, }, - { -0.15, 0.40, 0.15, 0.15, 0.45, 0.20, }, - { -0.30, 0.45, 0.40, 0.30, 0.50, 0.50, }, - { -0.30, 0.45, 0.10, -0.25, 0.50, 0.40, }, - { 0.25, 0.45, 0.10, 0.30, 0.50, 0.40, }, - { -0.25, 0.45, 0.10, 0.25, 0.50, 0.15, }, - {-0.1, -0.5, 0.3, 0.1, 0.4, 0.5}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-0.3,-0.5,0.1, 0.3,0.5,0.5}, - }, - groups = {cracky=2,}, - sounds = default.node_sound_stone_defaults(), -}) - ---Taps -minetest.register_node("homedecor:taps", { - description = S("Taps"), - tiles = { "forniture_metal.png" }, - inventory_image="3dforniture_inv_taps.png", - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.25, -0.450, 0.49, 0.25, -0.30, 0.50, }, - { -0.05, -0.400, 0.25, 0.05, -0.35, 0.50, }, - { -0.05, -0.425, 0.25, 0.05, -0.40, 0.30, }, - { -0.20, -0.400, 0.45, -0.15, -0.35, 0.50, }, - { -0.20, -0.450, 0.40, -0.15, -0.30, 0.45, }, - { -0.25, -0.400, 0.40, -0.10, -0.35, 0.45, }, - { 0.15, -0.400, 0.45, 0.20, -0.35, 0.50, }, - { 0.15, -0.450, 0.40, 0.20, -0.30, 0.45, }, - { 0.10, -0.400, 0.40, 0.25, -0.35, 0.45, }, - }, - }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.45, 0.25, 0.25, -0.3, 0.5 }, - }, - groups = {cracky=2,}, - sounds = default.node_sound_stone_defaults(), -}) - ---Shower Tray -minetest.register_node("homedecor:shower_tray", { - description = S("Shower Tray"), - tiles = { - "forniture_marble_base_ducha_top.png", - "forniture_marble.png" - }, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - legacy_facedir_simple = true, - node_box = { - type = "fixed", - fixed = { - { -0.50, -0.50, -0.50, 0.50, -0.45, 0.50, }, - { -0.50, -0.45, -0.50, 0.50, -0.40, -0.45, }, - { -0.50, -0.45, 0.45, 0.50, -0.40, 0.50, }, - { -0.50, -0.45, -0.45, -0.45, -0.40, 0.45, }, - { 0.45, -0.45, -0.45, 0.50, -0.40, 0.45, }, - }, - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 }, - }, - groups = {cracky=2,}, - sounds = default.node_sound_stone_defaults(), -}) - ---Shower Head -minetest.register_node("homedecor:shower_head", { - description = S("Shower Head"), - tiles = { "forniture_metal.png" }, - inventory_image="3dforniture_inv_shower_head.png", - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.10, -0.50, 0.10, 0.10, -0.40, 0.30, }, - { -0.05, -0.40, 0.15, 0.05, -0.30, 0.25, }, - { -0.05, -0.35, 0.25, 0.05, -0.30, 0.50, }, - { -0.10, -0.40, 0.49, 0.10, -0.25, 0.50, }, - }, - }, - selection_box = { - type = "fixed", - fixed = { -0.1, -0.5, 0.1, 0.1, -0.25, 0.5 }, - }, - groups = {cracky=2,}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_alias("3dforniture:toilet", "homedecor:toilet") -minetest.register_alias("3dforniture:toilet_open", "homedecor:toilet_open") -minetest.register_alias("3dforniture:sink", "homedecor:sink") -minetest.register_alias("3dforniture:taps", "homedecor:taps") -minetest.register_alias("3dforniture:shower_tray", "homedecor:shower_tray") -minetest.register_alias("3dforniture:shower_head", "homedecor:shower_head") -minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_off") - -minetest.register_alias("toilet", "homedecor:toilet") -minetest.register_alias("sink", "homedecor:sink") -minetest.register_alias("taps", "homedecor:taps") -minetest.register_alias("shower_tray", "homedecor:shower_tray") -minetest.register_alias("shower_head", "homedecor:shower_head") -minetest.register_alias("table_lamp", "homedecor:table_lamp_off") diff --git a/mods/homedecor_modpack/homedecor/furniture_medieval.lua b/mods/homedecor_modpack/homedecor/furniture_medieval.lua index 023a9a51..a780d313 100644 --- a/mods/homedecor_modpack/homedecor/furniture_medieval.lua +++ b/mods/homedecor_modpack/homedecor/furniture_medieval.lua @@ -1,162 +1,150 @@ local S = homedecor.gettext -minetest.register_node("homedecor:bars", { - description = S("Bars"), - tiles = { "forniture_black_metal.png" }, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.5, -0.50, -0.10, -0.4, 0.50, 0.10 }, - { -0.1, -0.50, -0.10, 0.1, 0.50, 0.10 }, - { 0.4, -0.50, -0.10, 0.5, 0.50, 0.10 }, - { -0.5, -0.50, -0.05, 0.5, -0.45, 0.05 }, - { -0.5, 0.45, -0.05, 0.5, 0.50, 0.05 }, - }, - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.1, 0.5, 0.5, 0.1 }, - }, - groups = {cracky=1}, +homedecor.register("bars", { + description = S("Bars"), + tiles = { "forniture_black_metal.png" }, + sunlight_propagates = true, + node_box = { + type = "fixed", + fixed = { + { -0.5, -0.50, -0.10, -0.4, 0.50, 0.10 }, + { -0.1, -0.50, -0.10, 0.1, 0.50, 0.10 }, + { 0.4, -0.50, -0.10, 0.5, 0.50, 0.10 }, + { -0.5, -0.50, -0.05, 0.5, -0.45, 0.05 }, + { -0.5, 0.45, -0.05, 0.5, 0.50, 0.05 }, + }, + }, + selection_box = { + type = "fixed", + fixed = { -0.5, -0.5, -0.1, 0.5, 0.5, 0.1 }, + }, + groups = {cracky=1}, }) --L Binding Bars -minetest.register_node("homedecor:L_binding_bars", { - description = S("Binding Bars"), - tiles = { "forniture_black_metal.png" }, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.10, -0.50, -0.50, 0.10, 0.50, -0.40 }, - { -0.15, -0.50, -0.15, 0.15, 0.50, 0.15 }, - { 0.40, -0.50, -0.10, 0.50, 0.50, 0.10 }, - { 0.00, -0.50, -0.05, 0.50, -0.45, 0.05 }, - { -0.05, -0.50, -0.50, 0.05, -0.45, 0.00 }, - { 0.00, 0.45, -0.05, 0.50, 0.50, 0.05 }, - { -0.05, 0.45, -0.50, 0.05, 0.50, 0.00 }, - }, - }, - groups = {cracky=1,} +homedecor.register("L_binding_bars", { + description = S("Binding Bars"), + tiles = { "forniture_black_metal.png" }, + sunlight_propagates = true, + node_box = { + type = "fixed", + fixed = { + { -0.10, -0.50, -0.50, 0.10, 0.50, -0.40 }, + { -0.15, -0.50, -0.15, 0.15, 0.50, 0.15 }, + { 0.40, -0.50, -0.10, 0.50, 0.50, 0.10 }, + { 0.00, -0.50, -0.05, 0.50, -0.45, 0.05 }, + { -0.05, -0.50, -0.50, 0.05, -0.45, 0.00 }, + { 0.00, 0.45, -0.05, 0.50, 0.50, 0.05 }, + { -0.05, 0.45, -0.50, 0.05, 0.50, 0.00 }, + }, + }, + groups = {cracky=1,} }) -minetest.register_node("homedecor:chains", { - description = S("Chains"), - tiles = { "forniture_black_metal.png" }, - inventory_image="3dforniture_inv_chains.png", - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - 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}, - }, - groups = {cracky=1}, -}) +homedecor.register("chains", { + description = S("Chains"), + 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}, + }, + groups = {cracky=1}, +}) -minetest.register_node("homedecor:torch_wall", { - description = S("Wall Torch"), - drawtype = "nodebox", - tiles = { - "forniture_torch_wall_s.png", - "forniture_torch_wall_i.png", - { - name="forniture_torch_wall_anim.png", - animation={ - type="vertical_frames", - aspect_w=40, - aspect_h=40, - length=1.0, - }, - }, - }, - inventory_image="3dforniture_inv_torch_wall.png", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.05, -0.45, 0.45, 0.05, -0.35, 0.50, }, - { -0.05, -0.35, 0.40, 0.05, -0.25, 0.50, }, - { -0.05, -0.25, 0.35, 0.05, -0.15, 0.45, }, - { -0.05, -0.15, 0.30, 0.05, -0.05, 0.40, }, - { -0.05, -0.05, 0.25, 0.05, 0.00, 0.35, }, - { -0.10, 0.00, 0.20, 0.10, 0.05, 0.40, }, - { -0.15, 0.05, 0.15, 0.15, 0.15, 0.45, }, - { -0.10, 0.15, 0.20, 0.10, 0.25, 0.40, }, - { -0.05, 0.25, 0.25, 0.05, 0.35, 0.35, }, - }, - }, - sunlight_propagates = true, - walkable = false, - light_source = 14, - selection_box = { - type = "fixed", - fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 }, - }, - groups = {cracky=2}, +homedecor.register("torch_wall", { + description = S("Wall Torch"), + tiles = { + "forniture_torch_wall_s.png", + "forniture_torch_wall_i.png", + { + name="forniture_torch_wall_anim.png", + animation={ + type="vertical_frames", + aspect_w=40, + aspect_h=40, + length=1.0, + }, + }, + }, + inventory_image="3dforniture_inv_torch_wall.png", + node_box = { + type = "fixed", + fixed = { + { -0.05, -0.45, 0.45, 0.05, -0.35, 0.50, }, + { -0.05, -0.35, 0.40, 0.05, -0.25, 0.50, }, + { -0.05, -0.25, 0.35, 0.05, -0.15, 0.45, }, + { -0.05, -0.15, 0.30, 0.05, -0.05, 0.40, }, + { -0.05, -0.05, 0.25, 0.05, 0.00, 0.35, }, + { -0.10, 0.00, 0.20, 0.10, 0.05, 0.40, }, + { -0.15, 0.05, 0.15, 0.15, 0.15, 0.45, }, + { -0.10, 0.15, 0.20, 0.10, 0.25, 0.40, }, + { -0.05, 0.25, 0.25, 0.05, 0.35, 0.35, }, + }, + }, + sunlight_propagates = true, + walkable = false, + light_source = 14, + selection_box = { + type = "fixed", + fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 }, + }, + groups = {cracky=2}, }) minetest.register_alias("3dforniture:bars", "homedecor:bars") diff --git a/mods/homedecor_modpack/homedecor/furniture_recipes.lua b/mods/homedecor_modpack/homedecor/furniture_recipes.lua index a01c6cda..dcaff59c 100644 --- a/mods/homedecor_modpack/homedecor/furniture_recipes.lua +++ b/mods/homedecor_modpack/homedecor/furniture_recipes.lua @@ -1,63 +1,63 @@ minetest.register_craft({ - output = "homedecor:table", "homedecor:chair 2", - recipe = { - { "group:wood","group:wood", "group:wood" }, - { "group:stick", "", "group:stick" }, - }, + output = "homedecor:table", "homedecor:chair 2", + recipe = { + { "group:wood","group:wood", "group:wood" }, + { "group:stick", "", "group:stick" }, + }, }) minetest.register_craft({ type = "shapeless", - output = "homedecor:table_mahogany", - recipe = { + output = "homedecor:table_mahogany", + recipe = { "homedecor:table", "dye:brown", - }, + }, }) minetest.register_craft({ type = "shapeless", - output = "homedecor:table_mahogany", - recipe = { + output = "homedecor:table_mahogany", + recipe = { "homedecor:table", "unifieddyes:dark_orange", - }, + }, }) minetest.register_craft({ type = "shapeless", - output = "homedecor:table_white", - recipe = { + output = "homedecor:table_white", + recipe = { "homedecor:table", "dye:white", - }, + }, }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table", - burntime = 30, + type = "fuel", + recipe = "homedecor:table", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_mahogany", - burntime = 30, + type = "fuel", + recipe = "homedecor:table_mahogany", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_white", - burntime = 30, + type = "fuel", + recipe = "homedecor:table_white", + burntime = 30, }) minetest.register_craft({ output = "homedecor:chair 2", recipe = { - { "group:stick",""}, - { "group:wood","group:wood" }, - { "group:stick","group:stick" }, + { "group:stick",""}, + { "group:wood","group:wood" }, + { "group:stick","group:stick" }, }, }) @@ -98,26 +98,26 @@ for _, color in ipairs(chaircolors) do end minetest.register_craft({ - type = "fuel", - recipe = "homedecor:armchair", - burntime = 30, + type = "fuel", + recipe = "homedecor:armchair", + burntime = 30, }) minetest.register_craft({ output = "homedecor:table_lamp_off", recipe = { - {"default:paper","default:torch" ,"default:paper"}, - {"","group:stick",""}, - {"","stairs:slab_wood",""}, + {"default:paper","default:torch" ,"default:paper"}, + {"","group:stick",""}, + {"","stairs:slab_wood",""}, }, }) minetest.register_craft({ output = "homedecor:table_lamp_off", recipe = { - {"default:paper","default:torch" ,"default:paper"}, - {"","group:stick",""}, - {"","moreblocks:slab_wood",""}, + {"default:paper","default:torch" ,"default:paper"}, + {"","group:stick",""}, + {"","moreblocks:slab_wood",""}, }, }) @@ -131,9 +131,9 @@ minetest.register_craft({ }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_lamp_off", - burntime = 10, + type = "fuel", + recipe = "homedecor:table_lamp_off", + burntime = 10, }) local lamp_colors = { "blue", "green", "pink", "red", "violet" } @@ -143,18 +143,18 @@ for _, color in ipairs(lamp_colors) do minetest.register_craft({ output = "homedecor:table_lamp_"..color.."_off", recipe = { - {"wool:"..color,"default:torch" ,"wool:"..color}, - {"","group:stick",""}, - {"","stairs:slab_wood",""}, + {"wool:"..color,"default:torch" ,"wool:"..color}, + {"","group:stick",""}, + {"","stairs:slab_wood",""}, }, }) minetest.register_craft({ output = "homedecor:table_lamp_"..color.."_off", recipe = { - {"wool:"..color,"default:torch" ,"wool:"..color}, - {"","group:stick",""}, - {"","moreblocks:slab_wood",""}, + {"wool:"..color,"default:torch" ,"wool:"..color}, + {"","group:stick",""}, + {"","moreblocks:slab_wood",""}, }, }) @@ -176,9 +176,9 @@ for _, color in ipairs(lamp_colors) do minetest.register_craft({ output = "homedecor:standing_lamp_bottom_"..color.."_off", recipe = { - {"homedecor:table_lamp_"..color.."_off"}, - {"group:stick"}, - {"group:stick"}, + {"homedecor:table_lamp_"..color.."_off"}, + {"group:stick"}, + {"group:stick"}, }, }) @@ -194,62 +194,62 @@ for _, color in ipairs(lamp_colors) do end minetest.register_craft({ - output = "homedecor:toilet", - recipe = { - {"","","bucket:bucket_water"}, - { "building_blocks:Marble","building_blocks:Marble", "building_blocks:Marble" }, - { "", "bucket:bucket_empty", "" }, - }, + output = "homedecor:toilet", + recipe = { + {"","","bucket:bucket_water"}, + { "building_blocks:Marble","building_blocks:Marble", "building_blocks:Marble" }, + { "", "bucket:bucket_empty", "" }, + }, }) minetest.register_craft({ - output = "homedecor:sink", - recipe = { - { "building_blocks:Marble","bucket:bucket_empty", "building_blocks:Marble" }, - }, + output = "homedecor:sink", + recipe = { + { "building_blocks:Marble","bucket:bucket_empty", "building_blocks:Marble" }, + }, }) minetest.register_craft({ - output = "homedecor:taps", - recipe = { - { "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" }, - }, + output = "homedecor:taps", + recipe = { + { "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = "homedecor:shower_tray", - recipe = { - { "building_blocks:Marble","bucket:bucket_water", "building_blocks:Marble" }, - }, + output = "homedecor:shower_tray", + recipe = { + { "building_blocks:Marble","bucket:bucket_water", "building_blocks:Marble" }, + }, }) minetest.register_craft({ - output = "homedecor:shower_head", - recipe = { - {"default:steel_ingot", "bucket:bucket_water"}, - }, + output = "homedecor:shower_head", + recipe = { + {"default:steel_ingot", "bucket:bucket_water"}, + }, }) minetest.register_craft({ - output = "homedecor:bars 6", - recipe = { - { "default:steel_ingot","default:steel_ingot","default:steel_ingot" }, - { "homedecor:pole_wrought_iron","homedecor:pole_wrought_iron","homedecor:pole_wrought_iron" }, - }, + output = "homedecor:bars 6", + recipe = { + { "default:steel_ingot","default:steel_ingot","default:steel_ingot" }, + { "homedecor:pole_wrought_iron","homedecor:pole_wrought_iron","homedecor:pole_wrought_iron" }, + }, }) minetest.register_craft({ - output = "homedecor:L_binding_bars 3", - recipe = { - { "homedecor:bars","" }, - { "homedecor:bars","homedecor:bars" }, - }, + output = "homedecor:L_binding_bars 3", + recipe = { + { "homedecor:bars","" }, + { "homedecor:bars","homedecor:bars" }, + }, }) minetest.register_craft({ - output = "homedecor:torch_wall 10", - recipe = { - { "default:coal_lump" }, - { "default:steel_ingot" }, - }, + output = "homedecor:torch_wall 10", + recipe = { + { "default:coal_lump" }, + { "default:steel_ingot" }, + }, }) diff --git a/mods/homedecor_modpack/homedecor/handlers/expansion.lua b/mods/homedecor_modpack/homedecor/handlers/expansion.lua new file mode 100644 index 00000000..2301ef37 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/expansion.lua @@ -0,0 +1,115 @@ +local S = homedecor.gettext + +-- 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 + local def = minetest.registered_nodes[minetest.get_node(pos).name] + + if not def or (not def.on_rightclick and not def.buildable_to) then + pos = pointed_thing.above + def = minetest.registered_nodes[minetest.get_node(pos).name] + end + return pos, def +end + +-- abstract function checking if 2 given nodes can and may be build to a place +local function is_buildable_to(placer_name, pos, def, pos2) + local def = def or minetest.registered_nodes[minetest.get_node(pos).name] + local def2 = minetest.registered_nodes[minetest.get_node(pos2).name] + + return def and def.buildable_to and def2 and def2.buildable_to + and not minetest.is_protected(pos, placer_name) + and not minetest.is_protected(pos2, placer_name) +end + +-- place one or two nodes if and only if both can be placed +local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2) + local placer_name = placer:get_player_name() or "" + if is_buildable_to(placer_name, pos, def, pos2) then + local fdir = fdir or minetest.dir_to_facedir(placer:get_look_dir()) + minetest.set_node(pos, { name = node1, param2 = fdir }) + node2 = node2 or "air" -- this can be used to clear buildable_to nodes even though we are using a multinode mesh + minetest.set_node(pos2, { name = node2, param2 = (node2 ~= "air" and fdir) or nil }) + + -- temporary check if this is a locked node to set its infotext + local nodename = itemstack:get_name() + if string.find(nodename, "_locked") then + local meta = minetest.get_meta(pos) + meta:set_string("owner", placer_name) + meta:set_string("infotext", S("Locked %s (owned by %s)"):format(minetest.registered_nodes[nodename].infotext, placer_name)) + end + + if not homedecor.expect_infinite_stacks then + itemstack:take_item() + return itemstack + end + end +end + +-- Stack one node above another +-- leave the last argument nil if it's one 2m high node +function homedecor.stack_vertically(itemstack, placer, pointed_thing, node1, node2) + local pos, def = select_node(pointed_thing) + if def.on_rightclick then + return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) + end + + local top_pos = { x=pos.x, y=pos.y+1, z=pos.z } + + return stack(itemstack, placer, nil, pos, def, top_pos, node1, node2) +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 def.on_rightclick then + return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) + end + + 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 + if forceright or is_right_wing then + node1, node2 = node1_right, node2_right + end + + local top_pos = { x=pos.x, y=pos.y+1, z=pos.z } + 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 def.on_rightclick then + return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) + end + + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir_transform = dir and homedecor.fdir_to_right or homedecor.fdir_to_fwd + + local pos2 = { x = pos.x + fdir_transform[fdir+1][1], y=pos.y, z = pos.z + fdir_transform[fdir+1][2] } + + return stack(itemstack, placer, fdir, pos, def, pos2, node1, node2) +end diff --git a/mods/homedecor_modpack/homedecor/furnaces.lua b/mods/homedecor_modpack/homedecor/handlers/furnaces.lua similarity index 88% rename from mods/homedecor_modpack/homedecor/furnaces.lua rename to mods/homedecor_modpack/homedecor/handlers/furnaces.lua index 08ece771..24159180 100644 --- a/mods/homedecor_modpack/homedecor/furnaces.lua +++ b/mods/homedecor_modpack/homedecor/handlers/furnaces.lua @@ -263,13 +263,13 @@ function homedecor.register_furnace(name, furnacedef) local srclist = inv:get_list("src") local cooked = nil local aftercooked - + if srclist then cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end - + local was_active = false - + if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then was_active = true meta:set_float("fuel_time", meta:get_float("fuel_time") + 1) @@ -306,7 +306,7 @@ function homedecor.register_furnace(name, furnacedef) local cooked = nil local fuellist = inv:get_list("fuel") local srclist = inv:get_list("src") - + if srclist then cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end @@ -345,45 +345,3 @@ function homedecor.register_furnace(name, furnacedef) }) end - -homedecor.register_furnace("homedecor:oven", { - description = S("Oven"), - tile_format = "homedecor_oven_%s%s.png", - output_slots = 4, - output_width = 2, - cook_speed = 1.25, -}) - -homedecor.register_furnace("homedecor:oven_steel", { - description = S("Oven (stainless steel)"), - tile_format = "homedecor_oven_steel_%s%s.png", - output_slots = 4, - output_width = 2, - cook_speed = 1.25, -}) - -homedecor.register_furnace("homedecor:microwave_oven", { - description = S("Microwave Oven"), - tiles = { - "homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180", - "homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90", - "homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front.png" - }, - tiles_active = { - "homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180", - "homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90", - "homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front_active.png" - }, - output_slots = 2, - output_width = 2, - cook_speed = 1.5, - extra_nodedef_fields = { - drawtype = "nodebox", - paramtype = "light", - --paramtype2 = "facedir", -- Not needed, set by register_furnace - node_box = { - type = "fixed", - fixed = { { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 } }, - }, - }, -}) diff --git a/mods/homedecor_modpack/homedecor/handlers/locked.lua b/mods/homedecor_modpack/homedecor/handlers/locked.lua new file mode 100644 index 00000000..738d3be4 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/locked.lua @@ -0,0 +1,161 @@ +-- Locked Stuff for Home Decor mod, by Kaeza +-- +-- The code is mostly copypasta from default:chest_locked, with a few +-- tidbits to ease creation of new items, should need arise. + +local S = homedecor.gettext + +--[[ + | create_locked ( name, infotext ) + | + | Description: + | This function takes a base node name such as "homedecor:refrigerator", + | copies the definition from the original item into a new table, modifies + | it a bit, and registers a new node with a "_locked" suffix such as + | "homedecor:refrigerator_locked". The new node behaves identically to + | the base node, except that moving items to/from the node's inventory + | is only allowed for the original placer. In addition, it register a new + | shapeless recipe for the node, using the base node plus a steel ingot. + | + | Arguments: + | name The base node name + | infotext The infotext description (in case the name is too long). + | + | Example Usage: + | create_locked("homedecor:refrigerator", "Locked Fridge") + | ^ This generates a new "Locked Refrigerator" node, whose infotext is + | "Locked Fridge (owned by )". + | + | Notes: + | If is not specified (or is nil), the infotext will be the + | base node's description prefixed by "Locked ". + | + | The ABM for the locked oven is defined in oven.lua. + ]] +local function create_locked ( name, infotext ) + local def = { } + for k, v in pairs(minetest.registered_nodes[name]) do + def[k] = v + end + def.type = nil + def.name = nil + def.description = S("%s (Locked)"):format(def.description) + local after_place_node = def.after_place_node + def.after_place_node = function(pos, placer) + local meta = minetest.get_meta(pos) + meta:set_string("owner", placer:get_player_name() or "") + meta:set_string("infotext", S("%s (owned by %s)"):format(infotext,meta:get_string("owner"))) + if (after_place_node) then + return after_place_node(pos, placer) + end + end + local allow_metadata_inventory_move = def.allow_metadata_inventory_move; + def.allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + local meta = minetest.get_meta(pos) + if (player:get_player_name() ~= meta:get_string("owner")) then + minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( + player:get_player_name(), + infotext, + meta:get_string("owner"), + minetest.pos_to_string(pos) + )) + return 0 + end + if (allow_metadata_inventory_move) then + return allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player) + else + return count + end + end + local allow_metadata_inventory_put = def.allow_metadata_inventory_put; + def.allow_metadata_inventory_put = function(pos, listname, index, stack, player) + local meta = minetest.get_meta(pos) + if (player:get_player_name() ~= meta:get_string("owner")) then + minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( + player:get_player_name(), + infotext, + meta:get_string("owner"), + minetest.pos_to_string(pos) + )) + return 0 + end + if (allow_metadata_inventory_put) then + return allow_metadata_inventory_put(pos, listname, index, stack, player) + else + return stack:get_count() + end + end + local allow_metadata_inventory_take = def.allow_metadata_inventory_take; + def.allow_metadata_inventory_take = function(pos, listname, index, stack, player) + local meta = minetest.get_meta(pos) + if (player:get_player_name() ~= meta:get_string("owner")) then + minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( + player:get_player_name(), + infotext, + meta:get_string("owner"), + minetest.pos_to_string(pos) + )) + return 0 + end + if (allow_metadata_inventory_take) then + return allow_metadata_inventory_take(pos, listname, index, stack, player) + else + return stack:get_count() + end + end + minetest.register_node(name.."_locked", def) + minetest.register_craft({ + output = name.."_locked", + type = "shapeless", + recipe = { + name, + "default:steel_ingot", + } + }) +end + +local items = { + { "refrigerator_white_bottom", + "Refrigerator" }, + { "refrigerator_steel_bottom", + "Refrigerator (stainless steel)" }, + { "kitchen_cabinet", + "Cabinet" }, + { "kitchen_cabinet_steel", + "Cabinet (stainless steel top)" }, + { "kitchen_cabinet_granite", + "Cabinet (granite top)" }, + { "kitchen_cabinet_marble", + "Cabinet (marble top)" }, + { "kitchen_cabinet_half", + "Cabinet" }, + { "kitchen_cabinet_with_sink", + "Cabinet" }, + { "nightstand_oak_one_drawer", + "Nightstand" }, + { "nightstand_oak_two_drawers", + "Nightstand" }, + { "nightstand_mahogany_one_drawer", + "Nightstand" }, + { "nightstand_mahogany_two_drawers", + "Nightstand" }, + { "filing_cabinet", + "Filing cabinet" }, + { "oven", + "Oven" }, + { "oven_active", + "Oven (active)" }, + { "oven_steel", + "Oven (stainless steel)" }, + { "oven_steel_active", + "Oven (stainless steel, active)" }, + { "microwave_oven", + "Microwave Oven" }, + { "microwave_oven_active", + "Microwave Oven (active)" }, +} + +for _,item in ipairs(items) do + local name, info = item[1], item[2]; + create_locked("homedecor:"..name, S("Locked "..info)); +end diff --git a/mods/homedecor_modpack/homedecor/handlers/nodeboxes.lua b/mods/homedecor_modpack/homedecor/handlers/nodeboxes.lua new file mode 100644 index 00000000..11a04fe0 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/nodeboxes.lua @@ -0,0 +1,39 @@ +-- please keep any non-generic nodeboxe with its node definition +-- this file should not accumulate any left over nodeboxes +-- but is meant to host any abstractions or calculations based on nodeboxes + +-- a box is defined as {x1, y1, z1, x2, y2, z2} +homedecor.box = { + slab_y = function(height, shift) return { -0.5, -0.5+(shift or 0), -0.5, 0.5, -0.5+height+(shift or 0), 0.5 } end, + slab_z = function(depth) return { -0.5, -0.5, -0.5+depth, 0.5, 0.5, 0.5 } end, + bar_y = function(radius) return {-radius, -0.5, -radius, radius, 0.5, radius} end, + cuboid = function(radius_x, radius_y, radius_z) return {-radius_x, -radius_y, -radius_z, radius_x, radius_y, radius_z} end, +} + +homedecor.nodebox = { + -- { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }, + -- can be used in-place as: + -- { type="regular" }, + regular = { type="regular" }, + null = { type = "fixed", fixed = { 0, 0, 0, 0, 0, 0 } }, +} + +local mt = {} +mt.__index = function(table, key) + local ref = homedecor.box[key] + local ref_type = type(ref) + if ref_type == "function" then + return function(...) + return { type = "fixed", fixed = ref(...) } + end + elseif ref_type == "table" then + return { type = "fixed", fixed = ref } + elseif ref_type == "nil" then + error(key .. "could not be found among nodebox presets and functions") + end + error("unexpected datatype " .. tostring(type(ref)) .. " while looking for " .. key) +end +setmetatable(homedecor.nodebox, mt) + + + diff --git a/mods/homedecor_modpack/homedecor/handlers/registration.lua b/mods/homedecor_modpack/homedecor/handlers/registration.lua new file mode 100644 index 00000000..a79d817b --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/registration.lua @@ -0,0 +1,155 @@ +homedecor = homedecor or {} +local S = homedecor.gettext + +local default_can_dig = function(pos,player) + local meta = minetest.get_meta(pos) + return meta:get_inventory():is_empty("main") +end + +local default_inventory_size = 32 +local default_inventory_formspecs = { + ["4"]="size[8,6]".. + "list[context;main;2,0;4,1;]".. + "list[current_player;main;0,2;8,4;]", + + ["6"]="size[8,6]".. + "list[context;main;1,0;6,1;]".. + "list[current_player;main;0,2;8,4;]", + + ["8"]="size[8,6]".. + "list[context;main;0,0;8,1;]".. + "list[current_player;main;0,2;8,4;]", + + ["12"]="size[8,7]".. + "list[context;main;1,0;6,2;]".. + "list[current_player;main;0,3;8,4;]", + + ["16"]="size[8,7]".. + "list[context;main;0,0;8,2;]".. + "list[current_player;main;0,3;8,4;]", + + ["24"]="size[8,8]".. + "list[context;main;0,0;8,3;]".. + "list[current_player;main;0,4;8,4;]", + + ["32"]="size[8,9]".. default.gui_bg .. default.gui_bg_img .. default.gui_slots .. + "list[context;main;0,0.3;8,4;]".. + "list[current_player;main;0,4.85;8,1;]".. + "list[current_player;main;0,6.08;8,3;8]".. + default.get_hotbar_bg(0,4.85), + + ["50"]="size[10,10]".. + "list[context;main;0,0;10,5;]".. + "list[current_player;main;1,6;8,4;]", +} + +local function get_formspec_by_size(size) + --TODO heuristic to use the "next best size" + local formspec = default_inventory_formspecs[tostring(size)] + return formspec or default_inventory_formspecs +end + +--wrapper around minetest.register_node that sets sane defaults and interprets some specialized settings +function homedecor.register(name, def) + def.paramtype = def.paramtype or "light" + def.paramtype2 = def.paramtype2 or "facedir" + + def.drawtype = def.drawtype + or (def.mesh and "mesh") + or (def.node_box and "nodebox") + + local infotext = def.infotext + --def.infotext = nil -- currently used to set locked refrigerator infotexts + + -- handle inventory setting + -- inventory = { + -- size = 16 + -- formspec = … + -- } + local inventory = def.inventory + def.inventory = nil + + if inventory then + def.on_construct = def.on_construct or function(pos) + local meta = minetest.get_meta(pos) + if infotext then + meta:set_string("infotext", infotext) + end + local size = inventory.size or default_inventory_size + meta:get_inventory():set_size("main", size) + meta:set_string("formspec", inventory.formspec or get_formspec_by_size(size)) + end + + def.can_dig = def.can_dig or default_can_dig + def.on_metadata_inventory_move = def.on_metadata_inventory_move or 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 + def.on_metadata_inventory_put = def.on_metadata_inventory_put or function(pos, listname, index, stack, player) + minetest.log("action", S("%s moves stuff to %s at %s"):format( + player:get_player_name(), name, minetest.pos_to_string(pos) + )) + end + def.on_metadata_inventory_take = def.on_metadata_inventory_take or function(pos, listname, index, stack, player) + minetest.log("action", S("%s takes stuff from %s at %s"):format( + player:get_player_name(), name, minetest.pos_to_string(pos) + )) + end + elseif infotext and not def.on_construct then + def.on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", infotext) + end + end + + local expand = def.expand + def.expand = nil + local after_unexpand = def.after_unexpand + def.after_unexpand = nil + + if expand then + def.on_place = def.on_place or function(itemstack, placer, pointed_thing) + if expand.top then + homedecor.stack_vertically(itemstack, placer, pointed_thing, itemstack:get_name(), expand.top) + end + if expand.right then + homedecor.stack_sideways(itemstack, placer, pointed_thing, itemstack:get_name(), expand.right, true) + end + if expand.forward then + homedecor.stack_sideways(itemstack, placer, pointed_thing, itemstack:get_name(), expand.forward, false) + end + end + def.after_dig_node = def.after_dig_node or function(pos, oldnode, oldmetadata, digger) + if expand.top and expand.forward ~= "air" then + local top_pos = { x=pos.x, y=pos.y+1, z=pos.z } + if minetest.get_node(top_pos).name == expand.top then + minetest.remove_node(top_pos) + end + end + + local fdir = oldnode.param2 + if not fdir or fdir > 3 then return end + + if expand.right and expand.forward ~= "air" then + local right_pos = { x=pos.x+homedecor.fdir_to_right[fdir+1][1], y=pos.y, z=pos.z+homedecor.fdir_to_right[fdir+1][2] } + if minetest.get_node(right_pos).name == expand.right then + minetest.remove_node(right_pos) + end + end + if expand.forward and expand.forward ~= "air" then + local forward_pos = { x=pos.x+homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+homedecor.fdir_to_fwd[fdir+1][2] } + if minetest.get_node(forward_pos).name == expand.forward then + minetest.remove_node(forward_pos) + end + end + + if after_unexpand then + after_unexpand(pos) + end + end + end + + -- register the actual minetest node + minetest.register_node("homedecor:" .. name, def) +end diff --git a/mods/homedecor_modpack/homedecor/init.lua b/mods/homedecor_modpack/homedecor/init.lua index 47a1d6ce..231cc6a4 100644 --- a/mods/homedecor_modpack/homedecor/init.lua +++ b/mods/homedecor_modpack/homedecor/init.lua @@ -4,7 +4,7 @@ -- lua files and from ironzorg's flowers mod. Many thanks to GloopMaster -- for helping me figure out the inventories used in the nightstands/dressers. -- --- The code for ovens, nightstands, refrigerators are basically modified +-- The code for ovens, nightstands, refrigerators are basically modified -- copies of the code for chests and furnaces. homedecor = {} @@ -46,132 +46,15 @@ end --table copy function homedecor.table_copy(t) - local nt = { }; - for k, v in pairs(t) do - if type(v) == "table" then - nt[k] = homedecor.table_copy(v) - else - nt[k] = v - end - end - return nt -end - --- - -function homedecor.get_nodedef_field(nodename, fieldname) - if not minetest.registered_nodes[nodename] then - return nil - end - return minetest.registered_nodes[nodename][fieldname] -end - --- Place a two-node-tall single object (e.g. a floor lamp) - -function homedecor.place_twonode_vertical(itemstack, placer, pointed_thing, node) - local pos = pointed_thing.under - local pnode = minetest.get_node(pointed_thing.under) - local rnodedef = minetest.registered_nodes[pnode.name] - - if not rnodedef["buildable_to"] then - pos = pointed_thing.above - end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local pos2 = { x = pos.x, y=pos.y + 1, z = pos.z } - - local tnode = minetest.get_node(pos) - local tnode2 = minetest.get_node(pos2) - - if homedecor.get_nodedef_field(tnode.name, "buildable_to") - and homedecor.get_nodedef_field(tnode2.name, "buildable_to") - and not minetest.is_protected(pos, placer:get_player_name()) - and not minetest.is_protected(pos2, placer:get_player_name()) then - minetest.add_node(pos, { name = node, param2 = fdir }) - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - end -end - --- Stack one node above another - -function homedecor.stack_vertically(itemstack, placer, pointed_thing, node1, node2) - local pos = pointed_thing.under - local pnode = minetest.get_node(pointed_thing.under) - local rnodedef = minetest.registered_nodes[pnode.name] - - if not rnodedef["buildable_to"] then - pos = pointed_thing.above - end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local pos2 = { x = pos.x, y=pos.y + 1, z = pos.z } - - local tnode = minetest.get_node(pos) - local tnode2 = minetest.get_node(pos2) - - if homedecor.get_nodedef_field(tnode.name, "buildable_to") - and homedecor.get_nodedef_field(tnode2.name, "buildable_to") - and not minetest.is_protected(pos, placer:get_player_name()) - and not minetest.is_protected(pos2, placer:get_player_name()) then - minetest.add_node(pos, { name = node1, param2 = fdir }) - minetest.add_node(pos2, { name = node2, param2 = fdir }) - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - end -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 = pointed_thing.under - local pnode = minetest.get_node(pointed_thing.under) - local rnodedef = minetest.registered_nodes[pnode.name] - - if not rnodedef["buildable_to"] then - pos = pointed_thing.above - end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local pos2 - if dir then - pos2 = { x = pos.x + homedecor.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - else - pos2 = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } - end - - local tnode = minetest.get_node(pos) - local tnode2 = minetest.get_node(pos2) - - if homedecor.get_nodedef_field(tnode.name, "buildable_to") - and homedecor.get_nodedef_field(tnode2.name, "buildable_to") - and not minetest.is_protected(pos, placer:get_player_name()) - and not minetest.is_protected(pos2, placer:get_player_name()) then - minetest.add_node(pos, { name = node1, param2 = fdir }) - minetest.add_node(pos2, { name = node2, param2 = fdir }) - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack + local nt = { }; + for k, v in pairs(t) do + if type(v) == "table" then + nt[k] = homedecor.table_copy(v) + else + nt[k] = v end end + return nt end -- Determine if the item being pointed at is the underside of a node (e.g a ceiling) @@ -222,8 +105,17 @@ function homedecor.find_ceiling(itemstack, placer, pointed_thing) return isceiling, pos end --- load various other components +-- nodebox arithmetics and helpers +-- (please keep non-generic nodeboxes with their node definition) +dofile(homedecor.modpath.."/handlers/nodeboxes.lua") +-- expand and unexpand decor +dofile(homedecor.modpath.."/handlers/expansion.lua") +-- register nodes that cook stuff +dofile(homedecor.modpath.."/handlers/furnaces.lua") +-- glue it all together into a registration function +dofile(homedecor.modpath.."/handlers/registration.lua") +-- load various other components dofile(homedecor.modpath.."/misc-nodes.lua") -- the catch-all for all misc nodes dofile(homedecor.modpath.."/tables.lua") dofile(homedecor.modpath.."/electronics.lua") @@ -237,14 +129,15 @@ dofile(homedecor.modpath.."/doors_and_gates.lua") dofile(homedecor.modpath.."/fences.lua") dofile(homedecor.modpath.."/lighting.lua") -dofile(homedecor.modpath.."/kitchen_cabinet.lua") -dofile(homedecor.modpath.."/refrigerator.lua") -dofile(homedecor.modpath.."/misc-bathroom.lua") +dofile(homedecor.modpath.."/kitchen_appliances.lua") +dofile(homedecor.modpath.."/kitchen_furniture.lua") + +dofile(homedecor.modpath.."/bathroom_furniture.lua") +dofile(homedecor.modpath.."/bathroom_sanitation.lua") dofile(homedecor.modpath.."/laundry.lua") -dofile(homedecor.modpath.."/furnaces.lua") dofile(homedecor.modpath.."/nightstands.lua") dofile(homedecor.modpath.."/clocks.lua") dofile(homedecor.modpath.."/misc-electrical.lua") @@ -256,14 +149,11 @@ dofile(homedecor.modpath.."/crafts.lua") dofile(homedecor.modpath.."/furniture.lua") dofile(homedecor.modpath.."/furniture_medieval.lua") -dofile(homedecor.modpath.."/furniture_bathroom.lua") dofile(homedecor.modpath.."/furniture_recipes.lua") dofile(homedecor.modpath.."/climate-control.lua") dofile(homedecor.modpath.."/cobweb.lua") -dofile(homedecor.modpath.."/locked.lua") - - +dofile(homedecor.modpath.."/handlers/locked.lua") print("[HomeDecor] "..S("Loaded!")) diff --git a/mods/homedecor_modpack/homedecor/kitchen_appliances.lua b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua new file mode 100644 index 00000000..b70d5b10 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua @@ -0,0 +1,438 @@ +-- This file supplies refrigerators + +local S = homedecor.gettext + +-- nodebox models + +local fridge_model_bottom = { + type = "fixed", + fixed = { + {0, -0.4375, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 + {-0.5, -0.5, -0.42, 0.5, 0.5, 0.5}, -- NodeBox2 + {-0.5, -0.4375, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox3 + {0, 0.25, -0.5, 0.0625, 0.3125, -0.4375}, -- NodeBox4 + {-0.125, 0.25, -0.5, -0.0625, 0.3125, -0.4375}, -- NodeBox5 + {0, 0.25, -0.5, 0.0625, 0.5, -0.473029}, -- NodeBox6 + {-0.125, 0.25, -0.5, -0.0625, 0.5, -0.473029}, -- NodeBox7 + } +} + +local fridge_model_top = { + type = "fixed", + fixed = { + {0, -0.5, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 + {-0.0625, -0.5, -0.42, 0, 0.5, 0.5}, -- NodeBox2 + {-0.5, -0.5, -0.4375, -0.0625, -0.4375, 0.5}, -- NodeBox3 + {-0.5, -0.5, -0.4375, -0.4375, 0.5, 0.5}, -- NodeBox4 + {-0.5, -0.1875, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox5 + {-0.4375, -0.4375, -0.125, -0.0625, -0.1875, 0.5}, -- NodeBox6 + {-0.125, -0.4375, -0.4375, -0.0625, -0.1875, -0.125}, -- NodeBox7 + {-0.3125, -0.3125, -0.307054, -0.25, -0.1875, -0.286307}, -- NodeBox8 + {-0.125, 0, -0.5, -0.0625, 0.0625, -0.4375}, -- NodeBox9 + {0, 0, -0.5, 0.0625, 0.0625, -0.4375}, -- NodeBox10 + {0, -0.5, -0.5, 0.0625, 0.0625, -0.473029}, -- NodeBox11 + {-0.125, -0.5, -0.5, -0.0625, 0.0625, -0.473029}, -- NodeBox12 + } +} + +-- steel-textured fridge +homedecor.register("refrigerator_steel_bottom", { + tiles = { + "default_steel_block.png", + "homedecor_refrigerator_steel_bottom.png", + "homedecor_refrigerator_steel_sides1.png", + "homedecor_refrigerator_steel_sides1.png^[transformFX", + "homedecor_refrigerator_steel_back1.png", + "homedecor_refrigerator_steel_front2.png" + }, + inventory_image = "homedecor_refrigerator_steel_inv.png", + description = S("Refrigerator (stainless steel)"), + groups = {snappy=3}, + node_box = fridge_model_bottom, + selection_box = homedecor.nodebox.slab_y(2), + expand = { + top="homedecor:refrigerator_steel_top" + }, + infotext=S("Refrigerator"), + inventory = { + size=50, + lockable=true, + }, +}) + +homedecor.register("refrigerator_steel_top", { + tiles = { + "homedecor_refrigerator_steel_top.png", + "default_steel_block.png", + "homedecor_refrigerator_steel_sides1.png", + "homedecor_refrigerator_steel_sides1.png^[transformFX", + "homedecor_refrigerator_steel_back1.png", + "homedecor_refrigerator_steel_front1.png" + }, + groups = {snappy=3}, + node_box = fridge_model_top, + selection_box = homedecor.nodebox.null, +}) + +-- white, enameled fridge + +homedecor.register("refrigerator_white_bottom", { + tiles = { + "default_steel_block.png", + "homedecor_refrigerator_white_bottom.png", + "homedecor_refrigerator_white_sides1.png", + "homedecor_refrigerator_white_sides1.png^[transformFX", + "homedecor_refrigerator_white_back1.png", + "homedecor_refrigerator_white_front2.png" + }, + inventory_image = "homedecor_refrigerator_white_inv.png", + description = S("Refrigerator"), + groups = {snappy=3}, + node_box = fridge_model_bottom, + selection_box = homedecor.nodebox.slab_y(2), + expand = { + top="homedecor:refrigerator_white_top" + }, + infotext=S("Refrigerator"), + inventory = { + size=50, + lockable=true + }, +}) + +homedecor.register("refrigerator_white_top", { + tiles = { + "homedecor_refrigerator_white_top.png", + "default_steel_block.png", + "homedecor_refrigerator_white_sides1.png", + "homedecor_refrigerator_white_sides1.png^[transformFX", + "homedecor_refrigerator_white_back1.png", + "homedecor_refrigerator_white_front1.png" + }, + groups = {snappy=3}, + node_box = fridge_model_top, + selection_box = homedecor.nodebox.null, +}) + +-- convert the old single-node fridges to the new two-node models + +minetest.register_abm({ + nodenames = { "homedecor:refrigerator" }, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local fdir = node.param2 + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom", param2 = fdir }) + minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) + end +}) + +minetest.register_abm({ + nodenames = { "homedecor:refrigerator_locked" }, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local fdir = node.param2 + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom_locked", param2 = fdir }) + minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) + end +}) + +minetest.register_abm({ + nodenames = { "homedecor:refrigerator_steel" }, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local fdir = node.param2 + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom", param2 = fdir }) + minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) + end +}) + +minetest.register_abm({ + nodenames = { "homedecor:refrigerator_steel_locked" }, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local fdir = node.param2 + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom_locked", param2 = fdir }) + minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) + end +}) + +-- kitchen "furnaces" +homedecor.register_furnace("homedecor:oven", { + description = S("Oven"), + tile_format = "homedecor_oven_%s%s.png", + output_slots = 4, + output_width = 2, + cook_speed = 1.25, +}) + +homedecor.register_furnace("homedecor:oven_steel", { + description = S("Oven (stainless steel)"), + tile_format = "homedecor_oven_steel_%s%s.png", + output_slots = 4, + output_width = 2, + cook_speed = 1.25, +}) + +homedecor.register_furnace("homedecor:microwave_oven", { + description = S("Microwave Oven"), + tiles = { + "homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180", + "homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90", + "homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front.png" + }, + tiles_active = { + "homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180", + "homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90", + "homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front_active.png" + }, + output_slots = 2, + output_width = 2, + cook_speed = 1.5, + extra_nodedef_fields = { + drawtype = "nodebox", + paramtype = "light", + --paramtype2 = "facedir", -- Not needed, set by register_furnace + node_box = { + type = "fixed", + fixed = { { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 } }, + }, + }, +}) + +-- coffee! +-- coffee! +-- coffee! +homedecor.register("coffee_maker", { + tiles = { + "homedecor_coffeemaker_top.png", + "homedecor_coffeemaker_bottom.png", + "homedecor_coffeemaker_right.png", + "homedecor_coffeemaker_right.png^[transformFX", + "homedecor_coffeemaker_back.png", + "homedecor_coffeemaker_front.png" + }, + description = "Coffee Maker", + inventory_image = "homedecor_coffeemaker_inv.png", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {0.0625, -0.5, -0.025, 0.375, -0.375, 0.5}, -- NodeBox1 + {0.0625, -0.375, 0.3125, 0.375, 0, 0.5}, -- NodeBox2 + {0.0625, -0.052, 0.02, 0.375, 0.19, 0.5}, -- NodeBox3 + {0.078, -0.375, 0, 0.36, -0.0625, 0.3125}, -- NodeBox4 + {0.1875, -0.098, -0.0525, 0.25, -0.078, 0}, -- NodeBox5 + {0.1875, -0.36, -0.090, 0.25, -0.078, -0.0525}, -- NodeBox6 + {0.1875, -0.36, -0.0525, 0.25, -0.34, 0}, -- NodeBox7 + {-0.1875, -0.5, -0.3125, -0.1, -0.4, -0.225}, -- NodeBox8 + {-0.1975, -0.5, -0.3225, -0.1, -0.375, -0.3125}, -- NodeBox9 + {-0.1975, -0.5, -0.235, -0.1, -0.375, -0.225}, -- NodeBox10 + {-0.1975, -0.5, -0.3225, -0.1875, -0.375, -0.225}, -- NodeBox11 + {-0.11, -0.5, -0.3225, -0.1, -0.375, -0.225}, -- NodeBox12 + {-0.1, -0.485, -0.2838, -0.06, -0.475, -0.2638}, -- NodeBox13 + {-0.1, -0.4, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox14 + {-0.075, -0.485, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox15 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.22, -0.5, -0.35, 0.4, 0.21, 0.5 } + } +}) + +local fdir_to_steampos = { + x = { 0.15, 0.275, -0.15, -0.275 }, + z = { 0.275, -0.15, -0.275, 0.15 } +} + +minetest.register_abm({ + nodenames = "homedecor:coffee_maker", + interval = 2, + chance = 1, + action = function(pos, node) + local fdir = node.param2 + if fdir and fdir < 4 then + + local steamx = fdir_to_steampos.x[fdir + 1] + local steamz = fdir_to_steampos.z[fdir + 1] + + minetest.add_particlespawner({ + amount = 1, + time = 1, + minpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz}, + maxpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz}, + minvel = {x=-0.003, y=0.01, z=-0.003}, + maxvel = {x=0.003, y=0.01, z=-0.003}, + minacc = {x=0.0,y=-0.0,z=-0.0}, + maxacc = {x=0.0,y=0.003,z=-0.0}, + minexptime = 2, + maxexptime = 5, + minsize = 1, + maxsize = 1.2, + collisiondetection = false, + texture = "homedecor_steam.png", + }) + end + end +}) + +homedecor.register("toaster", { + description = "Toaster", + tiles = { + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png" + }, + inventory_image = "homedecor_toaster_inv.png", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + groups = { snappy=3 }, + node_box = { + type = "fixed", + fixed = { + {-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1 + }, + }, + on_rightclick = function(pos, node, clicker) + local fdir = node.param2 + minetest.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir }) + minetest.sound_play("toaster", { + pos = pos, + gain = 1.0, + max_hear_distance = 5 + }) + end +}) + +homedecor.register("toaster_loaf", { + tiles = { + "homedecor_toaster_toploaf.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png", + "homedecor_toaster_sides.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + groups = { snappy=3, not_in_creative_inventory=1 }, + node_box = { + type = "fixed", + fixed = { + {-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1 + {-0.03125, -0.3125, -0.0935, 0, -0.25, 0.0935}, -- NodeBox2 + {0.0625, -0.3125, -0.0935, 0.0935, -0.25, 0.0935}, -- NodeBox3 + }, + }, + on_rightclick = function(pos, node, clicker) + local fdir = node.param2 + minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) + end, + drop = "homedecor:toaster" +}) + + +homedecor.register("dishwasher", { + description = "Dishwasher", + drawtype = "nodebox", + tiles = { + "homedecor_dishwasher_top.png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + paramtype = "light", + paramtype2 = "facedir", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}, + {-0.5, -0.5, -0.5, 0.5, 0.5, -0.4375}, + {-0.5, -0.5, -0.5, 0.5, 0.1875, 0.1875}, + {-0.4375, -0.5, -0.5, 0.4375, 0.4375, 0.4375}, + } + }, + selection_box = { type = "regular" }, + groups = { snappy = 3 }, +}) + +homedecor.register("dishwasher_wood", { + description = "Dishwasher", + tiles = { + "homedecor_kitchen_cabinet_top.png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = { snappy = 3 }, +}) + +homedecor.register("dishwasher_steel", { + description = "Dishwasher", + tiles = { + "homedecor_kitchen_cabinet_top_steel.png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = { snappy = 3 }, +}) + +homedecor.register("dishwasher_marble", { + description = "Dishwasher", + tiles = { + "homedecor_kitchen_cabinet_top_marble.png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = { snappy = 3 }, +}) + +homedecor.register("dishwasher_granite", { + description = "Dishwasher", + tiles = { + "homedecor_kitchen_cabinet_top_granite.png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = { snappy = 3 }, +}) diff --git a/mods/homedecor_modpack/homedecor/kitchen_cabinet.lua b/mods/homedecor_modpack/homedecor/kitchen_cabinet.lua deleted file mode 100644 index 7c3f2efe..00000000 --- a/mods/homedecor_modpack/homedecor/kitchen_cabinet.lua +++ /dev/null @@ -1,170 +0,0 @@ --- This file supplies Kitchen cabinets and kitchen sink - -local S = homedecor.gettext - -local counter_materials = { "", "granite", "marble", "steel" } - -for _, mat in ipairs(counter_materials) do - - local desc = S("Kitchen Cabinet") - local material = "" - - if mat ~= "" then - desc = S("Kitchen Cabinet ("..mat.." top)") - material = "_"..mat - end - - minetest.register_node('homedecor:kitchen_cabinet'..material, { - description = desc, - tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png', - 'homedecor_kitchen_cabinet_bottom.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,8]".. - "list[current_name;main;0,0;8,3;]".. - "list[current_player;main;0,4;8,4;]") - meta:set_string("infotext", S("Kitchen Cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 24) - 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 kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - }) -end - -minetest.register_node('homedecor:kitchen_cabinet_half', { - drawtype="nodebox", - description = S('Half-height Kitchen Cabinet (on ceiling)'), - tiles = { 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_bottom.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_front_half.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } - }, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;1,0;6,2;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Kitchen Cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 12) - 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 kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, -}) - - -minetest.register_node('homedecor:kitchen_cabinet_with_sink', { - description = S("Kitchen Cabinet with sink"), - drawtype = "mesh", - mesh = "homedecor_kitchen_sink.obj", - tiles = { "homedecor_kitchen_sink.png" }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;0,0;8,2;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Under-sink cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 16) - 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 kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from kitchen cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, -}) diff --git a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua new file mode 100644 index 00000000..df3c1781 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua @@ -0,0 +1,134 @@ +-- This file supplies Kitchen cabinets and kitchen sink + +local S = homedecor.gettext + +local counter_materials = { "", "granite", "marble", "steel" } + +for _, mat in ipairs(counter_materials) do + + local desc = S("Kitchen Cabinet") + local material = "" + + if mat ~= "" then + desc = S("Kitchen Cabinet ("..mat.." top)") + material = "_"..mat + end + + homedecor.register("kitchen_cabinet"..material, { + description = desc, + tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png', + 'homedecor_kitchen_cabinet_bottom.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_front.png'}, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Kitchen Cabinet"), + inventory = { + size=24, + }, + }) +end + +local kitchen_cabinet_half_box = homedecor.nodebox.slab_y(0.5, 0.5) +homedecor.register("kitchen_cabinet_half", { + description = S('Half-height Kitchen Cabinet (on ceiling)'), + tiles = { 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_bottom.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_sides.png', + 'homedecor_kitchen_cabinet_front_half.png'}, + selection_box = kitchen_cabinet_half_box, + node_box = kitchen_cabinet_half_box, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Kitchen Cabinet"), + inventory = { + size=12, + }, +}) + +homedecor.register("kitchen_cabinet_with_sink", { + description = S("Kitchen Cabinet with sink"), + mesh = "homedecor_kitchen_sink.obj", + tiles = { "homedecor_kitchen_sink.png" }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Under-sink cabinet"), + inventory = { + size=16, + }, +}) + +homedecor.register("copper_pans", { + description = "Copper pans", + tiles = { + "homedecor_polished_copper.png" + }, + inventory_image = "homedecor_copper_pans_inv.png", + groups = { snappy=3 }, + node_box = { + type = "fixed", + fixed = { + {-0.375, -0.5, -0.1875, -0.0625, -0.48, 0.125}, -- NodeBox1 + {-0.375, -0.48, -0.1875, -0.36, -0.3125, 0.125}, -- NodeBox2 + {-0.0775, -0.48, -0.1875, -0.0625, -0.3125, 0.125}, -- NodeBox3 + {-0.375, -0.48, 0.11, -0.0625, -0.3125, 0.125}, -- NodeBox4 + {-0.375, -0.48, -0.1875, -0.0625, -0.3125, -0.1725}, -- NodeBox5 + {-0.25, -0.36, -0.5, -0.1875, -0.33, -0.1875}, -- NodeBox6 + {0.0625, -0.5, 0, 0.375, -0.48, 0.3125}, -- NodeBox7 + {0.0625, -0.48, 0, 0.0775, -0.3125, 0.3125}, -- NodeBox8 + {0.36, -0.48, 0, 0.375, -0.3125, 0.3125}, -- NodeBox9 + {0.0625, -0.48, 0, 0.375, -0.3125, 0.0175}, -- NodeBox10 + {0.0625, -0.48, 0.295, 0.375, -0.3125, 0.3125}, -- NodeBox11 + {0.1875, -0.36, -0.3125, 0.25, -0.33, 0}, -- NodeBox12 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 } + }, + on_place = minetest.rotate_node +}) + +homedecor.register("kitchen_faucet", { + tiles = { "homedecor_bright_metal.png" }, + inventory_image = "homedecor_kitchen_faucet_inv.png", + description = "Kitchen Faucet", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {0, -0.5, 0.375, 0.0625, -0.1875, 0.4375}, -- NodeBox1 + {0, -0.1875, 0.35, 0.0625, -0.15, 0.4375}, -- NodeBox2 + {0, -0.15, 0.32, 0.0625, -0.11, 0.41}, -- NodeBox3 + {0.007, -0.12, 0.17, 0.055, -0.11, 0.1285}, -- NodeBox4 + {0, -0.11, 0.125, 0.0625, -0.07, 0.37}, -- NodeBox5 + {-0.05, -0.48, 0.385, 0.115, -0.455, 0.43}, -- NodeBox6 + {-0.05, -0.49, 0.395, 0.115, -0.445, 0.42}, -- NodeBox7 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.055, -0.5, 0.125, 0.12, -0.065, 0.4375 } + }, +}) + +homedecor.register("paper_towel", { + mesh = "homedecor_paper_towel.obj", + tiles = { "homedecor_paper_towel.png" }, + inventory_image = "homedecor_paper_towel_inv.png", + description = "Paper towels", + groups = { snappy=3 }, + selection_box = { + type = "fixed", + fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } + }, + collision_box = { + type = "fixed", + fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } + } +}) + diff --git a/mods/homedecor_modpack/homedecor/laundry.lua b/mods/homedecor_modpack/homedecor/laundry.lua index f26de99b..14780600 100644 --- a/mods/homedecor_modpack/homedecor/laundry.lua +++ b/mods/homedecor_modpack/homedecor/laundry.lua @@ -1,8 +1,7 @@ -- laundry devices -minetest.register_node("homedecor:washing_machine", { +homedecor.register("washing_machine", { description = "Washing Machine", - drawtype = "nodebox", tiles = { "homedecor_washing_machine_top.png", "homedecor_washing_machine_bottom.png", @@ -11,8 +10,6 @@ minetest.register_node("homedecor:washing_machine", { "homedecor_washing_machine_back.png", "homedecor_washing_machine_front.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -20,16 +17,12 @@ minetest.register_node("homedecor:washing_machine", { {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, + selection_box = { type = "regular" }, groups = { snappy = 3 }, }) -minetest.register_node("homedecor:dryer", { +homedecor.register("dryer", { description = "Tumble dryer", - drawtype = "nodebox", tiles = { "homedecor_dryer_top.png", "homedecor_dryer_bottom.png", @@ -38,8 +31,6 @@ minetest.register_node("homedecor:dryer", { "homedecor_dryer_back.png", "homedecor_dryer_front.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -47,10 +38,7 @@ minetest.register_node("homedecor:dryer", { {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, + selection_box = { type = "regular" }, groups = { snappy = 3 }, }) diff --git a/mods/homedecor_modpack/homedecor/lighting.lua b/mods/homedecor_modpack/homedecor/lighting.lua index 4b49b6cd..b3d2ff31 100644 --- a/mods/homedecor_modpack/homedecor/lighting.lua +++ b/mods/homedecor_modpack/homedecor/lighting.lua @@ -61,11 +61,19 @@ for i in ipairs(colors) do }) end +local glowlight_nodebox = { + half = homedecor.nodebox.slab_y(1/2), + quarter = homedecor.nodebox.slab_y(1/4), + small_cube = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, +} + -- Yellow -minetest.register_node('homedecor:glowlight_half_yellow', { +homedecor.register("glowlight_half_yellow", { description = S("Yellow Glowlight (thick)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_yellow_top.png', 'homedecor_glowlight_yellow_bottom.png', @@ -74,28 +82,16 @@ minetest.register_node('homedecor:glowlight_half_yellow', { 'homedecor_glowlight_thick_yellow_sides.png', 'homedecor_glowlight_thick_yellow_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.half, + node_box = glowlight_nodebox.half, groups = { snappy = 3 }, light_source = LIGHT_MAX, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) -minetest.register_node('homedecor:glowlight_quarter_yellow', { +homedecor.register("glowlight_quarter_yellow", { description = S("Yellow Glowlight (thin)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_yellow_top.png', 'homedecor_glowlight_yellow_bottom.png', @@ -104,19 +100,8 @@ minetest.register_node('homedecor:glowlight_quarter_yellow', { 'homedecor_glowlight_thin_yellow_sides.png', 'homedecor_glowlight_thin_yellow_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.25, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.25, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.quarter, + node_box = glowlight_nodebox.quarter, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), @@ -125,9 +110,8 @@ minetest.register_node('homedecor:glowlight_quarter_yellow', { -- White -minetest.register_node('homedecor:glowlight_half_white', { +homedecor.register("glowlight_half_white", { description = S("White Glowlight (thick)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_white_top.png', 'homedecor_glowlight_white_bottom.png', @@ -136,28 +120,16 @@ minetest.register_node('homedecor:glowlight_half_white', { 'homedecor_glowlight_thick_white_sides.png', 'homedecor_glowlight_thick_white_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.half, + node_box = glowlight_nodebox.half, groups = { snappy = 3 }, light_source = LIGHT_MAX, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) -minetest.register_node('homedecor:glowlight_quarter_white', { +homedecor.register("glowlight_quarter_white", { description = S("White Glowlight (thin)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_white_top.png', 'homedecor_glowlight_white_bottom.png', @@ -166,19 +138,8 @@ minetest.register_node('homedecor:glowlight_quarter_white', { 'homedecor_glowlight_thin_white_sides.png', 'homedecor_glowlight_thin_white_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.25, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.25, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.quarter, + node_box = glowlight_nodebox.quarter, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), @@ -187,9 +148,8 @@ minetest.register_node('homedecor:glowlight_quarter_white', { -- Glowlight "cubes" -minetest.register_node('homedecor:glowlight_small_cube_yellow', { +homedecor.register("glowlight_small_cube_yellow", { description = S("Yellow Glowlight (small cube)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_cube_yellow_tb.png', 'homedecor_glowlight_cube_yellow_tb.png', @@ -198,28 +158,16 @@ minetest.register_node('homedecor:glowlight_small_cube_yellow', { 'homedecor_glowlight_cube_yellow_sides.png', 'homedecor_glowlight_cube_yellow_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - node_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.small_cube, + node_box = glowlight_nodebox.small_cube, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) -minetest.register_node('homedecor:glowlight_small_cube_white', { +homedecor.register("glowlight_small_cube_white", { description = S("White Glowlight (small cube)"), - drawtype = "nodebox", tiles = { 'homedecor_glowlight_cube_white_tb.png', 'homedecor_glowlight_cube_white_tb.png', @@ -228,26 +176,15 @@ minetest.register_node('homedecor:glowlight_small_cube_white', { 'homedecor_glowlight_cube_white_sides.png', 'homedecor_glowlight_cube_white_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - node_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = glowlight_nodebox.small_cube, + node_box = glowlight_nodebox.small_cube, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) -minetest.register_node("homedecor:plasma_lamp", { +homedecor.register("plasma_lamp", { description = "Plasma Lamp", drawtype = "glasslike_framed", tiles = {"homedecor_gold_block.png","homedecor_glass_face_clean.png"}, @@ -258,7 +195,6 @@ minetest.register_node("homedecor:plasma_lamp", { } }, -- use_texture_alpha = true, - paramtype = "light", light_source = LIGHT_MAX - 1, sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -268,129 +204,109 @@ minetest.register_node("homedecor:plasma_lamp", { end }) -minetest.register_node('homedecor:candle', { +homedecor.register("candle", { description = S("Thick Candle"), - drawtype = "nodebox", tiles = { 'homedecor_candle_top.png', 'homedecor_candle_top.png', {name="homedecor_candle_sides.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, }, - node_box = { - type = "fixed", - fixed = { - { -0.125, -0.5, -0.125, 0.125, 0, 0.125 }, - { -0.125, 0, 0, 0.125, 0.5, 0 }, - { 0, 0, -0.125, 0, 0.5, 0.125 } - } - }, - selection_box = { - type = "fixed", - fixed = { - { -0.1875, -0.5, -0.1875, 0.1875, 0.5, 0.1875 }, - } - }, + node_box = { + type = "fixed", + fixed = { + { -0.125, -0.5, -0.125, 0.125, 0, 0.125 }, + { -0.125, 0, 0, 0.125, 0.5, 0 }, + { 0, 0, -0.125, 0, 0.5, 0.125 } + } + }, + selection_box = { + type = "fixed", + fixed = { + { -0.1875, -0.5, -0.1875, 0.1875, 0.5, 0.1875 }, + } + }, sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node('homedecor:candle_thin', { +homedecor.register("candle_thin", { description = S("Little Candle"), inventory_image = 'homedecor_candle_inv.png', drawtype = "plantlike", tiles = { {name="homedecor_candle.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.0}}, }, - selection_box = { - type = "fixed", - fixed = { - { -0.1, -0.5, -0.1, 0.125, 0.05, 0.125 }, - } - }, + selection_box = { + type = "fixed", + fixed = { + { -0.1, -0.5, -0.1, 0.125, 0.05, 0.125 }, + } + }, sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, }) -minetest.register_node('homedecor:oil_lamp', { +homedecor.register("oil_lamp", { description = S("Oil lamp"), drawtype = "plantlike", tiles = { 'homedecor_oil_lamp.png' }, inventory_image = 'homedecor_oil_lamp.png', sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { - { -0.3, -0.5, -0.3, 0.3, 0.5, 0.3 }, - } - }, + selection_box = { + type = "fixed", + fixed = { + { -0.3, -0.5, -0.3, 0.3, 0.5, 0.3 }, + } + }, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node('homedecor:wall_lantern', { +homedecor.register("wall_lantern", { description = S("Wall lantern"), drawtype = "plantlike", tiles = { 'homedecor_wall_lantern.png' }, inventory_image = 'homedecor_wall_lantern.png', sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { - { -0.3, -0.5, -0.3, 0.3, 0.5, 0.3 }, - } - }, + selection_box = { + type = "fixed", + fixed = { + { -0.3, -0.5, -0.3, 0.3, 0.5, 0.3 }, + } + }, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node('homedecor:lattice_lantern_large', { +homedecor.register("lattice_lantern_large", { description = S("Lattice lantern (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, - sunlight_propagates = false, - paramtype = "light", - walkable = true, groups = { snappy = 3 }, light_source = LIGHT_MAX, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node('homedecor:lattice_lantern_small', { +homedecor.register("lattice_lantern_small", { description = S("Lattice lantern (small)"), - drawtype = "nodebox", tiles = { 'homedecor_lattice_lantern_small_tb.png', 'homedecor_lattice_lantern_small_tb.png', 'homedecor_lattice_lantern_small_sides.png' }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - node_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, + node_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), @@ -418,12 +334,10 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) colordesc = " (white)" end - minetest.register_node("homedecor:table_lamp"..lampcolor.."_"..suffix, { + homedecor.register("table_lamp"..lampcolor.."_"..suffix, { description = S("Table Lamp "..colordesc), - drawtype = "mesh", mesh = "homedecor_table_lamp.obj", tiles = { "homedecor_table_standing_lamp"..lampcolor.."_"..suffix..".png" }, - paramtype = "light", walkable = false, light_source = light, selection_box = tlamp_cbox, @@ -441,13 +355,11 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) -- standing lamps - minetest.register_node("homedecor:standing_lamp"..lampcolor.."_"..suffix, { + homedecor.register("standing_lamp"..lampcolor.."_"..suffix, { description = S("Standing Lamp"..colordesc), - drawtype = "mesh", mesh = "homedecor_standing_lamp.obj", tiles = { "homedecor_table_standing_lamp"..lampcolor.."_"..suffix..".png" }, inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", - paramtype = "light", walkable = false, light_source = light, groups = {cracky=2,oddly_breakable_by_hand=1, @@ -455,15 +367,12 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) }, selection_box = slamp_cbox, collision_box = slamp_cbox, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.place_twonode_vertical(itemstack, placer, pointed_thing, - "homedecor:standing_lamp"..lampcolor.."_"..suffix) - end, on_punch = function(pos, node, puncher) node.name = "homedecor:standing_lamp"..lampcolor.."_"..repl[suffix] minetest.set_node(pos, node) nodeupdate(pos) end, + expand = { top="air" }, }) -- "bottom" in the node name is obsolete now, as "top" node doesn't exist anymore. @@ -471,7 +380,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) minetest.register_alias("homedecor:standing_lamp_top"..lampcolor.."_"..suffix, "air") -- for old maps that had 3dfornit`ure - if lampcolor == "" then + if lampcolor == "" then minetest.register_alias("3dforniture:table_lamp_"..suffix, "homedecor:table_lamp_"..suffix) end end diff --git a/mods/homedecor_modpack/homedecor/locked.lua b/mods/homedecor_modpack/homedecor/locked.lua deleted file mode 100644 index 7476c01a..00000000 --- a/mods/homedecor_modpack/homedecor/locked.lua +++ /dev/null @@ -1,161 +0,0 @@ --- Locked Stuff for Home Decor mod, by Kaeza --- --- The code is mostly copypasta from default:chest_locked, with a few --- tidbits to ease creation of new items, should need arise. - -local S = homedecor.gettext - ---[[ - | create_locked ( name, infotext ) - | - | Description: - | This function takes a base node name such as "homedecor:refrigerator", - | copies the definition from the original item into a new table, modifies - | it a bit, and registers a new node with a "_locked" suffix such as - | "homedecor:refrigerator_locked". The new node behaves identically to - | the base node, except that moving items to/from the node's inventory - | is only allowed for the original placer. In addition, it register a new - | shapeless recipe for the node, using the base node plus a steel ingot. - | - | Arguments: - | name The base node name - | infotext The infotext description (in case the name is too long). - | - | Example Usage: - | create_locked("homedecor:refrigerator", "Locked Fridge") - | ^ This generates a new "Locked Refrigerator" node, whose infotext is - | "Locked Fridge (owned by )". - | - | Notes: - | If is not specified (or is nil), the infotext will be the - | base node's description prefixed by "Locked ". - | - | The ABM for the locked oven is defined in oven.lua. - ]] -local function create_locked ( name, infotext ) - local def = { } - for k, v in pairs(minetest.registered_nodes[name]) do - def[k] = v - end - def.type = nil - def.name = nil - def.description = S("%s (Locked)"):format(def.description) - local after_place_node = def.after_place_node - def.after_place_node = function(pos, placer) - local meta = minetest.get_meta(pos) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", S("%s (owned by %s)"):format(infotext,meta:get_string("owner"))) - if (after_place_node) then - return after_place_node(pos, placer) - end - end - local allow_metadata_inventory_move = def.allow_metadata_inventory_move; - def.allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) - if (player:get_player_name() ~= meta:get_string("owner")) then - minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( - player:get_player_name(), - infotext, - meta:get_string("owner"), - minetest.pos_to_string(pos) - )) - return 0 - end - if (allow_metadata_inventory_move) then - return allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player) - else - return count - end - end - local allow_metadata_inventory_put = def.allow_metadata_inventory_put; - def.allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) - if (player:get_player_name() ~= meta:get_string("owner")) then - minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( - player:get_player_name(), - infotext, - meta:get_string("owner"), - minetest.pos_to_string(pos) - )) - return 0 - end - if (allow_metadata_inventory_put) then - return allow_metadata_inventory_put(pos, listname, index, stack, player) - else - return stack:get_count() - end - end - local allow_metadata_inventory_take = def.allow_metadata_inventory_take; - def.allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) - if (player:get_player_name() ~= meta:get_string("owner")) then - minetest.log("action", S("%s tried to access a %s belonging to %s at %s"):format( - player:get_player_name(), - infotext, - meta:get_string("owner"), - minetest.pos_to_string(pos) - )) - return 0 - end - if (allow_metadata_inventory_take) then - return allow_metadata_inventory_take(pos, listname, index, stack, player) - else - return stack:get_count() - end - end - minetest.register_node(name.."_locked", def) - minetest.register_craft({ - output = name.."_locked", - type = "shapeless", - recipe = { - name, - "default:steel_ingot", - } - }) -end - -local items = { - { "refrigerator_white_bottom", - "Refrigerator" }, - { "refrigerator_steel_bottom", - "Refrigerator (stainless steel)" }, - { "kitchen_cabinet", - "Cabinet" }, - { "kitchen_cabinet_steel", - "Cabinet (stainless steel top)" }, - { "kitchen_cabinet_granite", - "Cabinet (granite top)" }, - { "kitchen_cabinet_marble", - "Cabinet (marble top)" }, - { "kitchen_cabinet_half", - "Cabinet" }, - { "kitchen_cabinet_with_sink", - "Cabinet" }, - { "nightstand_oak_one_drawer", - "Nightstand" }, - { "nightstand_oak_two_drawers", - "Nightstand" }, - { "nightstand_mahogany_one_drawer", - "Nightstand" }, - { "nightstand_mahogany_two_drawers", - "Nightstand" }, - { "filing_cabinet", - "Filing cabinet" }, - { "oven", - "Oven" }, - { "oven_active", - "Oven (active)" }, - { "oven_steel", - "Oven (stainless steel)" }, - { "oven_steel_active", - "Oven (stainless steel, active)" }, - { "microwave_oven", - "Microwave Oven" }, - { "microwave_oven_active", - "Microwave Oven (active)" }, -} - -for _,item in ipairs(items) do - local name, info = item[1], item[2]; - create_locked("homedecor:"..name, S("Locked "..info)); -end diff --git a/mods/homedecor_modpack/homedecor/misc-electrical.lua b/mods/homedecor_modpack/homedecor/misc-electrical.lua index 9992de4c..a3a0187c 100644 --- a/mods/homedecor_modpack/homedecor/misc-electrical.lua +++ b/mods/homedecor_modpack/homedecor/misc-electrical.lua @@ -1,7 +1,4 @@ -minetest.register_node("homedecor:power_outlet", { - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", +homedecor.register("power_outlet", { description = "Power Outlet", tiles = { "homedecor_outlet_edges.png", @@ -28,10 +25,7 @@ minetest.register_node("homedecor:power_outlet", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node("homedecor:light_switch", { - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", +homedecor.register("light_switch", { description = "Light switch", tiles = { "homedecor_light_switch_edges.png", @@ -60,3 +54,25 @@ minetest.register_node("homedecor:light_switch", { sounds = default.node_sound_stone_defaults() }) + +homedecor.register("doorbell", { + tiles = { "homedecor_doorbell.png" }, + inventory_image = "homedecor_doorbell_inv.png", + description = "Doorbell", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {-0.0625, 0, 0.46875, 0.0625, 0.1875, 0.5}, -- NodeBox1 + {-0.03125, 0.0625, 0.45, 0.03125, 0.125, 0.4675}, -- NodeBox2 + } + }, + on_punch = function(pos, node, puncher, pointed_thing) + minetest.sound_play("homedecor_doorbell", { + pos = pos, + gain = 1.0, + max_hear_distance = 15 + }) + end +}) + diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 1cd5ab4b..a114ef04 100644 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -2,14 +2,13 @@ local S = homedecor.gettext -minetest.register_node('homedecor:ceiling_paint', { +homedecor.register("ceiling_paint", { description = S("Textured Ceiling Paint"), drawtype = 'signlike', tiles = { 'homedecor_ceiling_paint.png' }, inventory_image = 'homedecor_ceiling_paint_roller.png', wield_image = 'homedecor_ceiling_paint_roller.png', sunlight_propagates = true, - paramtype = 'light', walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -21,14 +20,13 @@ minetest.register_node('homedecor:ceiling_paint', { }, }) -minetest.register_node('homedecor:ceiling_tile', { +homedecor.register("ceiling_tile", { description = S("Drop-Ceiling Tile"), drawtype = 'signlike', tiles = { 'homedecor_ceiling_tile.png' }, wield_image = 'homedecor_ceiling_tile.png', inventory_image = 'homedecor_ceiling_tile.png', sunlight_propagates = true, - paramtype = 'light', walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -40,16 +38,14 @@ minetest.register_node('homedecor:ceiling_tile', { }, }) -minetest.register_node('homedecor:rug_small', { +homedecor.register("rug_small", { description = S("Small Throw Rug"), drawtype = 'signlike', tiles = { 'homedecor_rug_small.png' }, wield_image = 'homedecor_rug_small.png', inventory_image = 'homedecor_rug_small.png', sunlight_propagates = true, - paramtype = 'light', paramtype2 = "wallmounted", - is_ground_content = true, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -61,16 +57,14 @@ minetest.register_node('homedecor:rug_small', { }, }) -minetest.register_node('homedecor:rug_large', { +homedecor.register("rug_large", { description = S("Large Area Rug"), drawtype = 'signlike', tiles = { 'homedecor_rug_large.png' }, wield_image = 'homedecor_rug_large.png', inventory_image = 'homedecor_rug_large.png', sunlight_propagates = true, - paramtype = 'light', paramtype2 = "wallmounted", - is_ground_content = true, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -82,55 +76,36 @@ minetest.register_node('homedecor:rug_large', { }, }) -minetest.register_node('homedecor:flower_pot_terracotta', { +homedecor.register("flower_pot_terracotta", { description = S("Terracotta Flower Pot"), - drawtype = "mesh", mesh = "homedecor_flowerpot.obj", tiles = { "homedecor_flower_pot_terracotta.png" }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, + groups = { snappy = 3, potting_soil=1}, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:flower_pot_black', { +homedecor.register("flower_pot_black", { description = S("Black Plastic Flower Pot"), - drawtype = "mesh", mesh = "homedecor_flowerpot.obj", tiles = { "homedecor_flower_pot_black.png" }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, + groups = { snappy = 3, potting_soil=1 }, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:flower_pot_green', { +homedecor.register("flower_pot_green", { description = S("Green Plastic Flower Pot"), - drawtype = "mesh", mesh = "homedecor_flowerpot.obj", tiles = { "homedecor_flower_pot_green.png" }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, + groups = { snappy = 3, potting_soil=1 }, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("homedecor:pole_brass", { +homedecor.register("pole_brass", { description = S("Brass Pole"), - drawtype = "mesh", mesh = "homedecor_round_pole.obj", tiles = {"homedecor_tile_brass2.png"}, inventory_image = "homedecor_pole_brass_inv.png", wield_image = "homedecor_pole_brass_inv.png", - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, selection_box = { type = "fixed", fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 }, @@ -141,18 +116,13 @@ minetest.register_node("homedecor:pole_brass", { }, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, }) - -minetest.register_node("homedecor:pole_wrought_iron", { + +homedecor.register("pole_wrought_iron", { description = S("Wrought Iron Pole"), - drawtype = "nodebox", tiles = {"homedecor_tile_wrought_iron2.png"}, inventory_image = "homedecor_pole_wrought_iron_inv.png", wield_image = "homedecor_pole_wrought_iron_inv.png", - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, selection_box = { type = "fixed", fixed = {-0.0625, -0.5, -0.0625, 0.0625, 0.5, 0.0625} @@ -163,17 +133,13 @@ minetest.register_node("homedecor:pole_wrought_iron", { }, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - walkable = true, }) local welcome_mat_colors = { "green", "brown", "grey" } for _, color in ipairs(welcome_mat_colors) do - minetest.register_node("homedecor:welcome_mat_"..color, { + homedecor.register("welcome_mat_"..color, { description = "Welcome Mat ("..color..")", - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", tiles = { "homedecor_welcome_mat_"..color..".png", "homedecor_welcome_mat_bottom.png", @@ -190,9 +156,7 @@ for _, color in ipairs(welcome_mat_colors) do }) end -minetest.register_node("homedecor:chimney", { - drawtype = "nodebox", - paramtype = "light", +homedecor.register("chimney", { description = "Chimney", tiles = { "homedecor_chimney_top.png", @@ -208,16 +172,12 @@ minetest.register_node("homedecor:chimney", { {0.1875, -0.5, -0.25, 0.25, 0.5, 0.25}, } }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 } - }, + selection_box = homedecor.nodebox.bar_y(0.25), groups = {cracky=3}, sounds = default.node_sound_stone_defaults() }) -minetest.register_node("homedecor:fishtank", { - drawtype = "nodebox", +homedecor.register("fishtank", { description = "Fishtank", tiles = { "homedecor_fishtank_top.png", @@ -227,8 +187,6 @@ minetest.register_node("homedecor:fishtank", { "homedecor_fishtank_back.png", "homedecor_fishtank_front.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -254,8 +212,7 @@ minetest.register_node("homedecor:fishtank", { end }) -minetest.register_node("homedecor:fishtank_lighted", { - drawtype = "nodebox", +homedecor.register("fishtank_lighted", { description = "Fishtank", tiles = { "homedecor_fishtank_top.png", @@ -265,9 +222,7 @@ minetest.register_node("homedecor:fishtank_lighted", { "homedecor_fishtank_back_lighted.png", "homedecor_fishtank_front_lighted.png" }, - paramtype = "light", light_source = LIGHT_MAX-4, - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -293,79 +248,44 @@ minetest.register_node("homedecor:fishtank_lighted", { end }) -minetest.register_node('homedecor:cardboard_box', { - drawtype = "nodebox", +homedecor.register("cardboard_box_big", { + description = S("Cardboard box (big)"), + tiles = { + 'homedecor_cardbox_big_tb.png', + 'homedecor_cardbox_big_tb.png', + 'homedecor_cardbox_big_sides.png', + }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Cardboard box"), + inventory = { + size=24, + }, +}) + +homedecor.register("cardboard_box", { description = S("Cardboard box"), tiles = { - 'homedecor_cardboard_box_tb.png', - 'homedecor_cardboard_box_tb.png', - 'homedecor_cardboard_box_sides.png' + 'homedecor_cardbox_tb.png', + 'homedecor_cardbox_tb.png', + 'homedecor_cardbox_sides.png', }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 } - }, node_box = { type = "fixed", fixed = { - {0.1875, -0.5, -0.25, 0.25, 0, 0.25}, - {-0.25, -0.5, -0.25, -0.1875, 0, 0.25}, - {-0.25, -0.5, 0.1875, 0.25, 0, 0.25}, - {-0.25, -0.5, -0.25, 0.25, 0, -0.1875}, - {-0.25, -0.5, -0.25, 0.25, -0.4375, 0.25}, - {0.1875, -0.0625, -0.25, 0.5, 0, 0.25}, - {-0.5, -0.0625, -0.25, -0.1875, 0, 0.25}, - {-0.25, -0.0625, 0.1875, 0.25, 0, 0.5}, - {-0.25, -0.0625, -0.5, 0.25, 0, -0.1875}, + {-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}, } }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,6]".. - "list[current_name;main;2,0;4,1;]".. - "list[current_player;main;0,2;8,4;]") - meta:set_string("infotext", S("Cardboard box")) - local inv = meta:get_inventory() - inv:set_size("main", 8) - 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 cardboard box at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to cardboard box at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from cardboard box at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("Cardboard box"), + inventory = { + size=8, + }, }) -minetest.register_node("homedecor:dvd_cd_cabinet", { +homedecor.register("dvd_cd_cabinet", { description = "DVD/CD cabinet", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", tiles = { "homedecor_dvdcd_cabinet_top.png", "homedecor_dvdcd_cabinet_top.png", @@ -387,16 +307,12 @@ minetest.register_node("homedecor:dvd_cd_cabinet", { {0.125, -0.5, 0.01217, 0.375, 0.5, 0.5}, } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 } - }, + selection_box = homedecor.nodebox.slab_z(0.5), groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3}, sounds = default.node_sound_wood_defaults(), }) -minetest.register_node('homedecor:filing_cabinet', { - drawtype = "nodebox", +homedecor.register("filing_cabinet", { description = S("Filing Cabinet"), tiles = { 'forniture_wood.png', @@ -406,14 +322,7 @@ minetest.register_node('homedecor:filing_cabinet', { 'forniture_wood.png', 'homedecor_filing_cabinet_front.png' }, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, + selection_box = { type = "regular" }, node_box = { type = "fixed", fixed = { @@ -423,131 +332,13 @@ minetest.register_node('homedecor:filing_cabinet', { }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;0,0;8,2;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Filing cabinet")) - local inv = meta:get_inventory() - inv:set_size("main", 16) - 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 filing cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to filing cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from filing cabinet at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("Filing cabinet"), + inventory = { + size=16, + }, }) -minetest.register_node("homedecor:dishwasher", { - description = "Dishwasher", - drawtype = "nodebox", - tiles = { - "homedecor_dishwasher_top.png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}, - {-0.5, -0.5, -0.5, 0.5, 0.5, -0.4375}, - {-0.5, -0.5, -0.5, 0.5, 0.1875, 0.1875}, - {-0.4375, -0.5, -0.5, 0.4375, 0.4375, 0.4375}, - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, - groups = { snappy = 3 }, -}) - -minetest.register_node("homedecor:dishwasher_wood", { - description = "Dishwasher", - tiles = { - "homedecor_kitchen_cabinet_top.png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, -}) - -minetest.register_node("homedecor:dishwasher_steel", { - description = "Dishwasher", - tiles = { - "homedecor_kitchen_cabinet_top_steel.png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, -}) - -minetest.register_node("homedecor:dishwasher_marble", { - description = "Dishwasher", - tiles = { - "homedecor_kitchen_cabinet_top_marble.png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, -}) - -minetest.register_node("homedecor:dishwasher_granite", { - description = "Dishwasher", - tiles = { - "homedecor_kitchen_cabinet_top_granite.png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, -}) - -minetest.register_node("homedecor:doghouse_base", { +homedecor.register("doghouse_base", { tiles = { "homedecor_doghouse_base_top.png", "homedecor_doghouse_base_bottom.png", @@ -558,9 +349,6 @@ minetest.register_node("homedecor:doghouse_base", { }, description = "Doghouse", inventory_image = "homedecor_doghouse_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -577,24 +365,12 @@ minetest.register_node("homedecor:doghouse_base", { {-0.4375, -0.3125, 0.375, 0.4375, 0.5, 0.4375}, -- NodeBox11 } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.0, 0.5 } - }, + selection_box = homedecor.nodebox.slab_y(1.5), groups = {snappy=3}, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:doghouse_base", "homedecor:doghouse_roof") - 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:doghouse_roof" then - minetest.remove_node(pos2) - end - end + expand = { top="homedecor:doghouse_roof" }, }) -minetest.register_node("homedecor:doghouse_roof", { +homedecor.register("doghouse_roof", { tiles = { "homedecor_doghouse_roof_top.png", "homedecor_doghouse_roof_bottom.png", @@ -603,9 +379,6 @@ minetest.register_node("homedecor:doghouse_roof", { "homedecor_doghouse_roof_front.png", "homedecor_doghouse_roof_front.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -633,14 +406,11 @@ minetest.register_node("homedecor:doghouse_roof", { {0.0625, -0.125, -0.375, -0.0625, -0.0625, 0.4375}, -- NodeBox38 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, groups = {snappy=3, not_in_creative_inventory=1}, }) -minetest.register_node("homedecor:pool_table", { +homedecor.register("pool_table", { tiles = { "homedecor_pool_table_top1.png", "homedecor_pool_table_bottom1.png", @@ -651,9 +421,6 @@ minetest.register_node("homedecor:pool_table", { }, description = "Pool Table", inventory_image = "homedecor_pool_table_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -687,21 +454,10 @@ minetest.register_node("homedecor:pool_table", { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.3125, 1.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:pool_table", "homedecor:pool_table_2", false) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:pool_table_2" then - minetest.remove_node(pos2) - end - end + expand = { forward="homedecor:pool_table_2" }, }) -minetest.register_node("homedecor:pool_table_2", { +homedecor.register("pool_table_2", { tiles = { "homedecor_pool_table_top1.png^[transformR180", "homedecor_pool_table_bottom1.png", @@ -710,9 +466,6 @@ minetest.register_node("homedecor:pool_table_2", { "homedecor_pool_table_end1.png", "homedecor_pool_table_end1.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3, not_in_creative_inventory=1}, node_box = { type = "fixed", @@ -742,13 +495,10 @@ minetest.register_node("homedecor:pool_table_2", { {0.375, 0.25, -0.4375, 0.4375, 0.3125, 0.3125}, -- NodeBox25 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -minetest.register_node("homedecor:trash_can", { +homedecor.register("trash_can", { tiles = { "homedecor_trashcan_tb.png", "homedecor_trashcan_tb.png", @@ -759,9 +509,6 @@ minetest.register_node("homedecor:trash_can", { }, inventory_image = "homedecor_trashcan_inv.png", description = "Trash Can", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -783,17 +530,14 @@ minetest.register_node("homedecor:trash_can", { } }) -minetest.register_node("homedecor:well_base", { +homedecor.register("well_base", { tiles = { "homedecor_well_base_top.png", "default_cobble.png" }, inventory_image = "homedecor_well_inv.png", description = "Water well", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy = 3 }, + groups = { snappy = 3 }, node_box = { type = "fixed", fixed = { @@ -816,23 +560,11 @@ minetest.register_node("homedecor:well_base", { {-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}, -- NodeBox17 } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } - }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:well_base", "homedecor:well_top") - 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:well_top" then - minetest.remove_node(pos2) - end - end + selection_box = homedecor.nodebox.slab_y(2), + expand = { top="homedecor:well_top" }, }) -minetest.register_node("homedecor:well_top", { +homedecor.register("well_top", { tiles = { "homedecor_well_roof_top.png", "homedecor_well_roof_wood.png", @@ -841,9 +573,6 @@ minetest.register_node("homedecor:well_top", { "homedecor_well_roof_side2.png", "homedecor_well_roof_side1.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", @@ -893,19 +622,13 @@ minetest.register_node("homedecor:well_top", { {-0.0165975, -0.51, -0.125, 0.0165974, -0.46, -0.112033}, -- NodeBox43 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, + selection_box = homedecor.nodebox.null, }) -minetest.register_node("homedecor:coatrack_wallmount", { +homedecor.register("coatrack_wallmount", { tiles = { "forniture_wood.png" }, inventory_image = "homedecor_coatrack_wallmount_inv.png", description = "Coatrack (wallmounted)", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -923,13 +646,10 @@ minetest.register_node("homedecor:coatrack_wallmount", { }, }) -minetest.register_node("homedecor:coat_tree", { +homedecor.register("coat_tree", { tiles = { "forniture_wood.png" }, inventory_image = "homedecor_coatrack_inv.png", description = "Coat tree", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -947,57 +667,7 @@ minetest.register_node("homedecor:coat_tree", { }, }) -minetest.register_node("homedecor:doorbell", { - tiles = { "homedecor_doorbell.png" }, - inventory_image = "homedecor_doorbell_inv.png", - description = "Doorbell", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.0625, 0, 0.46875, 0.0625, 0.1875, 0.5}, -- NodeBox1 - {-0.03125, 0.0625, 0.45, 0.03125, 0.125, 0.4675}, -- NodeBox2 - } - }, - on_punch = function(pos, node, puncher, pointed_thing) - minetest.sound_play("homedecor_doorbell", { - pos = pos, - gain = 1.0, - max_hear_distance = 15 - }) - end -}) - -minetest.register_node("homedecor:kitchen_faucet", { - tiles = { "homedecor_bright_metal.png" }, - inventory_image = "homedecor_kitchen_faucet_inv.png", - description = "Kitchen Faucet", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {0, -0.5, 0.375, 0.0625, -0.1875, 0.4375}, -- NodeBox1 - {0, -0.1875, 0.35, 0.0625, -0.15, 0.4375}, -- NodeBox2 - {0, -0.15, 0.32, 0.0625, -0.11, 0.41}, -- NodeBox3 - {0.007, -0.12, 0.17, 0.055, -0.11, 0.1285}, -- NodeBox4 - {0, -0.11, 0.125, 0.0625, -0.07, 0.37}, -- NodeBox5 - {-0.05, -0.48, 0.385, 0.115, -0.455, 0.43}, -- NodeBox6 - {-0.05, -0.49, 0.395, 0.115, -0.445, 0.42}, -- NodeBox7 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.055, -0.5, 0.125, 0.12, -0.065, 0.4375 } - }, -}) - -minetest.register_node("homedecor:cutlery_set", { +homedecor.register("cutlery_set", { tiles = { "homedecor_cutlery_set_top.png", "homedecor_cutlery_set_sides.png", @@ -1005,9 +675,6 @@ minetest.register_node("homedecor:cutlery_set", { }, inventory_image = "homedecor_cutlery_set_inv.png", description = "Cutlery set", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = {snappy=3}, node_box = { type = "fixed", @@ -1050,28 +717,22 @@ local bottle_cbox = { } } -minetest.register_node("homedecor:bottle_brown", { +homedecor.register("bottle_brown", { tiles = { "homedecor_bottle_brown.png" }, inventory_image = "homedecor_bottle_brown_inv.png", description = "Brown bottle", - drawtype = "mesh", mesh = "homedecor_bottle.obj", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = {snappy=3}, collision_box = bottle_cbox, selection_box = bottle_cbox }) -minetest.register_node("homedecor:bottle_green", { +homedecor.register("bottle_green", { tiles = { "homedecor_bottle_green.png" }, inventory_image = "homedecor_bottle_green_inv.png", description = "Green bottle", - drawtype = "mesh", mesh = "homedecor_bottle.obj", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = {snappy=3}, collision_box = bottle_cbox, @@ -1087,134 +748,45 @@ local fbottle_cbox = { } } -minetest.register_node("homedecor:4_bottles_brown", { +homedecor.register("4_bottles_brown", { tiles = { "homedecor_bottle_brown.png" }, inventory_image = "homedecor_4_bottles_brown_inv.png", description = "Four brown bottles", - drawtype = "mesh", mesh = "homedecor_4_bottles.obj", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = {snappy=3}, collision_box = fbottle_cbox, selection_box = fbottle_cbox }) -minetest.register_node("homedecor:4_bottles_green", { +homedecor.register("4_bottles_green", { tiles = { "homedecor_bottle_green.png" }, inventory_image = "homedecor_4_bottles_green_inv.png", description = "Four green bottles", - drawtype = "mesh", mesh = "homedecor_4_bottles.obj", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = {snappy=3}, collision_box = fbottle_cbox, selection_box = fbottle_cbox }) -minetest.register_node("homedecor:4_bottles_multi", { +homedecor.register("4_bottles_multi", { tiles = { "homedecor_4_bottles_multi.png" }, inventory_image = "homedecor_4_bottles_multi_inv.png", description = "Four misc brown/green bottles", - drawtype = "mesh", mesh = "homedecor_4_bottles_multi.obj", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = {snappy=3}, collision_box = fbottle_cbox, selection_box = fbottle_cbox }) -minetest.register_node("homedecor:coffee_maker", { - tiles = { - "homedecor_coffeemaker_top.png", - "homedecor_coffeemaker_bottom.png", - "homedecor_coffeemaker_right.png", - "homedecor_coffeemaker_right.png^[transformFX", - "homedecor_coffeemaker_back.png", - "homedecor_coffeemaker_front.png" - }, - description = "Coffee Maker", - inventory_image = "homedecor_coffeemaker_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {0.0625, -0.5, -0.025, 0.375, -0.375, 0.5}, -- NodeBox1 - {0.0625, -0.375, 0.3125, 0.375, 0, 0.5}, -- NodeBox2 - {0.0625, -0.052, 0.02, 0.375, 0.19, 0.5}, -- NodeBox3 - {0.078, -0.375, 0, 0.36, -0.0625, 0.3125}, -- NodeBox4 - {0.1875, -0.098, -0.0525, 0.25, -0.078, 0}, -- NodeBox5 - {0.1875, -0.36, -0.090, 0.25, -0.078, -0.0525}, -- NodeBox6 - {0.1875, -0.36, -0.0525, 0.25, -0.34, 0}, -- NodeBox7 - {-0.1875, -0.5, -0.3125, -0.1, -0.4, -0.225}, -- NodeBox8 - {-0.1975, -0.5, -0.3225, -0.1, -0.375, -0.3125}, -- NodeBox9 - {-0.1975, -0.5, -0.235, -0.1, -0.375, -0.225}, -- NodeBox10 - {-0.1975, -0.5, -0.3225, -0.1875, -0.375, -0.225}, -- NodeBox11 - {-0.11, -0.5, -0.3225, -0.1, -0.375, -0.225}, -- NodeBox12 - {-0.1, -0.485, -0.2838, -0.06, -0.475, -0.2638}, -- NodeBox13 - {-0.1, -0.4, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox14 - {-0.075, -0.485, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox15 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.22, -0.5, -0.35, 0.4, 0.21, 0.5 } - } -}) - -local fdir_to_steampos = { - x = { 0.15, 0.275, -0.15, -0.275 }, - z = { 0.275, -0.15, -0.275, 0.15 } -} - -minetest.register_abm({ - nodenames = "homedecor:coffee_maker", - interval = 2, - chance = 1, - action = function(pos, node) - local fdir = node.param2 - if fdir and fdir < 4 then - - local steamx = fdir_to_steampos.x[fdir + 1] - local steamz = fdir_to_steampos.z[fdir + 1] - - minetest.add_particlespawner({ - amount = 1, - time = 1, - minpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz}, - maxpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz}, - minvel = {x=-0.003, y=0.01, z=-0.003}, - maxvel = {x=0.003, y=0.01, z=-0.003}, - minacc = {x=0.0,y=-0.0,z=-0.0}, - maxacc = {x=0.0,y=0.003,z=-0.0}, - minexptime = 2, - maxexptime = 5, - minsize = 1, - maxsize = 1.2, - collisiondetection = false, - texture = "homedecor_steam.png", - }) - end - end -}) - -minetest.register_node("homedecor:dartboard", { +homedecor.register("dartboard", { description = "Dartboard", - drawtype = "mesh", mesh = "homedecor_dartboard.obj", tiles = { "homedecor_dartboard.png" }, inventory_image = "homedecor_dartboard_inv.png", wield_image = "homedecor_dartboard_inv.png", - paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, walkable = false, @@ -1226,7 +798,7 @@ minetest.register_node("homedecor:dartboard", { sounds = default.node_sound_defaults(), }) -minetest.register_node("homedecor:piano_left", { +homedecor.register("piano_left", { tiles = { "homedecor_piano_top_left.png", "homedecor_piano_sides.png", @@ -1237,9 +809,6 @@ minetest.register_node("homedecor:piano_left", { }, inventory_image = "homedecor_piano_inv.png", description = "Piano", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", @@ -1258,21 +827,10 @@ minetest.register_node("homedecor:piano_left", { type = "fixed", fixed = { -0.5, -0.5, -0.125, 1.5, 0.5, 0.5 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:piano_left", "homedecor:piano_right", true) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:piano_right" then - minetest.remove_node(pos2) - end - end + expand = { right="homedecor:piano_right" }, }) -minetest.register_node("homedecor:piano_right", { +homedecor.register("piano_right", { tiles = { "homedecor_piano_top_right.png", "homedecor_piano_sides.png", @@ -1281,9 +839,6 @@ minetest.register_node("homedecor:piano_right", { "homedecor_piano_sides.png", "homedecor_piano_front_right.png", }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -1299,72 +854,7 @@ minetest.register_node("homedecor:piano_right", { } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } -}) - -minetest.register_node("homedecor:toaster", { - description = "Toaster", - tiles = { - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png" - }, - inventory_image = "homedecor_toaster_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - groups = { snappy=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1 - }, - }, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir }) - minetest.sound_play("toaster", { - pos = pos, - gain = 1.0, - max_hear_distance = 5 - }) - end -}) - -minetest.register_node("homedecor:toaster_loaf", { - tiles = { - "homedecor_toaster_toploaf.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - groups = { snappy=3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1 - {-0.03125, -0.3125, -0.0935, 0, -0.25, 0.0935}, -- NodeBox2 - {0.0625, -0.3125, -0.0935, 0.0935, -0.25, 0.0935}, -- NodeBox3 - }, - }, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) - end, - drop = "homedecor:toaster" + selection_box = homedecor.nodebox.null }) -- convert old pool tables into newer model @@ -1380,15 +870,12 @@ minetest.register_abm({ end }) -minetest.register_node("homedecor:trophy", { +homedecor.register("trophy", { description = "Trophy", tiles = { "default_gold_block.png" }, inventory_image = "homedecor_trophy_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1416,19 +903,16 @@ minetest.register_node("homedecor:trophy", { } }) -minetest.register_node("homedecor:sportbench", { +homedecor.register("sportbench", { description = "Sport bench", tiles = { "homedecor_sportbench_top.png", "wool_black.png", - "homedecor_sportbench_left.png^[transformFX", + "homedecor_sportbench_left.png^[transformFX", "homedecor_sportbench_left.png", "homedecor_sportbench_bottom.png", "homedecor_sportbench_front.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1452,7 +936,7 @@ minetest.register_node("homedecor:sportbench", { } }) -minetest.register_node("homedecor:skateboard", { +homedecor.register("skateboard", { description = "Skateboard", tiles = { "homedecor_skateboard_top.png", @@ -1460,9 +944,6 @@ minetest.register_node("homedecor:skateboard", { "homedecor_skateboard_sides.png" }, inventory_image = "homedecor_skateboard_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1483,68 +964,12 @@ minetest.register_node("homedecor:skateboard", { on_place = minetest.rotate_node }) -minetest.register_node("homedecor:copper_pans", { - description = "Copper pans", - tiles = { - "homedecor_polished_copper.png" - }, - inventory_image = "homedecor_copper_pans_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy=3 }, - node_box = { - type = "fixed", - fixed = { - {-0.375, -0.5, -0.1875, -0.0625, -0.48, 0.125}, -- NodeBox1 - {-0.375, -0.48, -0.1875, -0.36, -0.3125, 0.125}, -- NodeBox2 - {-0.0775, -0.48, -0.1875, -0.0625, -0.3125, 0.125}, -- NodeBox3 - {-0.375, -0.48, 0.11, -0.0625, -0.3125, 0.125}, -- NodeBox4 - {-0.375, -0.48, -0.1875, -0.0625, -0.3125, -0.1725}, -- NodeBox5 - {-0.25, -0.36, -0.5, -0.1875, -0.33, -0.1875}, -- NodeBox6 - {0.0625, -0.5, 0, 0.375, -0.48, 0.3125}, -- NodeBox7 - {0.0625, -0.48, 0, 0.0775, -0.3125, 0.3125}, -- NodeBox8 - {0.36, -0.48, 0, 0.375, -0.3125, 0.3125}, -- NodeBox9 - {0.0625, -0.48, 0, 0.375, -0.3125, 0.0175}, -- NodeBox10 - {0.0625, -0.48, 0.295, 0.375, -0.3125, 0.3125}, -- NodeBox11 - {0.1875, -0.36, -0.3125, 0.25, -0.33, 0}, -- NodeBox12 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 } - }, - on_place = minetest.rotate_node -}) - -minetest.register_node("homedecor:paper_towel", { - drawtype = "mesh", - mesh = "homedecor_paper_towel.obj", - tiles = { "homedecor_paper_towel.png" }, - inventory_image = "homedecor_paper_towel_inv.png", - description = "Paper towels", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy=3 }, - selection_box = { - type = "fixed", - fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } - }, - collision_box = { - type = "fixed", - fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } - } -}) - -minetest.register_node("homedecor:stonepath", { +homedecor.register("stonepath", { description = "Garden stone path", tiles = { "default_stone.png" }, inventory_image = "homedecor_stonepath_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1565,16 +990,13 @@ minetest.register_node("homedecor:stonepath", { } }) -minetest.register_node("homedecor:barbecue", { +homedecor.register("barbecue", { description = "Barbecue", tiles = { {name="homedecor_barbecue_top.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}}, "forniture_black_metal.png", }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, light_source = 9, node_box = { @@ -1602,25 +1024,13 @@ minetest.register_node("homedecor:barbecue", { type = "fixed", fixed = { -0.5, -0.5, -0.3125, 0.5, 0.625, 0.3125 } }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:barbecue", "homedecor:barbecue_meat") - 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:barbecue_meat" then - minetest.remove_node(pos2) - end - end + expand = { top="homedecor:barbecue_meat" }, }) -minetest.register_node("homedecor:barbecue_meat", { +homedecor.register("barbecue_meat", { tiles = { "homedecor_barbecue_meat.png", }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -1629,13 +1039,10 @@ minetest.register_node("homedecor:barbecue_meat", { {0.125, -0.5, -0.125, 0.3125, -0.4375, 0.125}, -- NodeBox2 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } + selection_box = homedecor.nodebox.null }) -minetest.register_node("homedecor:beer_tap", { +homedecor.register("beer_tap", { description = "Beer tap", tiles = { "homedecor_beertap_front.png", @@ -1646,9 +1053,6 @@ minetest.register_node("homedecor:beer_tap", { "homedecor_beertap_front.png" }, inventory_image = "homedecor_beertap_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1673,7 +1077,7 @@ minetest.register_node("homedecor:beer_tap", { local inv = puncher:get_inventory() local wieldname = wielditem:get_name() - if wieldname == "vessels:drinking_glass" then + if wieldname == "vessels:drinking_glass" then if inv:room_for_item("main", "homedecor:beer_mug 1") then wielditem:take_item() puncher:set_wielded_item(wielditem) @@ -1686,7 +1090,7 @@ minetest.register_node("homedecor:beer_tap", { end }) -minetest.register_node("homedecor:beer_mug", { +homedecor.register("beer_mug", { description = "Beer mug", tiles = { "homedecor_beer_top.png", @@ -1698,9 +1102,6 @@ minetest.register_node("homedecor:beer_mug", { }, inventory_image = "homedecor_beer_inv.png", use_texture_alpha = true, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3, oddly_breakable_by_hand=3 }, sounds = default.node_sound_glass_defaults(), node_box = { @@ -1718,20 +1119,17 @@ minetest.register_node("homedecor:beer_mug", { } }) -minetest.register_node("homedecor:tool_cabinet_bottom", { +homedecor.register("tool_cabinet_bottom", { description = "Metal tool cabinet and work table", 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_sides.png", "homedecor_tool_cabinet_bottom_front.png" }, inventory_image = "homedecor_tool_cabinet_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3 }, node_box = { type = "fixed", @@ -1743,23 +1141,11 @@ minetest.register_node("homedecor:tool_cabinet_bottom", { {-0.5, -0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox5 } }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } - }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_vertically(itemstack, placer, pointed_thing, - "homedecor:tool_cabinet_bottom", "homedecor:tool_cabinet_top") - 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:tool_cabinet_top" then - minetest.remove_node(pos2) - end - end + selection_box = homedecor.nodebox.slab_y(2), + expand = { top="homedecor:tool_cabinet_top" }, }) -minetest.register_node("homedecor:tool_cabinet_top", { +homedecor.register("tool_cabinet_top", { tiles = { "homedecor_tool_cabinet_top_top.png", "homedecor_tool_cabinet_top_bottom.png", @@ -1768,9 +1154,6 @@ minetest.register_node("homedecor:tool_cabinet_top", { "homedecor_tool_cabinet_top_back.png", "homedecor_tool_cabinet_top_front.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -1792,13 +1175,10 @@ minetest.register_node("homedecor:tool_cabinet_top", { {0.375, -0.155, 0.42, 0.405, -0.093, 0.4375}, -- NodeBox15 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } + selection_box = homedecor.nodebox.null }) -minetest.register_node("homedecor:swing", { +homedecor.register("swing", { description = "Tree's swing", tiles = { "homedecor_swing_top.png", @@ -1806,9 +1186,6 @@ minetest.register_node("homedecor:swing", { "homedecor_swing_top.png" }, inventory_image = "homedecor_swing_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3, oddly_breakable_by_hand=3 }, node_box = { type = "fixed", @@ -1873,13 +1250,10 @@ minetest.register_node("homedecor:swing", { end }) -minetest.register_node("homedecor:swing_rope", { +homedecor.register("swing_rope", { tiles = { "homedecor_swingrope_sides.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -1888,50 +1262,119 @@ minetest.register_node("homedecor:swing_rope", { {0.3, -0.5, 0.025, 0.3125, 0.5, 0.0375}, -- NodeBox2 } }, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - } + selection_box = homedecor.nodebox.null }) local bookcolors = { "red", "green", - "blue" + "blue", + "violet", + "grey", + "brown" } +local BOOK_FORMNAME = "homedecor:book_form" + for c in ipairs(bookcolors) do local color = bookcolors[c] local color_d = S(bookcolors[c]) -minetest.register_node("homedecor:book_"..color, { + local function book_dig(pos, node, digger) + if minetest.is_protected(pos, digger:get_player_name()) then return end + local meta = minetest.get_meta(pos) + local stack = ItemStack({ + name = "homedecor:book_"..color, + metadata = meta:get_string("text"), + }) + stack = digger:get_inventory():add_item("main", stack) + if not stack:is_empty() then + minetest.item_drop(stack, digger, pos) + end + minetest.remove_node(pos) + end + +homedecor.register("book_"..color, { description = S("Book (%s)"):format(color_d), tiles = { "homedecor_book_"..color.."_top.png", "homedecor_book_"..color.."_bottom.png", - "homedecor_book_right.png", + "homedecor_book_open_sides.png", "homedecor_book_"..color.."_bottom.png", - "homedecor_book_back.png", - "homedecor_book_back.png^[transformFX" + "homedecor_book_open_sides.png", + "homedecor_book_open_sides.png" }, inventory_image = "homedecor_book_"..color.."_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = { snappy=3, oddly_breakable_by_hand=3 }, + wield_image = "homedecor_book_"..color.."_inv.png", + groups = { snappy=3, oddly_breakable_by_hand=3, book=1 }, + stack_max = 1, node_box = { type = "fixed", fixed = { - {0, -0.5, -0.375, 0.3125, -0.4375, 0.0625}, -- NodeBox1 + {0, -0.5, -0.375, 0.3125, -0.4375, 0.0625}, } }, - on_punch = function(pos, node, puncher, pointed_thing) + on_rightclick = function(pos, node, clicker) local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) + minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) + end, + on_place = function(itemstack, placer, pointed_thing) + local plname = placer:get_player_name() + local pos = pointed_thing.under + local node = minetest.get_node(pos) + local n = minetest.registered_nodes[node.name] + if not n.buildable_to then + pos = pointed_thing.above + node = minetest.get_node(pos) + n = minetest.registered_nodes[node.name] + if not n.buildable_to then return end + end + if minetest.is_protected(pos, plname) then return end + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + minetest.set_node(pos, { + name = "homedecor:book_"..color, + param2 = fdir, + }) + local text = itemstack:get_metadata() or "" + local meta = minetest.get_meta(pos) + meta:set_string("text", text) + local data = minetest.deserialize(text) or {} + if data.title and data.title ~= "" then + meta:set_string("infotext", data.title) + end + if not minetest.setting_getbool("creative_mode") then + itemstack:take_item() + end + return itemstack + end, + on_dig = book_dig, + on_use = function(itemstack, user, pointed_thing) + local player_name = user:get_player_name() + local data = minetest.deserialize(itemstack:get_metadata()) + local title, text, owner = "", "", player_name + if data then + title, text, owner = data.title, data.text, data.owner + end + local formspec + if owner == player_name then + formspec = "size[8,8]"..default.gui_bg..default.gui_bg_img.. + "field[0.5,1;7.5,0;title;Book title :;".. + minetest.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;text;Book content :;".. + minetest.formspec_escape(text).."]".. + "button_exit[2.5,7.5;3,1;save;Save]" + else + formspec = "size[8,8]"..default.gui_bg.. + "button_exit[7,0.25;1,0.5;close;x]".. + default.gui_bg_img.. + "label[1,0.5;"..minetest.formspec_escape(title).."]".. + "label[0.5,1.5;"..minetest.formspec_escape(text).."]" + end + minetest.show_formspec(user:get_player_name(), BOOK_FORMNAME, formspec) end, }) -minetest.register_node("homedecor:book_open_"..color, { +homedecor.register("book_open_"..color, { tiles = { "homedecor_book_open_top.png", "homedecor_book_open_"..color.."_bottom.png", @@ -1940,9 +1383,6 @@ minetest.register_node("homedecor:book_open_"..color, { "homedecor_book_open_sides.png", "homedecor_book_open_sides.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -1951,21 +1391,36 @@ minetest.register_node("homedecor:book_open_"..color, { } }, drop = "homedecor:book_"..color, - on_punch = function(pos, node, puncher, pointed_thing) + on_dig = book_dig, + on_rightclick = function(pos, node, clicker) local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) + minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) end, }) end -minetest.register_node("homedecor:calendar", { +minetest.register_on_player_receive_fields(function(player, form_name, fields) + if form_name ~= BOOK_FORMNAME or not fields.save then + return + end + local stack = player:get_wielded_item() + if minetest.get_item_group(stack:get_name(), "book") == 0 then + return + end + local data = minetest.deserialize(stack:get_metadata()) or {} + data.title, data.text, data.owner = + fields.title, fields.text, player:get_player_name() + stack:set_metadata(minetest.serialize(data)) + player:set_wielded_item(stack) +end) + +homedecor.register("calendar", { description = "Calendar", drawtype = "signlike", tiles = {"homedecor_calendar.png"}, inventory_image = "homedecor_calendar.png", wield_image = "homedecor_calendar.png", - paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, walkable = false, @@ -1982,33 +1437,23 @@ local globe_cbox = { fixed = { -0.4, -0.5, -0.3, 0.3, 0.3, 0.3 } } -minetest.register_node("homedecor:desk_globe", { +homedecor.register("desk_globe", { description = "Desk globe", - drawtype = "mesh", mesh = "homedecor_desk_globe.obj", tiles = {"homedecor_desk_globe.png"}, inventory_image = "homedecor_desk_globe_inv.png", - paramtype = "light", - paramtype2 = "facedir", selection_box = globe_cbox, collision_box = globe_cbox, groups = {choppy=2}, sounds = default.node_sound_defaults(), }) -local wine_cbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.25, 0.5, 0.5, 0.5 } -} - -minetest.register_node("homedecor:wine_rack", { +local wine_cbox = homedecor.nodebox.slab_z(0.25) +homedecor.register("wine_rack", { description = "Wine Rack", - drawtype = "mesh", mesh = "homedecor_wine_rack.obj", tiles = {"homedecor_wine_rack.png"}, inventory_image = "homedecor_wine_rack_inv.png", - paramtype = "light", - paramtype2 = "facedir", groups = {choppy=2}, selection_box = wine_cbox, collision_box = wine_cbox, diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png index 84f8e413..0ca6cad2 100644 Binary files a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png and b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png differ diff --git a/mods/homedecor_modpack/homedecor/nightstands.lua b/mods/homedecor_modpack/homedecor/nightstands.lua index 96fba084..b99e7706 100644 --- a/mods/homedecor_modpack/homedecor/nightstands.lua +++ b/mods/homedecor_modpack/homedecor/nightstands.lua @@ -2,8 +2,7 @@ local S = homedecor.gettext -minetest.register_node('homedecor:nightstand_oak_one_drawer', { - drawtype = "nodebox", +homedecor.register("nightstand_oak_one_drawer", { description = S("Oak Nightstand with One Drawer"), tiles = { 'homedecor_nightstand_oak_top.png', 'homedecor_nightstand_oak_bottom.png', @@ -11,16 +10,9 @@ minetest.register_node('homedecor:nightstand_oak_one_drawer', { 'homedecor_nightstand_oak_left.png', 'homedecor_nightstand_oak_back.png', 'homedecor_nightstand_oak_1_drawer_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + selection_box = { type = "regular" }, + node_box = { + type = "fixed", fixed = { { -8/16, 0, -30/64, 8/16, 8/16, 8/16 }, -- top half { -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face @@ -29,47 +21,16 @@ minetest.register_node('homedecor:nightstand_oak_one_drawer', { { -8/16, -8/16, 7/16, 8/16, 0, 8/16 }, -- back { -8/16, -8/16, -30/64, 8/16, -7/16, 8/16 } -- bottom } - }, + }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,6]".. - "list[current_name;main;0,0;8,1;]".. - "list[current_player;main;0,2;8,4;]") - meta:set_string("infotext", S("One-drawer Nightstand")) - local inv = meta:get_inventory() - inv:set_size("main", 8) - 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 nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("One-drawer Nightstand"), + inventory = { + size=8, + }, }) -minetest.register_node('homedecor:nightstand_oak_two_drawers', { - drawtype = "nodebox", +homedecor.register("nightstand_oak_two_drawers", { description = S("Oak Nightstand with Two Drawers"), tiles = { 'homedecor_nightstand_oak_top.png', 'homedecor_nightstand_oak_bottom.png', @@ -77,62 +38,25 @@ minetest.register_node('homedecor:nightstand_oak_two_drawers', { 'homedecor_nightstand_oak_left.png', 'homedecor_nightstand_oak_back.png', 'homedecor_nightstand_oak_2_drawer_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + selection_box = { type = "regular" }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, -30/64, 8/16, 8/16, 8/16 }, -- main body { -7/16, 1/16, -32/64, 7/16, 7/16, -29/64 }, -- top drawer face { -7/16, -7/16, -32/64, 7/16, -1/16, -29/64 }, -- bottom drawer face } - }, + }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;0,0;8,2;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Two-drawer Nightstand")) - local inv = meta:get_inventory() - inv:set_size("main", 16) - 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 nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("Two-drawer Nightstand"), + inventory = { + size=16, + }, }) -minetest.register_node('homedecor:nightstand_mahogany_one_drawer', { - drawtype = "nodebox", +homedecor.register("nightstand_mahogany_one_drawer", { description = S("Mahogany Nightstand with One Drawer"), tiles = { 'homedecor_nightstand_mahogany_top.png', 'homedecor_nightstand_mahogany_bottom.png', @@ -140,16 +64,9 @@ minetest.register_node('homedecor:nightstand_mahogany_one_drawer', { 'homedecor_nightstand_mahogany_left.png', 'homedecor_nightstand_mahogany_back.png', 'homedecor_nightstand_mahogany_1_drawer_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + selection_box = { type = "regular" }, + node_box = { + type = "fixed", fixed = { { -8/16, 0, -30/64, 8/16, 8/16, 8/16 }, -- top half { -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face @@ -158,47 +75,16 @@ minetest.register_node('homedecor:nightstand_mahogany_one_drawer', { { -8/16, -8/16, 7/16, 8/16, 0, 8/16 }, -- back { -8/16, -8/16, -30/64, 8/16, -7/16, 8/16 } -- bottom } - }, + }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,6]".. - "list[current_name;main;0,0;8,1;]".. - "list[current_player;main;0,2;8,4;]") - meta:set_string("infotext", S("One-drawer Nightstand")) - local inv = meta:get_inventory() - inv:set_size("main", 8) - 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 nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("One-drawer Nightstand"), + inventory = { + size=8, + }, }) -minetest.register_node('homedecor:nightstand_mahogany_two_drawers', { - drawtype = "nodebox", +homedecor.register("nightstand_mahogany_two_drawers", { description = S("Mahogany Nightstand with Two Drawers"), tiles = { 'homedecor_nightstand_mahogany_top.png', 'homedecor_nightstand_mahogany_bottom.png', @@ -206,56 +92,20 @@ minetest.register_node('homedecor:nightstand_mahogany_two_drawers', { 'homedecor_nightstand_mahogany_left.png', 'homedecor_nightstand_mahogany_back.png', 'homedecor_nightstand_mahogany_2_drawer_front.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", + selection_box = { type = "regular" }, + node_box = { + type = "fixed", fixed = { { -8/16, -8/16, -30/64, 8/16, 8/16, 8/16 }, -- main body { -7/16, 1/16, -32/64, 7/16, 7/16, -29/64 }, -- top drawer face { -7/16, -7/16, -32/64, 7/16, -1/16, -29/64 }, -- bottom drawer face } - }, + }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7]".. - "list[current_name;main;0,0;8,2;]".. - "list[current_player;main;0,3;8,4;]") - meta:set_string("infotext", S("Two-drawer Nightstand")) - local inv = meta:get_inventory() - inv:set_size("main", 16) - 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 nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from nightstand at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, + infotext=S("Two-drawer Nightstand"), + inventory = { + size=16, + }, }) diff --git a/mods/homedecor_modpack/homedecor/paintings.lua b/mods/homedecor_modpack/homedecor/paintings.lua index 7e345282..68952a82 100644 --- a/mods/homedecor_modpack/homedecor/paintings.lua +++ b/mods/homedecor_modpack/homedecor/paintings.lua @@ -1,9 +1,8 @@ --Various kinds of paintings for i = 1,20 do - minetest.register_node("homedecor:painting_"..i, { + homedecor.register("painting_"..i, { description = "Decorative painting #"..i, - drawtype = "nodebox", tiles = { "homedecor_painting_edges.png", "homedecor_painting_edges.png", @@ -12,8 +11,6 @@ for i = 1,20 do "homedecor_painting_back.png", "homedecor_painting"..i..".png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { diff --git a/mods/homedecor_modpack/homedecor/refrigerator.lua b/mods/homedecor_modpack/homedecor/refrigerator.lua deleted file mode 100644 index 34f7f048..00000000 --- a/mods/homedecor_modpack/homedecor/refrigerator.lua +++ /dev/null @@ -1,323 +0,0 @@ --- This file supplies refrigerators - -local S = homedecor.gettext - --- nodebox models - -local fridge_model_bottom = { - type = "fixed", - fixed = { - {0, -0.4375, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.5, -0.5, -0.42, 0.5, 0.5, 0.5}, -- NodeBox2 - {-0.5, -0.4375, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox3 - {0, 0.25, -0.5, 0.0625, 0.3125, -0.4375}, -- NodeBox4 - {-0.125, 0.25, -0.5, -0.0625, 0.3125, -0.4375}, -- NodeBox5 - {0, 0.25, -0.5, 0.0625, 0.5, -0.473029}, -- NodeBox6 - {-0.125, 0.25, -0.5, -0.0625, 0.5, -0.473029}, -- NodeBox7 - } -} - -local fridge_model_top = { - type = "fixed", - fixed = { - {0, -0.5, -0.4375, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.0625, -0.5, -0.42, 0, 0.5, 0.5}, -- NodeBox2 - {-0.5, -0.5, -0.4375, -0.0625, -0.4375, 0.5}, -- NodeBox3 - {-0.5, -0.5, -0.4375, -0.4375, 0.5, 0.5}, -- NodeBox4 - {-0.5, -0.1875, -0.4375, -0.0625, 0.5, 0.5}, -- NodeBox5 - {-0.4375, -0.4375, -0.125, -0.0625, -0.1875, 0.5}, -- NodeBox6 - {-0.125, -0.4375, -0.4375, -0.0625, -0.1875, -0.125}, -- NodeBox7 - {-0.3125, -0.3125, -0.307054, -0.25, -0.1875, -0.286307}, -- NodeBox8 - {-0.125, 0, -0.5, -0.0625, 0.0625, -0.4375}, -- NodeBox9 - {0, 0, -0.5, 0.0625, 0.0625, -0.4375}, -- NodeBox10 - {0, -0.5, -0.5, 0.0625, 0.0625, -0.473029}, -- NodeBox11 - {-0.125, -0.5, -0.5, -0.0625, 0.0625, -0.473029}, -- NodeBox12 - } -} - --- steel-textured fridge - -minetest.register_node("homedecor:refrigerator_steel_bottom", { - tiles = { - "default_steel_block.png", - "homedecor_refrigerator_steel_bottom.png", - "homedecor_refrigerator_steel_sides1.png", - "homedecor_refrigerator_steel_sides1.png^[transformFX", - "homedecor_refrigerator_steel_back1.png", - "homedecor_refrigerator_steel_front2.png" - }, - inventory_image = "homedecor_refrigerator_steel_inv.png", - description = S("Refrigerator (stainless steel)"), - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = fridge_model_bottom, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } - }, - on_place = function(itemstack, placer, pointed_thing) - local pos = pointed_thing.under - local pnode = minetest.get_node(pointed_thing.under) - local rnodedef = minetest.registered_nodes[pnode.name] - - if not rnodedef["buildable_to"] then - pos = pointed_thing.above - end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local pos2 = { x = pos.x, y=pos.y + 1, z = pos.z } - - local tnode = minetest.get_node(pos) - local tnode2 = minetest.get_node(pos2) - - if homedecor.get_nodedef_field(tnode.name, "buildable_to") - and homedecor.get_nodedef_field(tnode2.name, "buildable_to") - and not minetest.is_protected(pos, placer:get_player_name()) - and not minetest.is_protected(pos2, placer:get_player_name()) then - local nodename = itemstack:get_name() - minetest.add_node(pos, { name = nodename, param2 = fdir }) - minetest.add_node(pos2, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) - - if string.find(nodename, "_locked") then - local meta = minetest.get_meta(pos) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", S("Locked Refrigerator (owned by %s)"):format(meta:get_string("owner"))) - end - - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - end - 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:refrigerator_steel_top" then - minetest.remove_node(pos2) - end - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[10,10]".. - "list[current_name;main;0,0;10,5;]".. - "list[current_player;main;1,6;8,4;]") - meta:set_string("infotext", S("Refrigerator")) - local inv = meta:get_inventory() - inv:set_size("main",50) - 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 refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, -}) - -minetest.register_node("homedecor:refrigerator_steel_top", { - tiles = { - "homedecor_refrigerator_steel_top.png", - "default_steel_block.png", - "homedecor_refrigerator_steel_sides1.png", - "homedecor_refrigerator_steel_sides1.png^[transformFX", - "homedecor_refrigerator_steel_back1.png", - "homedecor_refrigerator_steel_front1.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = fridge_model_top, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, -}) - --- white, enameled fridge - -minetest.register_node("homedecor:refrigerator_white_bottom", { - tiles = { - "default_steel_block.png", - "homedecor_refrigerator_white_bottom.png", - "homedecor_refrigerator_white_sides1.png", - "homedecor_refrigerator_white_sides1.png^[transformFX", - "homedecor_refrigerator_white_back1.png", - "homedecor_refrigerator_white_front2.png" - }, - inventory_image = "homedecor_refrigerator_white_inv.png", - description = S("Refrigerator"), - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = fridge_model_bottom, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } - }, - on_place = function(itemstack, placer, pointed_thing) - local pos = pointed_thing.under - local pnode = minetest.get_node(pointed_thing.under) - local rnodedef = minetest.registered_nodes[pnode.name] - - if not rnodedef["buildable_to"] then - pos = pointed_thing.above - end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - local pos2 = { x = pos.x, y=pos.y + 1, z = pos.z } - - local tnode = minetest.get_node(pos) - local tnode2 = minetest.get_node(pos2) - - if homedecor.get_nodedef_field(tnode.name, "buildable_to") - and homedecor.get_nodedef_field(tnode2.name, "buildable_to") - and not minetest.is_protected(pos, placer:get_player_name()) - and not minetest.is_protected(pos2, placer:get_player_name()) then - local nodename = itemstack:get_name() - minetest.add_node(pos, { name = nodename, param2 = fdir }) - minetest.add_node(pos2, { name = "homedecor:refrigerator_white_top", param2 = fdir }) - - if string.find(nodename, "_locked") then - local meta = minetest.get_meta(pos) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", S("Locked Refrigerator (owned by %s)"):format(meta:get_string("owner"))) - end - - if not homedecor.expect_infinite_stacks then - itemstack:take_item() - return itemstack - end - end - 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:refrigerator_white_top" then - minetest.remove_node(pos2) - end - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[10,10]".. - "list[current_name;main;0,0;10,5;]".. - "list[current_player;main;1,6;8,4;]") - meta:set_string("infotext", S("Refrigerator")) - local inv = meta:get_inventory() - inv:set_size("main",50) - 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 refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", S("%s moves stuff to refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", S("%s takes stuff from refrigerator at %s"):format( - player:get_player_name(), - minetest.pos_to_string(pos) - )) - end, -}) - -minetest.register_node("homedecor:refrigerator_white_top", { - tiles = { - "homedecor_refrigerator_white_top.png", - "default_steel_block.png", - "homedecor_refrigerator_white_sides1.png", - "homedecor_refrigerator_white_sides1.png^[transformFX", - "homedecor_refrigerator_white_back1.png", - "homedecor_refrigerator_white_front1.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - node_box = fridge_model_top, - selection_box = { - type = "fixed", - fixed = { 0, 0, 0, 0, 0, 0 } - }, -}) - --- convert the old single-node fridges to the new two-node models - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) - end -}) - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_locked" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_white_bottom_locked", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_white_top", param2 = fdir }) - end -}) - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_steel" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) - end -}) - -minetest.register_abm({ - nodenames = { "homedecor:refrigerator_steel_locked" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local fdir = node.param2 - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - minetest.swap_node(pos, { name = "homedecor:refrigerator_steel_bottom_locked", param2 = fdir }) - minetest.set_node(p_top, { name = "homedecor:refrigerator_steel_top", param2 = fdir }) - end -}) - diff --git a/mods/homedecor_modpack/homedecor/shingles.lua b/mods/homedecor_modpack/homedecor/shingles.lua index db0c6df1..ac5f3209 100644 --- a/mods/homedecor_modpack/homedecor/shingles.lua +++ b/mods/homedecor_modpack/homedecor/shingles.lua @@ -10,13 +10,9 @@ minetest.register_node("homedecor:skylight", { inventory_image = "homedecor_skylight_inv.png", paramtype = "light", sunlight_propagates = true, - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 } - } + selection_box = homedecor.nodebox.slab_y(0.1), }) minetest.register_node("homedecor:skylight_frosted", { @@ -28,13 +24,9 @@ minetest.register_node("homedecor:skylight_frosted", { paramtype = "light", sunlight_propagates = true, use_texture_alpha = true, - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 } - } + selection_box = homedecor.nodebox.slab_y(0.1), }) minetest.register_node("homedecor:shingles_wood", { @@ -44,14 +36,10 @@ minetest.register_node("homedecor:shingles_wood", { wield_image = "homedecor_shingles_wood.png", inventory_image = "homedecor_shingles_wood_inv.png", paramtype = "light", - sunlight_propagates = false, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 } - } + selection_box = homedecor.nodebox.slab_y(0.1), }) minetest.register_node("homedecor:shingles_asphalt", { @@ -61,14 +49,10 @@ minetest.register_node("homedecor:shingles_asphalt", { wield_image = "homedecor_shingles_asphalt.png", inventory_image = "homedecor_shingles_asphalt_inv.png", paramtype = "light", - sunlight_propagates = false, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 } - } + selection_box = homedecor.nodebox.slab_y(0.1), }) minetest.register_node("homedecor:shingles_terracotta", { @@ -78,13 +62,9 @@ minetest.register_node("homedecor:shingles_terracotta", { wield_image = "homedecor_shingles_terracotta.png", inventory_image = "homedecor_shingles_terracotta_inv.png", paramtype = "light", - sunlight_propagates = false, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4, 0.5 } - } + selection_box = homedecor.nodebox.slab_y(0.1), }) diff --git a/mods/homedecor_modpack/homedecor/shutters.lua b/mods/homedecor_modpack/homedecor/shutters.lua index d5741b8f..b7f592f8 100644 --- a/mods/homedecor_modpack/homedecor/shutters.lua +++ b/mods/homedecor_modpack/homedecor/shutters.lua @@ -20,8 +20,7 @@ for i in ipairs(shutters) do local name = shutters[i][1] local desc = shutters[i][2] -minetest.register_node("homedecor:shutter_"..name, { - drawtype = "mesh", +homedecor.register("shutter_"..name, { mesh = "homedecor_window_shutter.obj", tiles = { "homedecor_window_shutter_"..name..".png" }, description = S("Wooden Shutter ("..desc..")"), diff --git a/mods/homedecor_modpack/homedecor/slopes.lua b/mods/homedecor_modpack/homedecor/slopes.lua index c8086b54..ec13a550 100644 --- a/mods/homedecor_modpack/homedecor/slopes.lua +++ b/mods/homedecor_modpack/homedecor/slopes.lua @@ -60,10 +60,7 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image paramtype = "light", paramtype2 = "facedir", walkable = true, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} - }, + selection_box = { type = "regular" }, collision_box = icorner_cbox, groups = groups, on_place = minetest.rotate_node @@ -180,20 +177,20 @@ minetest.register_craft( { }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:shingle_inner_corner_wood", - burntime = 30, + type = "fuel", + recipe = "homedecor:shingle_inner_corner_wood", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:shingle_outer_corner_wood", - burntime = 30, + type = "fuel", + recipe = "homedecor:shingle_outer_corner_wood", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "homedecor:shingle_side_wood", + type = "fuel", + recipe = "homedecor:shingle_side_wood", burntime = 30, }) diff --git a/mods/homedecor_modpack/homedecor/tables.lua b/mods/homedecor_modpack/homedecor/tables.lua index 48b3c4c8..eee9fde4 100644 --- a/mods/homedecor_modpack/homedecor/tables.lua +++ b/mods/homedecor_modpack/homedecor/tables.lua @@ -25,19 +25,15 @@ for i in ipairs(materials) do -- small square tables - minetest.register_node("homedecor:"..m.."_table_small_square", { + homedecor.register(m.."_table_small_square", { description = S(d.." Table (Small, Square)"), - drawtype = 'mesh', mesh = "homedecor_table_small_square.obj", tiles = { 'homedecor_'..m..'_table_small_square.png' }, wield_image = 'homedecor_'..m..'_table_small_square_inv.png', inventory_image = 'homedecor_'..m..'_table_small_square_inv.png', sunlight_propagates = true, - paramtype = 'light', - walkable = true, groups = { snappy = 3 }, sounds = s, - paramtype2 = "facedir", selection_box = tables_cbox, collision_box = tables_cbox, on_place = minetest.rotate_node @@ -45,19 +41,15 @@ for i in ipairs(materials) do -- small round tables - minetest.register_node('homedecor:'..m..'_table_small_round', { + homedecor.register(m..'_table_small_round', { description = S(d.." Table (Small, Round)"), - drawtype = "mesh", mesh = "homedecor_table_small_round.obj", tiles = { "homedecor_"..m.."_table_small_round.png" }, wield_image = 'homedecor_'..m..'_table_small_round_inv.png', inventory_image = 'homedecor_'..m..'_table_small_round_inv.png', sunlight_propagates = true, - paramtype = 'light', - walkable = true, groups = { snappy = 3 }, sounds = s, - paramtype2 = "facedir", selection_box = tables_cbox, collision_box = tables_cbox, on_place = minetest.rotate_node @@ -65,10 +57,9 @@ for i in ipairs(materials) do -- Large square table pieces - minetest.register_node('homedecor:'..m..'_table_large', { + homedecor.register(m..'_table_large', { description = S(d.." Table Piece (large)"), - drawtype = 'nodebox', - tiles = { + tiles = { 'homedecor_'..m..'_table_large_tb.png', 'homedecor_'..m..'_table_large_tb.png', 'homedecor_'..m..'_table_large_edges.png', @@ -79,11 +70,8 @@ for i in ipairs(materials) do wield_image = 'homedecor_'..m..'_table_large_inv.png', inventory_image = 'homedecor_'..m..'_table_large_inv.png', sunlight_propagates = true, - paramtype = 'light', - walkable = true, groups = { snappy = 3 }, sounds = s, - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, @@ -138,7 +126,7 @@ minetest.register_abm({ -- other tables -minetest.register_node('homedecor:utility_table_top', { +homedecor.register("utility_table_top", { description = S("Utility Table"), tiles = { 'homedecor_utility_table_tb.png', @@ -150,10 +138,6 @@ minetest.register_node('homedecor:utility_table_top', { }, wield_image = 'homedecor_utility_table_tb.png', inventory_image = 'homedecor_utility_table_tb.png', - drawtype = "nodebox", - sunlight_propagates = false, - paramtype = "light", - walkable = true, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), paramtype2 = "wallmounted", @@ -163,7 +147,7 @@ minetest.register_node('homedecor:utility_table_top', { wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 }, }, - selection_box = { + selection_box = { type = "wallmounted", wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, @@ -173,59 +157,53 @@ minetest.register_node('homedecor:utility_table_top', { -- Various kinds of table legs -minetest.register_node("homedecor:table_legs_brass", { - description = S("Brass Table Legs"), - drawtype = "plantlike", - tiles = {"homedecor_table_legs_brass.png"}, - inventory_image = "homedecor_table_legs_brass.png", - wield_image = "homedecor_table_legs_brass.png", - paramtype = "light", - walkable = false, - groups = {snappy=3}, - sounds = default.node_sound_leaves_defaults(), - walkable = true, - selection_box = { +homedecor.register("table_legs_brass", { + description = S("Brass Table Legs"), + drawtype = "plantlike", + tiles = {"homedecor_table_legs_brass.png"}, + inventory_image = "homedecor_table_legs_brass.png", + wield_image = "homedecor_table_legs_brass.png", + walkable = false, + groups = {snappy=3}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { type = "fixed", fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } }, }) -minetest.register_node("homedecor:table_legs_wrought_iron", { - description = S("Wrought Iron Table Legs"), - drawtype = "plantlike", - tiles = {"homedecor_table_legs_wrought_iron.png"}, - inventory_image = "homedecor_table_legs_wrought_iron.png", - wield_image = "homedecor_table_legs_wrought_iron.png", - paramtype = "light", - walkable = false, - groups = {snappy=3}, - sounds = default.node_sound_leaves_defaults(), - walkable = true, - selection_box = { +homedecor.register("table_legs_wrought_iron", { + description = S("Wrought Iron Table Legs"), + drawtype = "plantlike", + tiles = {"homedecor_table_legs_wrought_iron.png"}, + inventory_image = "homedecor_table_legs_wrought_iron.png", + wield_image = "homedecor_table_legs_wrought_iron.png", + walkable = false, + groups = {snappy=3}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { type = "fixed", fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } }, }) -minetest.register_node('homedecor:utility_table_legs', { +homedecor.register("utility_table_legs", { description = S("Legs for Utility Table"), drawtype = "plantlike", tiles = { 'homedecor_utility_table_legs.png' }, inventory_image = 'homedecor_utility_table_legs_inv.png', wield_image = 'homedecor_utility_table_legs.png', sunlight_propagates = true, - paramtype = "light", walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), - selection_box = { + selection_box = { type = "fixed", fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } }, }) -minetest.register_node("homedecor:desk", { - drawtype = "nodebox", +homedecor.register("desk", { description = "Desk", tiles = { "forniture_wood.png", @@ -236,8 +214,6 @@ minetest.register_node("homedecor:desk", { "homedecor_desk_front_l.png" }, inventory_image = "homedecor_desk_inv.png", - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -253,22 +229,12 @@ minetest.register_node("homedecor:desk", { fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 0.5 } }, groups = { snappy = 3 }, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_sideways(itemstack, placer, pointed_thing, - "homedecor:desk", "homedecor:desk_r", true) - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local fdir = oldnode.param2 - if not fdir or fdir > 3 then return end - local pos2 = { x = pos.x + homedecor.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - if minetest.get_node(pos2).name == "homedecor:desk_r" then - minetest.remove_node(pos2) - end - end + expand = { + right="homedecor:desk_r" + }, }) -minetest.register_node("homedecor:desk_r", { - drawtype = "nodebox", +homedecor.register("desk_r", { tiles = { "forniture_wood.png", "forniture_wood.png", @@ -277,8 +243,6 @@ minetest.register_node("homedecor:desk_r", { "homedecor_desk_back_r.png", "homedecor_desk_front_r.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -289,10 +253,7 @@ minetest.register_node("homedecor:desk_r", { {-0.5, -0.375, 0.4375, 0.4375, 0.25, 0.5}, } }, - selection_box = { - type = "fixed", - fixed = { 0,0,0,0,0,0 } - }, + selection_box = homedecor.nodebox.null, groups = { snappy = 3, not_in_creative_inventory=1 } }) diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat1_black.png b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat1_black.png index 37f04ea6..e2a77d91 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat1_black.png and b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat1_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat2_black.png b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat2_black.png index 7d83b6a1..1e75f86a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat2_black.png and b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_lat2_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_top_black.png b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_top_black.png index e4f91466..30bfbf28 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_armchair_top_black.png and b/mods/homedecor_modpack/homedecor/textures/forniture_armchair_top_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_black_metal.png b/mods/homedecor_modpack/homedecor/textures/forniture_black_metal.png index 57f09c88..a34fc849 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_black_metal.png and b/mods/homedecor_modpack/homedecor/textures/forniture_black_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_blue.png b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_blue.png index 05bbe0fd..4776d70c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_blue.png and b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_blue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_dark_green.png b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_dark_green.png index 6eee721b..3dfb0e0e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_dark_green.png and b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_dark_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_pink.png b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_pink.png index 65046d99..482fd6d5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_pink.png and b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_pink.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_red.png b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_red.png index 6eb483b7..fc28254f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_red.png and b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_red.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_violet.png b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_violet.png index abf5d7b4..a64945ca 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_violet.png and b/mods/homedecor_modpack/homedecor/textures/forniture_kitchen_chair_top_violet.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_metal.png b/mods/homedecor_modpack/homedecor/textures/forniture_metal.png index 33f252ae..d9d21221 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_metal.png and b/mods/homedecor_modpack/homedecor/textures/forniture_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png index 79786732..1ba0c98d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png index b2bcbf37..dccf1504 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi.png index 1429c487..9bf33373 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png index 24f8589d..6ebc807c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png index 76da113e..af0f3da6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png index 1dffdf33..8ada01a6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png index f6335f1a..d1978e6e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic.png index e5299350..f8c12e31 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png index d06bf4ff..73f90db7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood.png index 09799929..d7a91caf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png index 267abc6f..251a549f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png index 3140967e..61794624 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png index fb38f67c..58f647a3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png index 6d5d37db..e4785006 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png index 8e010614..ad7c15be 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png index 0e903842..69b17538 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png index 1e7803d1..8c485227 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png index 1839b935..b49948dc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png 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 index 15dcc659..1a3a17bf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_head2.png 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 index 317eca60..f94d7412 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_top2.png 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 index 35242b5c..ec1f79bc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_head2.png 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 index 2ccf599c..b0de9127 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_top2.png 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 index 6cd9a0e1..dd45fede 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_head2.png 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 index 1c72aede..87e05ee0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_top2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png index 906a3020..4f999e6f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_foot2ext.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 index 2433b8c4..a6b7618d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_foot1.png 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 index ccd176c8..0ec5348e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_head2.png 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 index 12927a1c..c20a0125 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2ext.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_side2ext.png 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 index f57d2bb3..672dc643 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_top2.png 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 index 8742ba26..af4e0d4d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_head2.png 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 index 57fe16e2..37d17c6a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2ext.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_side2ext.png 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 index 3286f7e4..3352185f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_top2.png 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 index d3e3d076..66db14de 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_head2.png 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 index 7a072ab6..fab74ebd 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2.png 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 index a1fb820e..88509183 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2ext.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_side2ext.png 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 index 76e13df1..92f7d148 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_top2.png 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 index d30a3b3e..8ea7a2dc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_head2.png 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 index dd42a9ea..f3723ef1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_head2.png 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 index c8accb41..850ac973 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_top2.png 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 index 1cb34876..16697188 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_head2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_head2.png 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 index 58ed4826..fe5028cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_top2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_right_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_right_back.png index 15ee02a3..353fdf5e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_right_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_right_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png b/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png index abbad1f6..88c0f42c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_back.png deleted file mode 100644 index 66e2c464..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_bottom.png index 90a9ad4f..cf7e2799 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png index 9828ae55..4d8195fa 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_top.png index e5589d48..ea4724c4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_bottom.png new file mode 100644 index 00000000..f1164fb7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png new file mode 100644 index 00000000..3b2e49b5 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_top.png new file mode 100644 index 00000000..85aeb374 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_bottom.png index 69b6a4a5..8871dd1d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png index 35fe9344..2d994c81 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_top.png index 3d3a6d97..cec1948e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_bottom.png new file mode 100644 index 00000000..404f2dec Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png new file mode 100644 index 00000000..09a10626 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_top.png new file mode 100644 index 00000000..b38fc6bc Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue_bottom.png index 01ca62ea..a254ed12 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown_bottom.png new file mode 100644 index 00000000..86543442 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green_bottom.png index 3c0e7946..0df1a39c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey_bottom.png new file mode 100644 index 00000000..8a019d81 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red_bottom.png index ae630636..b6884438 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_sides.png index d9c231ec..4617fbda 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_top.png index bfe4323b..53c3d342 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet_bottom.png new file mode 100644 index 00000000..1f148590 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_bottom.png index 041aa3ab..52d312d9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png index 73bf9d55..b491ae3a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_top.png index fda00505..15fb3e63 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_right.png deleted file mode 100644 index 52c500ac..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_bottom.png new file mode 100644 index 00000000..39f99895 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png new file mode 100644 index 00000000..7572eb7b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_top.png new file mode 100644 index 00000000..51810579 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png index fa72961e..a13b221c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png index a9f117ea..b8a4846c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png index eedf7c98..1f06e80e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png b/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png index 9941ba6c..218bc6c0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bright_metal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bright_metal.png index dfb17721..da124520 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bright_metal.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bright_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png index 68322897..6d7d407d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png index 68322897..6d7d407d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png index 120b2d91..df353d91 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_sides.png new file mode 100644 index 00000000..67fb05ed Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png new file mode 100644 index 00000000..a14917b2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_sides.png new file mode 100644 index 00000000..830bcedd Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_tb.png new file mode 100644 index 00000000..da823861 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png index edb094b8..305209e0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png index 29984116..2cb599b0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_top.png index 884045b3..8359158e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png index e6501327..9e8cdc6d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png index e6501327..9e8cdc6d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png index 1002c6ac..593f59eb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png index 636237a6..827d7bfb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_back.png index c702e768..bf4b4c9b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_front.png index a1142f3c..14dc286e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_right.png index cf0416b7..3f0fc9f7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_right.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_right.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_top.png index 921558f2..8f3add62 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_sides.png index e62268d1..b83ea099 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_top.png index 16393b2e..e1244cf1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png index dd3a1009..91edbc05 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png index d8fbd4e5..9eee7756 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png index 7e3c579c..7e353644 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png index 2e991979..3b91997c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe.png index aeff6a9e..b0357f5d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png index 7bc3b2e4..03ea8cda 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png index 0851d62a..17c7decc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png index db93ccf9..7798e530 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png index 9d68bec7..6bd93d73 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png index 1f737309..de344c5d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png index 02cc8375..9d36035e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_base_side.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 index 24ad7bc4..96ef49a3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_bottom.png 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 index 81555e34..3a036b8d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_inv.png 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 index 6226b2ac..39aaa721 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_left_top.png 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 index c4283f64..8b5eb902 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrb.png 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 index 99674902..a71b4001 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_lrt.png 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 index 6eeec329..dc0e3a96 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_bottom.png 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 index c5f28e49..3294ad2e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_right_top.png 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 index c2d071e5..aaa38f03 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_tb.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 index 1a1864af..8e96410a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_left.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_left.png 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 index 7acdd4d9..5f88c610 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_right.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_bottom_right.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 index 72ec2995..cc5711bf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_bottom.png 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 index 0b5b2cc8..99305a61 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_left_inv.png 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 index 817828fb..cd465c27 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_right_bottom.png 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 index 8871c92b..9749cdfa 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_left.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_left.png 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 index 3582274d..b05bc9bf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_right.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_top_right.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 index 39d5799b..106a90a5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_bottom.png 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 index e8868e2e..7153a836 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_inv.png 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 index a841a84f..fdb20274 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_left_top.png 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 index 86e3fbee..47d6be99 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrb.png 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 index 86e3fbee..47d6be99 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_lrt.png 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 index c99eae8c..d4af08f2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_bottom.png 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 index bb4b7542..28817f60 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_right_top.png 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 index 6d31f6a4..dcdf5d8e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_tb.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 index a8b9258f..b09252af 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_bottom.png 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 index 1d4a927e..93fab81c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_left_top.png 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 index e1289d60..2edb0006 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrb.png 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 index 08bf59aa..2edb0006 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_lrt.png 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 index cd612acc..52d99a8b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_right_bottom.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 index ea12017b..a985f33e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_bottom.png 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 index df93069b..646e17cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_left_inv.png 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 index 538da95b..3ab50bf7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_bottom.png 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 index 3591e02c..524b09cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_right_top.png 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 index 91626c5e..b3b5c934 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_tb.png 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 index cc55a903..74e6647d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrb.png 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 index a23f6404..4e891639 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_lrt.png 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 index 3561b293..6e36033a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png index 4fd9a61d..03387d7d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png index 1542747f..378b7a7c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png b/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png index 693806db..2958a0ee 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png index 31208fad..ac60f928 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_sides.png index 4f1def9e..3dea0db3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_top.png index 78989e4e..22d1a382 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png index 231bd6f7..2b125d8d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png index a3cf3ac3..b73ec443 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png index 390b2f60..983ad37c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png index bdab408e..efb9f7c7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png index 74ba14c0..07a48d3c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png index fa357f93..324109de 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png index 29d92202..21a09d76 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png index 994882e2..a120207d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png index a80ef543..c1f9cfbf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png index 12db7a5f..d6d6ba24 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png index d0d3509f..b1a142e1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png index f385add2..3fb1a9d9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png index a23f6404..4e891639 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png index 3561b293..6e36033a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png index fcf0ac92..81275ed9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png index 405da5a5..4f07a265 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png index 6db30214..364d48a8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png index af62ad72..e83883e2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png index fa357f93..324109de 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png index 856e8baa..9453b45f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png index ac231808..bd80d4c0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png index ac231808..bd80d4c0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png index fa357f93..324109de 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png index b88e0cf4..bb608dea 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png index dbe54628..a85aaa23 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png index e960d346..18271fe0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png index 649f049e..f6580c4e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png index 477334af..99cb543c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png index 09d3f3de..1ff5d25b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png index 987f4e90..0f6078bc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png index cf86d0d7..2898c21f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png index a640db81..79dbc839 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png index e9819dc7..3ef2c375 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png index 1a17ad32..3aa2387d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png index 44c2b360..a7dbd085 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png index 937999ea..adf946e0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png index ab347445..c256a2a5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png index 13c8bb88..14355131 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png index 571e77a4..47681a9d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png index 12af83c9..f1def033 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png index dee4cdbe..dd9311c8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png index 61165d33..ea846b9f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png index 7ce3ebf4..2e4f0fa8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png index ed398c66..dcfa5225 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png index 7f4d6b73..82b4bdb8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink.png index 6d29181c..7f30406a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png index 769fca58..ac322300 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png index ba6868d1..48c517f2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png index d5cf07b2..eb28a0d5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png index e0c17f32..8ad7c7ea 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png index 99277a84..0db6f431 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png index 7999677b..f91ab5e3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png index 0e862e47..e6b41cca 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png index e8646915..4092b2f8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png index 7b0407d4..dd1f8504 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf.png b/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf.png index 71bcac5d..fae9643b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png index f600731d..010dcb26 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png index df25a4b4..1b86f800 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png index ec6e6ce3..56550a6c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png index 0ad45b85..07a9275b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png index 84e49de8..0194b5a8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png index be890ee8..6694b348 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png index ec6e6ce3..56550a6c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png index 88ad1446..778e581d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png index ba955b36..f2a80f97 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png index 4f32438f..cd2f6b40 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png index ebb1d746..caaaf93b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png index 227849dd..6734be9c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png index 4257cedf..ff5fab66 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png index 07a7be72..adbf8f32 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel.png index d995d154..90461805 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png index 9a0e6be5..b7d14b41 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png b/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png index 8ade16e0..77d2bbd1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png index 80f53989..9b0fb7ff 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_left.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png index fab82104..8e8b30ab 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_front_right.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png index 8342daa7..a81915eb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png index 3749afad..355d3ed8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png index ad516814..47eaf244 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_bottom1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png index ee03d82b..2d7eecdb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_end1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png index f2b9ed4d..566855b5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_sides1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png index a1700e16..bd750180 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_top1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png index e3294492..7eba8517 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_back1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png index 7f3fb753..1674160a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png index 73f66d9c..7e4caa1c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png index fa3c5f40..53a44fe2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_front2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png index d6502e83..ce39d459 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png index b4bf48a3..aae21dd4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png index 135eeab7..eeca4906 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_back1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png index e4cc7a60..cff5115f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png index 4489b709..8592ebd6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png index 301a6a97..8ff22669 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_front2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png index b6c85def..5810c16e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png index b36a605c..6337b0e4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_sides1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png index 607c02ea..954afb23 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png index 144e1de8..8086a169 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png index 1d7fd8a5..d36ca09e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png index a2a05d28..75d361bc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png index 97f198ef..6b02cb8a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png index 4c2b042c..018dad06 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png index fe62b2d9..5ac11a5b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png index 0f44e2d2..5a7045e6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png index 18d116d4..e02a78cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png index 886d22ee..0567e73e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png index 6393c46a..c6c8da2e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png index 4ec6ca03..8dc79d70 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png index 9f80d5bc..b689cbb5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png index 8a0b4119..43def962 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png index 50ad5fee..53618558 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png index 2d3c5872..8001c627 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_bottom.png index 661a10a8..ebbdd28f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_front.png index 6dd49202..15d996c3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_left.png index fea9b803..bfa2f17d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_left.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sportbench_left.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png index 308af995..180262b7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png index f6c8b294..a3956919 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png index 31720200..08b11c87 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png index 8c14458d..c1d8938c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png index 2bc7a24d..4ef1b24e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png index 0dda1093..3c1270fe 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_hi.png index d23c0765..ad7a6119 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_low.png index 26b94242..f7ab9487 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_max.png index e768bac0..800e8d02 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_med.png index fcaeeccd..a3332c59 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_off.png index 3d148c4d..c15b023f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_blue_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_hi.png index 14cfd7c4..13343c0b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_low.png index adf5e70d..5dc84669 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_max.png index e5170027..cfd18aad 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_med.png index ecc5ae3a..9053ff81 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_off.png index 869e0bfd..1d8d0706 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_green_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_hi.png index 5a13763a..969c50d6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_low.png index 9af7d24c..17edfb06 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_max.png index 14008529..e25531c4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_med.png index c20fbd76..b27c9101 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_off.png index c4227968..498ef0ff 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_hi.png index 592a2663..5041cb62 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_low.png index ed46a18c..fca8c481 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_max.png index 1feeccf3..95f4b483 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_med.png index feea7426..6839a431 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_off.png index dc021bde..8afe1921 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_pink_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_hi.png index 56acad52..015a97c4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_low.png index fe7c209f..d3136e00 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_max.png index 85430c2c..8c6aa228 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_med.png index 288267cd..760992d4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_off.png index 874e7ea1..c5d20b0d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_red_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_hi.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_hi.png index d8c0a018..5001db22 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_hi.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_hi.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_low.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_low.png index fb895154..c5bea0c6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_low.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_low.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_max.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_max.png index b9210e6e..fe8346cb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_max.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_max.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_med.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_med.png index 5ca86534..564c4063 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_med.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_med.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_off.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_off.png index 0a961eca..7d669820 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_off.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_violet_off.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png index 49c2a13f..da40bd12 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_sides.png index ab7732c1..7c5bfbe6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png b/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png index 3f24cba8..b7858341 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png index 13ecb45c..79395ac1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper.png index 88b35132..5a688034 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png index b3ac19bb..d5d18356 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png 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 index 676d11ad..f7bce987 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_bottom.png 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 index 28783042..f816f889 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_top_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trashcan_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trashcan_tb.png index d45853f7..3a531632 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_trashcan_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_trashcan_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png index 3bd005da..b10ed228 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png index bbce65e3..c58ac96e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png index c22c7844..1326a917 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_white_metal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_white_metal.png index 40b39e96..01cbd9a2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_white_metal.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_white_metal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png index 13e566e3..5e2f5987 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png index b2a08e76..1879d4b5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png index ec6729bb..a13df39a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png index e8d7e4bd..6498bb87 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png index 906ce714..7c20faef 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png index d8c3d1c8..34be8f25 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png index dcf4743a..aa74378f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png index 0a62af15..bb71dd7a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png index 92e4b7f7..184e7ced 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png index 2433f6d5..2f5a3b46 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png index bab5be7e..3cb26b07 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png index 575dfbf5..c58d834b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png index 943e28a9..347510ae 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png index 722dc4f4..dc1ad371 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png index 8e49eed6..573b705d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack.png index 78df0740..933faffd 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png index a9430688..6281131a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png index 61ecef77..92fc76b5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png index eb0f3e7c..74810c04 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png index d63660e9..d5e5609c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png index 15ee7230..bdd41291 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png differ diff --git a/mods/homedecor_modpack/homedecor/window_treatments.lua b/mods/homedecor_modpack/homedecor/window_treatments.lua index f1f9244d..55187444 100644 --- a/mods/homedecor_modpack/homedecor/window_treatments.lua +++ b/mods/homedecor_modpack/homedecor/window_treatments.lua @@ -1,8 +1,8 @@ local S = homedecor.gettext -minetest.register_node("homedecor:window_quartered", { - description = "Window", +homedecor.register("window_quartered", { + description = "Window (quartered)", tiles = { "homedecor_window_sides.png", "homedecor_window_sides.png", @@ -11,38 +11,31 @@ minetest.register_node("homedecor:window_quartered", { "homedecor_window_quartered.png", "homedecor_window_quartered.png" }, - paramtype = "light", - paramtype2 = "facedir", use_texture_alpha = true, - is_ground_content = true, - groups = {crumbly=3}, - drawtype = "nodebox", + groups = {snappy=3}, + sounds = default.node_sound_glass_defaults(), node_box = { type = "fixed", fixed = { {-0.5, -0.5, 0.025, 0.5, 0.5, 0}, -- NodeBox1 {-0.5, 0.4375, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox2 {-0.5, -0.5, -0.0625, 0.5, -0.4375, 0.0625}, -- NodeBox3 - {-0.5, 0, -0.0625, 0.5, 0.0625, 0.0625}, -- NodeBox4 + {-0.5, -0.0625, -0.025, 0.5, 0.0625, 0.025}, -- NodeBox4 {0.4375, -0.5, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox5 {-0.5, -0.5, -0.0625, -0.4375, 0.5, 0.0625}, -- NodeBox6 - {0, -0.5, -0.0625, 0.0625, 0.5, 0.0625}, -- NodeBox7 + {-0.0625, -0.5, -0.025, 0.0625, 0.5, 0.025}, -- NodeBox7 }, }, selection_box = { type = "fixed", fixed = { - {-0.5, -0.5, 0.025, 0.5, 0.5, 0}, -- NodeBox1 - {-0.5, 0.4375, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox2 - {-0.5, -0.5, -0.0625, 0.5, -0.4375, 0.0625}, -- NodeBox3 - {0.4375, -0.5, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.5, -0.5, -0.0625, -0.4375, 0.5, 0.0625}, -- NodeBox6 - }, + {-0.5, -0.5, -0.0625, 0.5, 0.5, 0.0625} }, + }, }) -minetest.register_node("homedecor:window_plain", { - description = "Window", +homedecor.register("window_plain", { + description = "Window (plain)", tiles = { "homedecor_window_sides.png", "homedecor_window_sides.png", @@ -51,44 +44,33 @@ minetest.register_node("homedecor:window_plain", { "homedecor_window_frame.png", "homedecor_window_frame.png" }, - paramtype = "light", - paramtype2 = "facedir", use_texture_alpha = true, - is_ground_content = true, - groups = {crumbly=3}, - drawtype = "nodebox", + groups = {snappy=3}, + sounds = default.node_sound_glass_defaults(), node_box = { type = "fixed", fixed = { {-0.5, -0.5, 0.025, 0.5, 0.5, 0}, -- NodeBox1 {-0.5, 0.4375, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox2 {-0.5, -0.5, -0.0625, 0.5, -0.4375, 0.0625}, -- NodeBox3 - {0.4375, -0.5, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.5, -0.5, -0.0625, -0.4375, 0.5, 0.0625}, -- NodeBox6 + {0.4375, -0.5, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox4 + {-0.5, -0.5, -0.0625, -0.4375, 0.5, 0.0625}, -- NodeBox5 }, }, selection_box = { type = "fixed", fixed = { - {-0.5, -0.5, 0.025, 0.5, 0.5, 0}, -- NodeBox1 - {-0.5, 0.4375, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox2 - {-0.5, -0.5, -0.0625, 0.5, -0.4375, 0.0625}, -- NodeBox3 - {0.4375, -0.5, -0.0625, 0.5, 0.5, 0.0625}, -- NodeBox5 - {-0.5, -0.5, -0.0625, -0.4375, 0.5, 0.0625}, -- NodeBox6 + {-0.5, -0.5, -0.0625, 0.5, 0.5, 0.0625} }, }, }) -minetest.register_node("homedecor:blinds_thick", { +homedecor.register("blinds_thick", { description = "Window Blinds (thick)", tiles = { "homedecor_windowblinds.png" }, - paramtype = "light", - paramtype2 = "facedir", - --use_texture_alpha = true, walkable = false, - is_ground_content = true, - groups = {crumbly=3}, - drawtype = "nodebox", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = { @@ -115,36 +97,17 @@ minetest.register_node("homedecor:blinds_thick", { selection_box = { type = "fixed", fixed = { - {-0.527123, 0.375, 0.3125, 0.523585, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.304245, 0.3125, 0.5, 0.3125, 0.5}, -- NodeBox2 - {-0.5, 0.244104, 0.3125, 0.5, 0.25, 0.5}, -- NodeBox3 - {-0.5, 0.180424, 0.3125, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, 0.116745, 0.3125, 0.5, 0.125, 0.5}, -- NodeBox5 - {-0.5, 0.0566037, 0.3125, 0.5, 0.0625, 0.5}, -- NodeBox6 - {-0.5, -0.00707551, 0.3125, 0.5, 0, 0.5}, -- NodeBox7 - {-0.5, -0.0707547, 0.3125, 0.5, -0.0625, 0.5}, -- NodeBox8 - {-0.5, -0.130896, 0.3125, 0.5, -0.125, 0.5}, -- NodeBox9 - {-0.5, -0.194576, 0.3125, 0.5, -0.1875, 0.5}, -- NodeBox10 - {-0.5, -0.258255, 0.3125, 0.5, -0.25, 0.5}, -- NodeBox11 - {-0.5, -0.318396, 0.3125, 0.5, -0.3125, 0.5}, -- NodeBox12 - {-0.5, -0.5, 0.3125, 0.5, -0.4375, 0.5}, -- NodeBox13 - {-0.5, -0.378538, 0.3125, 0.5, -0.375, 0.5}, -- NodeBox14 - {-0.375, -0.5, 0.367925, -0.367925, 0.4375, 0.445755}, -- NodeBox15 - {0.367924, -0.5, 0.367925, 0.375, 0.5, 0.445755}, -- NodeBox16 + {-0.527123, -0.5, 0.25, 0.523585, 0.5, 0.5} }, }, }) -minetest.register_node("homedecor:blinds_thin", { +homedecor.register("blinds_thin", { description = "Window Blinds (thin)", tiles = { "homedecor_windowblinds.png" }, - paramtype = "light", - paramtype2 = "facedir", - --use_texture_alpha = true, walkable = false, - is_ground_content = true, - groups = {crumbly=3}, - drawtype = "nodebox", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = { @@ -171,22 +134,7 @@ minetest.register_node("homedecor:blinds_thin", { selection_box = { type = "fixed", fixed = { - {-0.52, 0.375, 0.4375, 0.52, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.304245, 0.4375, 0.5, 0.3125, 0.5}, -- NodeBox2 - {-0.5, 0.244104, 0.4375, 0.5, 0.25, 0.5}, -- NodeBox3 - {-0.5, 0.180424, 0.43755, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, 0.116745, 0.4375, 0.5, 0.125, 0.5}, -- NodeBox5 - {-0.5, 0.0566037, 0.4375, 0.5, 0.0625, 0.5}, -- NodeBox6 - {-0.5, -0.00707551, 0.4375, 0.5, 0, 0.5}, -- NodeBox7 - {-0.5, -0.0707547, 0.4375, 0.5, -0.0625, 0.5}, -- NodeBox8 - {-0.5, -0.130896, 0.4375, 0.5, -0.125, 0.5}, -- NodeBox9 - {-0.5, -0.194576, 0.4375, 0.5, -0.1875, 0.5}, -- NodeBox10 - {-0.5, -0.258255, 0.4375, 0.5, -0.25, 0.5}, -- NodeBox11 - {-0.5, -0.318396, 0.4375, 0.5, -0.3125, 0.5}, -- NodeBox12 - {-0.5, -0.5, 0.4375, 0.5, -0.4375, 0.5}, -- NodeBox13 - {-0.5, -0.378538, 0.4375, 0.5, -0.375, 0.5}, -- NodeBox14 - {-0.375, -0.49, 0.4575, -0.367925, 0.4375, 0.48}, -- NodeBox15 - {0.367924, -0.49, 0.4575, 0.375, 0.49, 0.48}, -- NodeBox16 + {-0.52, -0.5, 0.375, 0.52, 0.5, 0.5} }, }, }) @@ -204,7 +152,7 @@ for c in ipairs(curtaincolors) do local color = curtaincolors[c] local color_d = S(curtaincolors[c]) - minetest.register_node("homedecor:curtain_"..color, { + homedecor.register("curtain_"..color, { description = S("Curtains (%s)"):format(color_d), tiles = { "homedecor_curtain_"..color..".png" }, inventory_image = "homedecor_curtain_"..color..".png", @@ -212,8 +160,6 @@ for c in ipairs(curtaincolors) do drawtype = 'signlike', sunlight_propagates = true, use_texture_alpha = true, - paramtype = "light", - paramtype2 = "facedir", walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -224,14 +170,14 @@ for c in ipairs(curtaincolors) do -- Open the curtains on_rightclick = function(pos, node, clicker, itemstack) local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) - if string.find(topnode.name, "homedecor:curtainrod") then + if string.find(topnode.name, "homedecor:curtainrod") then local fdir = node.param2 minetest.set_node(pos, { name = "homedecor:curtain_open_"..color, param2 = fdir }) end end }) - minetest.register_node("homedecor:curtain_open_"..color, { + homedecor.register("curtain_open_"..color, { description = S("Curtains (%s)"):format(color_d), tiles = { "homedecor_curtain_open_"..color..".png" }, inventory_image = "homedecor_curtain_open_"..color..".png", @@ -239,8 +185,6 @@ for c in ipairs(curtaincolors) do drawtype = 'signlike', sunlight_propagates = true, use_texture_alpha = true, - paramtype = "light", - paramtype2 = "facedir", walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), @@ -251,7 +195,7 @@ for c in ipairs(curtaincolors) do -- Close the curtains on_rightclick = function(pos, node, clicker, itemstack) local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) - if string.find(topnode.name, "homedecor:curtainrod") then + if string.find(topnode.name, "homedecor:curtainrod") then local fdir = node.param2 minetest.set_node(pos, { name = "homedecor:curtain_"..color, param2 = fdir }) end @@ -270,13 +214,10 @@ for i in ipairs(mats) do local material = mats[i][1] local mat_name = mats[i][2] local texture = mats[i][3] - minetest.register_node("homedecor:curtainrod_"..material, { + homedecor.register("curtainrod_"..material, { tiles = { texture }, inventory_image = "homedecor_curtainrod_"..material.."_inv.png", description = "Curtain Rod ("..mat_name..")", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", sunlight_propagates = true, groups = { snappy = 3 }, node_box = { @@ -290,7 +231,7 @@ for i in ipairs(mats) do }) end -minetest.register_node("homedecor:window_flowerbox", { +homedecor.register("window_flowerbox", { description = "Window flowerbow", tiles = { "homedecor_flowerbox_top.png", @@ -298,17 +239,13 @@ minetest.register_node("homedecor:window_flowerbox", { "homedecor_flowerbox_sides.png" }, inventory_image = "homedecor_flowerbox_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, node_box = { type = "fixed", fixed = { - {-0.375, 0.25, -0.125, 0.375, 0.5, 0.375}, -- NodeBox1 + {-0.375, 0.25, -0.125, 0.375, 0.5, 0.375}, -- NodeBox1 {-0.3125, 0.4375, 0.375, -0.25, 0.4875, 0.5}, -- NodeBox2 {0.25, 0.4375, 0.375, 0.3125, 0.4875, 0.5}, -- NodeBox3 } } }) - diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf.png index 2c3140a1..f478c634 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_bottom.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_bottom.png index 51a39d2b..88624514 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_bottom.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_fb_empty.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_fb_empty.png index 351e1553..9e3e6910 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_fb_empty.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_fb_empty.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_sides.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_sides.png index 51a39d2b..88624514 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_sides.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_sides.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_top.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_top.png index 51a39d2b..88624514 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_top.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_top.png differ diff --git a/mods/homedecor_modpack/inbox/init.lua b/mods/homedecor_modpack/inbox/init.lua index 7e334882..179a3f6d 100644 --- a/mods/homedecor_modpack/inbox/init.lua +++ b/mods/homedecor_modpack/inbox/init.lua @@ -6,86 +6,86 @@ TODO ]] minetest.register_craft({ - output ="inbox:empty", - recipe = { - {"","default:steel_ingot",""}, - {"default:steel_ingot","","default:steel_ingot"}, - {"default:steel_ingot","default:steel_ingot","default:steel_ingot"} - } + output ="inbox:empty", + recipe = { + {"","default:steel_ingot",""}, + {"default:steel_ingot","","default:steel_ingot"}, + {"default:steel_ingot","default:steel_ingot","default:steel_ingot"} + } }) minetest.register_node("inbox:empty", { - paramtype = "light", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-4/12, -6/12, -6/12, 4/12, 0/12, 6/12}, - {-3/12, 0/12, -6/12, 3/12, 2/12, 6/12}, - {3/12, 0/12, -4/12, 4/12, 5/12, -2/12}, - {3/12, 3/12, -2/12, 4/12, 5/12, 0/12} - } - }, - description = "Mailbox", - tiles = {"inbox_top.png", "inbox_bottom.png", "inbox_east.png", - "inbox_west.png", "inbox_back.png", "inbox_front.png"}, - paramtype2 = "facedir", - groups = {choppy=2,oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), - after_place_node = function(pos, placer, itemstack) - local meta = minetest.get_meta(pos) - local owner = placer:get_player_name() - meta:set_string("owner", owner) - meta:set_string("infotext", owner.."'s Mailbox") - local inv = meta:get_inventory() - inv:set_size("main", 8*4) - inv:set_size("drop", 1) - end, - on_rightclick = function(pos, node, clicker, itemstack) - local meta = minetest.get_meta(pos) - local player = clicker:get_player_name() - local owner = meta:get_string("owner") - local meta = minetest.get_meta(pos) - if owner == player then - minetest.show_formspec( - clicker:get_player_name(), - "default:chest_locked", - inbox.get_inbox_formspec(pos)) - else - minetest.show_formspec( - clicker:get_player_name(), - "default:chest_locked", - inbox.get_inbox_insert_formspec(pos)) - end - end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local owner = meta:get_string("owner") - local inv = meta:get_inventory() - return player:get_player_name() == owner and inv:is_empty("main") - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - if listname == "drop" and inv:room_for_item("main", stack) then - inv:remove_item("drop", stack) - inv:add_item("main", stack) - end - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - if listname == "main" then - return 0 - end - if listname == "drop" then - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - if inv:room_for_item("main", stack) then - return -1 - else - return 0 - end - end - end, + paramtype = "light", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-4/12, -6/12, -6/12, 4/12, 0/12, 6/12}, + {-3/12, 0/12, -6/12, 3/12, 2/12, 6/12}, + {3/12, 0/12, -4/12, 4/12, 5/12, -2/12}, + {3/12, 3/12, -2/12, 4/12, 5/12, 0/12} + } + }, + description = "Mailbox", + tiles = {"inbox_top.png", "inbox_bottom.png", "inbox_east.png", + "inbox_west.png", "inbox_back.png", "inbox_front.png"}, + paramtype2 = "facedir", + groups = {choppy=2,oddly_breakable_by_hand=2}, + sounds = default.node_sound_wood_defaults(), + after_place_node = function(pos, placer, itemstack) + local meta = minetest.get_meta(pos) + local owner = placer:get_player_name() + meta:set_string("owner", owner) + meta:set_string("infotext", owner.."'s Mailbox") + local inv = meta:get_inventory() + inv:set_size("main", 8*4) + inv:set_size("drop", 1) + end, + on_rightclick = function(pos, node, clicker, itemstack) + local meta = minetest.get_meta(pos) + local player = clicker:get_player_name() + local owner = meta:get_string("owner") + local meta = minetest.get_meta(pos) + if owner == player then + minetest.show_formspec( + clicker:get_player_name(), + "default:chest_locked", + inbox.get_inbox_formspec(pos)) + else + minetest.show_formspec( + clicker:get_player_name(), + "default:chest_locked", + inbox.get_inbox_insert_formspec(pos)) + end + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local owner = meta:get_string("owner") + local inv = meta:get_inventory() + return player:get_player_name() == owner and inv:is_empty("main") + end, + on_metadata_inventory_put = function(pos, listname, index, stack, player) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if listname == "drop" and inv:room_for_item("main", stack) then + inv:remove_item("drop", stack) + inv:add_item("main", stack) + end + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if listname == "main" then + return 0 + end + if listname == "drop" then + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if inv:room_for_item("main", stack) then + return -1 + else + return 0 + end + end + end, }) function inbox.get_inbox_formspec(pos) diff --git a/mods/homedecor_modpack/itemframes/README.txt b/mods/homedecor_modpack/itemframes/README.txt deleted file mode 100644 index 7f591930..00000000 --- a/mods/homedecor_modpack/itemframes/README.txt +++ /dev/null @@ -1,28 +0,0 @@ -Minetest 0.4 mod: itemframes -============================ - -Original mod found here: -https://forum.minetest.net/viewtopic.php?f=11&t=5600 - -This version adds support for multiple pedestals. By default, -there are pedestals of the exact same materials as in the stairs -mod. You can add/remove new pedestals easily as much as you like. - -License of source code ----------------------- -This program is free software. It comes without any warranty, to -the extent permitted by applicable law. You can redistribute it -and/or modify it under the terms of the Do What The Fuck You Want -To Public License, Version 2, as published by Sam Hocevar. See -http://sam.zoy.org/wtfpl/COPYING for more details. - -License of media (textures) ---------------------------- -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -http://creativecommons.org/licenses/by-sa/3.0/ - -Authors of media files ----------------------- -Jere Oikarinen (CC BY-SA 3.0): - ./textures/itemframes_frame.png - diff --git a/mods/homedecor_modpack/itemframes/init.lua b/mods/homedecor_modpack/itemframes/init.lua index 2b6ee2ad..030e14b8 100644 --- a/mods/homedecor_modpack/itemframes/init.lua +++ b/mods/homedecor_modpack/itemframes/init.lua @@ -1,7 +1,4 @@ --- See README.txt for licensing and other information. - local tmp = {} -itemframes = {} minetest.register_entity("itemframes:item",{ hp_max = 1, @@ -28,7 +25,7 @@ minetest.register_entity("itemframes:item",{ if self.texture ~= nil then self.object:set_properties({textures={self.texture}}) end - if self.nodename ~= "itemframes:frame" then + if self.nodename == "itemframes:pedestal" then self.object:set_properties({automatic_rotate=1}) end end, @@ -40,6 +37,7 @@ minetest.register_entity("itemframes:item",{ end, }) + local facedir = {} facedir[0] = {x=0,y=0,z=1} facedir[1] = {x=1,y=0,z=0} @@ -49,9 +47,9 @@ facedir[3] = {x=-1,y=0,z=0} local remove_item = function(pos, node) local objs = nil if node.name == "itemframes:frame" then - objs = minetest.env:get_objects_inside_radius(pos, .5) - elseif minetest.get_item_group(node.name, "group:pedestal") then - objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5) + objs = minetest.get_objects_inside_radius(pos, .5) + elseif node.name == "itemframes:pedestal" then + objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5) end if objs then for _, obj in ipairs(objs) do @@ -64,7 +62,7 @@ end local update_item = function(pos, node) remove_item(pos, node) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if meta:get_string("item") ~= "" then if node.name == "itemframes:frame" then local posad = facedir[node.param2] @@ -72,12 +70,12 @@ local update_item = function(pos, node) pos.x = pos.x + posad.x*6.5/16 pos.y = pos.y + posad.y*6.5/16 pos.z = pos.z + posad.z*6.5/16 - elseif minetest.get_item_group(node.name, "group:pedestal") then + elseif node.name == "itemframes:pedestal" then pos.y = pos.y + 12/16+.33 end tmp.nodename = node.name tmp.texture = ItemStack(meta:get_string("item")):get_name() - local e = minetest.env:add_entity(pos,"itemframes:item") + local e = minetest.add_entity(pos,"itemframes:item") if node.name == "itemframes:frame" then local yaw = math.pi*2 - node.param2 * math.pi/2 e:setyaw(yaw) @@ -86,12 +84,12 @@ local update_item = function(pos, node) end local drop_item = function(pos, node) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if meta:get_string("item") ~= "" then if node.name == "itemframes:frame" then - minetest.env:add_item(pos, meta:get_string("item")) - elseif minetest.get_item_group(node.name, "group:pedestal") then - minetest.env:add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item")) + minetest.add_item(pos, meta:get_string("item")) + elseif node.name == "itemframes:pedestal" then + minetest.add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item")) end meta:set_string("item","") end @@ -113,13 +111,13 @@ minetest.register_node("itemframes:frame",{ legacy_wallmounted = true, sounds = default.node_sound_defaults(), after_place_node = function(pos, placer, itemstack) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) meta:set_string("infotext","Item frame (owned by "..placer:get_player_name()..")") end, on_rightclick = function(pos, node, clicker, itemstack) if not itemstack then return end - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if clicker:get_player_name() == meta:get_string("owner") then drop_item(pos,node) local s = itemstack:take_item() @@ -129,153 +127,69 @@ minetest.register_node("itemframes:frame",{ return itemstack end, on_punch = function(pos,node,puncher) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if puncher:get_player_name() == meta:get_string("owner") then drop_item(pos, node) end end, can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos) + + local meta = minetest.get_meta(pos) return player:get_player_name() == meta:get_string("owner") end, + after_destruct = remove_item, }) -minetest.register_craft({ - output = 'itemframes:frame', - recipe = { - {'group:stick', 'group:stick', 'group:stick'}, - {'group:stick', 'default:paper', 'group:stick'}, - {'group:stick', 'group:stick', 'group:stick'}, - } + +minetest.register_node("itemframes:pedestal",{ + description = "Pedestal", + drawtype = "nodebox", + node_box = { type = "fixed", fixed = { + {-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate + {-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper) + {-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar + {-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate + } }, + --selection_box = { type = "fixed", fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16} }, + tiles = {"itemframes_pedestal.png"}, + paramtype = "light", + groups = { cracky=3 }, + sounds = default.node_sound_defaults(), + after_place_node = function(pos, placer, itemstack) + local meta = minetest.get_meta(pos) + meta:set_string("owner",placer:get_player_name()) + meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")") + end, + on_rightclick = function(pos, node, clicker, itemstack) + if not itemstack then return end + local meta = minetest.get_meta(pos) + if clicker:get_player_name() == meta:get_string("owner") then + drop_item(pos,node) + local s = itemstack:take_item() + meta:set_string("item",s:to_string()) + update_item(pos,node) + end + return itemstack + end, + on_punch = function(pos,node,puncher) + local meta = minetest.get_meta(pos) + if puncher:get_player_name() == meta:get_string("owner") then + drop_item(pos,node) + end + end, + can_dig = function(pos,player) + + local meta = minetest.get_meta(pos) + return player:get_player_name() == meta:get_string("owner") + end, + after_destruct = remove_item, }) -function itemframes.register_pedestal(subname, recipeitem, groups, images, description, sounds) - minetest.register_node("itemframes:pedestal_" .. subname, { - description = description, - drawtype = "nodebox", - tiles = images, - node_box = { type = "fixed", fixed = { - {-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate - {-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper) - {-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar - {-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate - }}, - groups = groups, - sounds = sounds, - paramtype = "light", - after_place_node = function(pos, placer, itemstack) - local meta = minetest.env:get_meta(pos) - meta:set_string("owner",placer:get_player_name()) - meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")") - end, - on_rightclick = function(pos, node, clicker, itemstack) - if not itemstack then return end - local meta = minetest.env:get_meta(pos) - if clicker:get_player_name() == meta:get_string("owner") then - drop_item(pos,node) - local s = itemstack:take_item() - meta:set_string("item",s:to_string()) - update_item(pos,node) - end - return itemstack - end, - on_punch = function(pos,node,puncher) - local meta = minetest.env:get_meta(pos) - if puncher:get_player_name() == meta:get_string("owner") then - drop_item(pos,node) - end - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos) - return player:get_player_name() == meta:get_string("owner") - end, - }) - - minetest.register_craft({ - output = 'itemframes:pedestal_' .. subname, - recipe = { - {recipeitem, recipeitem, recipeitem}, - {'', recipeitem, ''}, - {recipeitem, recipeitem, recipeitem}, - } - }) -end - -itemframes.register_pedestal("wood", "default:wood", - {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,pedestal=1}, - {"default_wood.png"}, - "Wooden Pedestal", - default.node_sound_wood_defaults() -) - -itemframes.register_pedestal("stone", "default:stone", - {cracky=3,pedestal=1}, - {"default_stone.png"}, - "Stone Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("cobble", "default:cobble", - {cracky=3,pedestal=1}, - {"default_cobble.png"}, - "Cobblestone Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("desert_stone", "default:desert_stone", - {cracky=3,pedestal=1}, - {"default_desert_stone.png"}, - "Desert Stone Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("desert_cobble", "default:desert_cobble", - {cracky=3,pedestal=1}, - {"default_desert_cobble.png"}, - "Desert Cobblestone Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("desert_stonebrick", "default:desert_stonebrick", - {cracky=3,pedestal=1}, - {"default_desert_stone_brick.png"}, - "Desert Stone Brick Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("brick", "default:brick", - {cracky=3,pedestal=1}, - {"default_brick.png"}, - "Brick Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("sandstone", "default:sandstone", - {crumbly=2,cracky=2,pedestal=1}, - {"default_sandstone.png"}, - "Sandstone Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("sandstonebrick", "default:sandstonebrick", - {crumbly=2,cracky=2,pedestal=1}, - {"default_sandstone_brick.png"}, - "Sandstone Brick Pedestal", - default.node_sound_stone_defaults() -) - -itemframes.register_pedestal("stonebrick", "default:stonebrick", - {cracky=3,pedestal=1}, - {"default_stone_brick.png"}, - "Stone Brick Pedestal", - default.node_sound_stone_defaults() -) - --- automatically restore entities lost from --- frames/pedestals due to /clearobjects or similar +-- automatically restore entities lost from frames/pedestals +-- due to /clearobjects or similar minetest.register_abm({ - nodenames = {"itemframes:frame", "group:pedestal"}, + nodenames = { "itemframes:frame", "itemframes:pedestal" }, interval = 15, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -284,7 +198,21 @@ minetest.register_abm({ end }) --- homedecor/itemframes -> itemframes::stone --- minetest.register_alias("itemframes:pedestal","itemframes:pedestal_stone") --- itemframes::stone -> homedecor/itemframes -minetest.register_alias("itemframes:pedestal_stone","itemframes:pedestal") +-- crafts + +minetest.register_craft({ + output = 'itemframes:frame', + recipe = { + {'default:stick', 'default:stick', 'default:stick'}, + {'default:stick', 'default:paper', 'default:stick'}, + {'default:stick', 'default:stick', 'default:stick'}, + } +}) +minetest.register_craft({ + output = 'itemframes:pedestal', + recipe = { + {'default:stone', 'default:stone', 'default:stone'}, + {'', 'default:stone', ''}, + {'default:stone', 'default:stone', 'default:stone'}, + } +}) diff --git a/mods/homedecor_modpack/itemframes/textures/itemframes_frame.png b/mods/homedecor_modpack/itemframes/textures/itemframes_frame.png index 0c3df9df..5373c454 100644 Binary files a/mods/homedecor_modpack/itemframes/textures/itemframes_frame.png and b/mods/homedecor_modpack/itemframes/textures/itemframes_frame.png differ diff --git a/mods/homedecor_modpack/itemframes/textures/itemframes_pedestal.png b/mods/homedecor_modpack/itemframes/textures/itemframes_pedestal.png index 406d1915..a269b0bd 100644 Binary files a/mods/homedecor_modpack/itemframes/textures/itemframes_pedestal.png and b/mods/homedecor_modpack/itemframes/textures/itemframes_pedestal.png differ diff --git a/mods/homedecor_modpack/lrfurn/armchairs.lua b/mods/homedecor_modpack/lrfurn/armchairs.lua index c5b1dc0e..1e85cef3 100644 --- a/mods/homedecor_modpack/lrfurn/armchairs.lua +++ b/mods/homedecor_modpack/lrfurn/armchairs.lua @@ -1,6 +1,6 @@ local armchairs_list = { { "Red Armchair", "red"}, - { "Orange Armchair", "orange"}, + { "Orange Armchair", "orange"}, { "Yellow Armchair", "yellow"}, { "Green Armchair", "green"}, { "Blue Armchair", "blue"}, @@ -31,24 +31,19 @@ for i in ipairs(armchairs_list) do {0.375, -0.5, -0.4375, 0.4375, -0.375, -0.375}, {-0.4375, -0.5, 0.375, -0.375, -0.375, 0.4375}, {0.375, -0.5, 0.375, 0.4375, -0.375, 0.4375}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, 0.3125, 0.5, 0.5, 0.5}, - + --arms {-0.5, 0, -0.5, -0.3125, 0.25, 0.3125}, {0.3125, 0, -0.5, 0.5, 0.25, 0.3125}, } }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - } - }, + selection_box = { type = "regular" }, on_rightclick = function(pos, node, clicker) if not clicker:is_player() then @@ -59,7 +54,7 @@ for i in ipairs(armchairs_list) do clicker:set_hp(20) end }) - + minetest.register_craft({ output = "lrfurn:armchair_"..colour, recipe = { @@ -68,7 +63,7 @@ for i in ipairs(armchairs_list) do {"group:stick", "", "", } } }) - + minetest.register_craft({ output = "lrfurn:armchair_"..colour, recipe = { diff --git a/mods/homedecor_modpack/lrfurn/coffeetable.lua b/mods/homedecor_modpack/lrfurn/coffeetable.lua index 0a388990..23974294 100644 --- a/mods/homedecor_modpack/lrfurn/coffeetable.lua +++ b/mods/homedecor_modpack/lrfurn/coffeetable.lua @@ -13,9 +13,9 @@ minetest.register_node("lrfurn:coffeetable_back", { --legs {-0.375, -0.5, -0.375, -0.3125, -0.0625, -0.3125}, {0.3125, -0.5, -0.375, 0.375, -0.0625, -0.3125}, - + --tabletop - {-0.4375, -0.0625, -0.4375, 0.4375, 0, 0.5}, + {-0.4375, -0.0625, -0.4375, 0.4375, 0, 0.5}, } }, selection_box = { @@ -42,7 +42,7 @@ minetest.register_node("lrfurn:coffeetable_back", { minetest.set_node(pos, node) end end, - + on_destruct = function(pos) local node = minetest.get_node(pos) local param2 = node.param2 @@ -58,7 +58,7 @@ minetest.register_node("lrfurn:coffeetable_back", { if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:coffeetable_front" ) then if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).param2 == param2 ) then minetest.remove_node(pos) - end + end end end, }) @@ -76,7 +76,7 @@ minetest.register_node("lrfurn:coffeetable_front", { --legs {-0.375, -0.5, 0.3125, -0.3125, -0.0625, 0.375}, {0.3125, -0.5, 0.3125, 0.375, -0.0625, 0.375}, - + --tabletop {-0.4375, -0.0625, -0.5, 0.4375, 0, 0.4375}, } diff --git a/mods/homedecor_modpack/lrfurn/endtable.lua b/mods/homedecor_modpack/lrfurn/endtable.lua index 4212037d..29953975 100644 --- a/mods/homedecor_modpack/lrfurn/endtable.lua +++ b/mods/homedecor_modpack/lrfurn/endtable.lua @@ -15,9 +15,9 @@ minetest.register_node("lrfurn:endtable", { {0.3125, -0.5, -0.375, 0.375, -0.0625, -0.3125}, {-0.375, -0.5, 0.3125, -0.3125, -0.0625, 0.375}, {0.3125, -0.5, 0.3125, 0.375, -0.0625, 0.375}, - + --tabletop - {-0.4375, -0.0625, -0.4375, 0.4375, 0, 0.4375}, + {-0.4375, -0.0625, -0.4375, 0.4375, 0, 0.4375}, } }, selection_box = { diff --git a/mods/homedecor_modpack/lrfurn/longsofas.lua b/mods/homedecor_modpack/lrfurn/longsofas.lua index d7be89f7..c3e8f285 100644 --- a/mods/homedecor_modpack/lrfurn/longsofas.lua +++ b/mods/homedecor_modpack/lrfurn/longsofas.lua @@ -1,6 +1,6 @@ local longsofas_list = { { "Red Long Sofa", "red"}, - { "Orange Long Sofa", "orange"}, + { "Orange Long Sofa", "orange"}, { "Yellow Long Sofa", "yellow"}, { "Green Long Sofa", "green"}, { "Blue Long Sofa", "blue"}, @@ -29,13 +29,13 @@ for i in ipairs(longsofas_list) do --legs {-0.4375, -0.5, -0.4375, -0.375, -0.375, -0.375}, {0.375, -0.5, -0.4375, 0.4375, -0.375, -0.375}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, - + --arm {-0.3125, 0, -0.5, 0.5, 0.25, -0.3125}, } @@ -77,7 +77,7 @@ for i in ipairs(longsofas_list) do end end end, - + on_destruct = function(pos) local node = minetest.get_node(pos) local param2 = node.param2 @@ -105,12 +105,12 @@ for i in ipairs(longsofas_list) do if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:longsofa_left_"..colour ) then if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).param2 == param2 ) then minetest.remove_node(pos) - end + end end - end + end end end, - + on_rightclick = function(pos, node, clicker) if not clicker:is_player() then return @@ -134,10 +134,10 @@ for i in ipairs(longsofas_list) do --legs {-0.4375, -0.5, -0.03125, -0.375, -0.375, 0.03125}, {0.375, -0.5, -0.03125, 0.4375, -0.375, 0.03125}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, } @@ -149,7 +149,7 @@ for i in ipairs(longsofas_list) do } }, }) - + minetest.register_node("lrfurn:longsofa_left_"..colour, { drawtype = "nodebox", tiles = {"lrfurn_sofa_left_top_"..colour..".png", "lrfurn_coffeetable_back.png", "lrfurn_sofa_left_front_"..colour..".png", "lrfurn_sofa_back_"..colour..".png", "lrfurn_sofa_left_side_"..colour..".png", "lrfurn_sofa_right_side_"..colour..".png"}, @@ -163,13 +163,13 @@ for i in ipairs(longsofas_list) do --legs {-0.4375, -0.5, 0.375, -0.375, -0.375, 0.4375}, {0.375, -0.5, 0.375, 0.4375, -0.375, 0.4375}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, - + --arm {-0.3125, 0, 0.3125, 0.5, 0.25, 0.5}, } @@ -181,9 +181,9 @@ for i in ipairs(longsofas_list) do } }, }) - + minetest.register_alias("lrfurn:longsofa_"..colour, "lrfurn:longsofa_right_"..colour) - + minetest.register_craft({ output = "lrfurn:longsofa_"..colour, recipe = { diff --git a/mods/homedecor_modpack/lrfurn/sofas.lua b/mods/homedecor_modpack/lrfurn/sofas.lua index 6867418c..bb13b85e 100644 --- a/mods/homedecor_modpack/lrfurn/sofas.lua +++ b/mods/homedecor_modpack/lrfurn/sofas.lua @@ -1,6 +1,6 @@ local sofas_list = { { "Red Sofa", "red"}, - { "Orange Sofa", "orange"}, + { "Orange Sofa", "orange"}, { "Yellow Sofa", "yellow"}, { "Green Sofa", "green"}, { "Blue Sofa", "blue"}, @@ -29,13 +29,13 @@ for i in ipairs(sofas_list) do --legs {-0.4375, -0.5, -0.4375, -0.375, -0.375, -0.375}, {0.375, -0.5, -0.4375, 0.4375, -0.375, -0.375}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, - + --arm {-0.3125, 0, -0.5, 0.5, 0.25, -0.3125}, } @@ -64,7 +64,7 @@ for i in ipairs(sofas_list) do minetest.set_node(pos, node) end end, - + on_destruct = function(pos) local node = minetest.get_node(pos) local param2 = node.param2 @@ -80,10 +80,10 @@ for i in ipairs(sofas_list) do if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:sofa_left_"..colour ) then if( minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).param2 == param2 ) then minetest.remove_node(pos) - end + end end end, - + on_rightclick = function(pos, node, clicker) if not clicker:is_player() then return @@ -93,7 +93,7 @@ for i in ipairs(sofas_list) do clicker:set_hp(20) end }) - + minetest.register_node("lrfurn:sofa_left_"..colour, { drawtype = "nodebox", tiles = {"lrfurn_sofa_left_top_"..colour..".png", "lrfurn_coffeetable_back.png", "lrfurn_sofa_left_front_"..colour..".png", "lrfurn_sofa_back_"..colour..".png", "lrfurn_sofa_left_side_"..colour..".png", "lrfurn_sofa_right_side_"..colour..".png"}, @@ -107,13 +107,13 @@ for i in ipairs(sofas_list) do --legs {-0.4375, -0.5, 0.375, -0.375, -0.375, 0.4375}, {0.375, -0.5, 0.375, 0.4375, -0.375, 0.4375}, - + --base/cushion {-0.5, -0.375, -0.5, 0.5, 0, 0.5}, - + --back {-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, - + --arm {-0.3125, 0, 0.3125, 0.5, 0.25, 0.5}, } @@ -125,7 +125,7 @@ for i in ipairs(sofas_list) do } }, }) - + minetest.register_alias("lrfurn:sofa_"..colour, "lrfurn:sofa_right_"..colour) minetest.register_craft({ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_black.png index b97baad3..05759cb0 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_blue.png index 7298fbff..4a29d2df 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_green.png index e51608f4..60a54f0f 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_grey.png index a4f85ffb..e819d94e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_orange.png index 7de9e1f0..d6f591d8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_red.png index 0f2e52f0..c38ca61d 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_violet.png index 9a7b1e07..5a536146 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_white.png index 6e821328..c8770e5d 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_yellow.png index b5c37763..03238473 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_front_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_black.png index 4b1c7c48..48b1de2c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_blue.png index 6e40ebda..b019ea7a 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_green.png index 435e7e49..1865df11 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_grey.png index fe64f5e7..c6feb16d 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_orange.png index 7936fe4f..34ee871e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_red.png index 5aef6f52..d7174495 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_violet.png index 2ad2a863..d77ef648 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_white.png index 46a49bec..87ce6f9f 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_armchair_top_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png index ef07fd51..04894fdc 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png index 91b91273..65d4f51c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_black.png index ebc76873..c8fa9127 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_blue.png index 175bb5e2..886f076e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_green.png index 84bf237e..4ad6044c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_grey.png index ecb84b68..e115cbe8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_orange.png index 4e6b04bb..a3c6bfe6 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_red.png index 861b00e6..7ea805cf 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_violet.png index c0fe2d67..73656c2b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_white.png index 32eb2a6e..7307e11f 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_yellow.png index 70c0526e..f80654e5 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_front_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_black.png index 6b00f4be..7e92275b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_green.png index 849187aa..0a481033 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_grey.png index f89aa8e9..78920516 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_orange.png index 854285fb..f579f074 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_white.png index 72133db9..53bf04d8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_longsofa_middle_top_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_black.png index 59d566ad..e24cf9a1 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_blue.png index 4feb74b0..032b7c7b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_green.png index 603c6510..d85d6a8c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_grey.png index 90a17d7b..337154e9 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_orange.png index 069006db..d405998c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_red.png index dfe6eb36..20c9c0e2 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_violet.png index 87ee6cb4..d845d39c 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_white.png index 212fa00f..232862cf 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_yellow.png index 7091a665..b01b7681 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_back_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_black.png index 93d2dcfd..ed655a29 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_blue.png index 9376230a..bfd4da94 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_green.png index 5b57f933..76a635be 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_grey.png index 783e8d30..84e85ebb 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_orange.png index 9cfd3451..d7a245e8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_red.png index 5ec6a831..72afce72 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_violet.png index a822cde9..373b6c64 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_white.png index 30918e8c..aa4f2516 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_yellow.png index 414cb937..1fd5a62b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_front_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_black.png index df73a848..c32cb6c4 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_blue.png index 904bcb2b..a3c2a5f8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_green.png index 732720b3..6737a9e3 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_grey.png index d15ff63c..286d37f1 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_orange.png index 3ed66371..8df67710 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_red.png index e900e3ed..9766d8ee 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_violet.png index 9b1fe876..57bae5fb 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_white.png index 63ed1190..f13376ee 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_yellow.png index 8501590a..6299d93b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_side_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_black.png index f02c70c8..504ef8da 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_green.png index 12bc37ae..69237787 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_grey.png index caacd61f..98865ccc 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_orange.png index a0687d72..7477d13e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_white.png index 6712f6b5..6b463714 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_left_top_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_black.png index ae2a9221..503e8023 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_blue.png index 52acc1e8..6b9429ed 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_green.png index 8e28179a..1fef6a9e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_grey.png index 8d991d41..a6e626ac 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_orange.png index b0d732a9..a4b2ace8 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_red.png index 323395cb..2abacc8d 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_violet.png index 8d8b796d..b8efb037 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_white.png index 003eec41..fc607e40 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_yellow.png index a44b11d3..3b3d2598 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_front_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_black.png index 1ce51fe1..3f21af99 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_blue.png index 03ee4bf5..aff9a15e 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_green.png index 316eae02..45e99349 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_grey.png index 2012f59d..c2264aba 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_orange.png index ab22c315..f6b89e8b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_red.png index 88d0c4c1..2939b676 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_violet.png index 034b7c58..6262657b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_white.png index 905d73bd..87ca956d 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_yellow.png index ca0c9388..e1e212fc 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_side_yellow.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_black.png index b5b0ad55..c2d7d7ef 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_green.png index df0ea198..9965e85b 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_grey.png index 9764280c..c46f85ae 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_orange.png index 377d64e3..18264290 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_white.png index c4c261db..532a44d5 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_right_top_white.png differ diff --git a/mods/homedecor_modpack/plasmascreen/init.lua b/mods/homedecor_modpack/plasmascreen/init.lua index 6f8cb6ca..45d28cb4 100644 --- a/mods/homedecor_modpack/plasmascreen/init.lua +++ b/mods/homedecor_modpack/plasmascreen/init.lua @@ -209,7 +209,7 @@ minetest.register_node("plasmascreen:screen5", { fixed = {-1.5050, -0.3125, 0.3700, 1.5050, 1.5050, 0.5050} }, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2}, - + after_place_node = function(pos,placer,itemstack) local param2 = minetest.get_node(pos).param2 local p = {x=pos.x, y=pos.y, z=pos.z} @@ -359,7 +359,7 @@ after_place_node = function(pos,placer,itemstack) end end end, - + after_dig_node = function(pos, oldnode, oldmetadata, digger) if oldnode.param2 == 0 then pos.x = pos.x-1 diff --git a/mods/homedecor_modpack/signs_lib/init.lua b/mods/homedecor_modpack/signs_lib/init.lua index c503066b..6a695374 100644 --- a/mods/homedecor_modpack/signs_lib/init.lua +++ b/mods/homedecor_modpack/signs_lib/init.lua @@ -382,7 +382,7 @@ local function make_line_texture(line, lineno) else maxw = math_max(width, maxw) end - if #chars < MAX_INPUT_CHARS then + if #chars < MAX_INPUT_CHARS then table.insert(chars, { off=ch_offs, tex=FONT_FMT_SIMPLE:format(c:byte()), diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png index f111a649..79862039 100644 Binary files a/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png and b/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png differ diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png index dae00ffd..48216c9b 100644 Binary files a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png and b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png differ