From 04cb59401b53499c3718bd3f8dfa89d21942f462 Mon Sep 17 00:00:00 2001 From: Alexander Weber Date: Mon, 25 Jun 2018 16:12:09 +0200 Subject: [PATCH 01/40] bugfix wardrobe save/restore skins for skinsdb --- homedecor/wardrobe.lua | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/homedecor/wardrobe.lua b/homedecor/wardrobe.lua index 40511d09..cc31fd3f 100644 --- a/homedecor/wardrobe.lua +++ b/homedecor/wardrobe.lua @@ -45,17 +45,16 @@ function homedecor.get_player_skin(player) end function homedecor.set_player_skin(player, skin, save) - skin = skin or default_skin if skinsdb_mod_path then - skins.set_player_skin(player, skin) + skins.set_player_skin(player, skin or skins.default) elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin - armor.textures[player:get_player_name()].skin = skin + armor.textures[player:get_player_name()].skin = skin or default_skin armor:update_player_visuals(player) else - set_player_textures(player, { skin }) + set_player_textures(player, { skin or default_skin}) end - if save then + if save and not skinsdb_mod_path then if skin == default_skin then skin = "default" player:set_attribute("homedecor:player_skin", "") @@ -133,13 +132,15 @@ homedecor.register("wardrobe", { minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") minetest.register_alias("homedecor:wardrobe_top", "air") -minetest.register_on_joinplayer(function(player) - local skin = player:get_attribute("homedecor:player_skin") +if not skinsdb_mod_path then -- If not managed by skinsdb + minetest.register_on_joinplayer(function(player) + local skin = player:get_attribute("homedecor:player_skin") - if skin and skin ~= "" then - -- setting player skin on connect has no effect, so delay skin change - minetest.after(1, function(player, skin) - homedecor.set_player_skin(player, skin) - end, player, skin) - end -end) + if skin and skin ~= "" then + -- setting player skin on connect has no effect, so delay skin change + minetest.after(1, function(player, skin) + homedecor.set_player_skin(player, skin) + end, player, skin) + end + end) +end From a8729575abfbd15cc622b413b71976c9157fbab4 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 22 Aug 2018 05:08:48 -0400 Subject: [PATCH 02/40] switch to colored itemstacks with full crafting recipes (requires Unified Dyes commit 2a816534 or later) known issues: standing lamp bypasses vertical stack check bed expansion changes the color of the first-placed bed to match the second when creating a king bed. --- homedecor/bathroom_furniture.lua | 9 -- homedecor/bedroom.lua | 8 +- homedecor/crafts.lua | 174 ++++++++++++++++++++++++++++--- homedecor/furniture.lua | 4 - homedecor/furniture_recipes.lua | 47 +++++++-- homedecor/handlers/expansion.lua | 26 ++--- homedecor/lighting.lua | 28 +++-- homedecor/shutters.lua | 5 - homedecor/window_treatments.lua | 4 - lavalamp/init.lua | 22 ++-- lrfurn/armchairs.lua | 13 ++- lrfurn/init.lua | 3 +- lrfurn/longsofas.lua | 13 ++- lrfurn/sofas.lua | 13 ++- 14 files changed, 272 insertions(+), 97 deletions(-) diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 2f57ddbf..4840b26b 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -12,12 +12,9 @@ minetest.register_node("homedecor:bathroom_tiles_dark", { paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node }) minetest.register_node("homedecor:bathroom_tiles_medium", { @@ -31,12 +28,9 @@ minetest.register_node("homedecor:bathroom_tiles_medium", { paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node }) minetest.register_node("homedecor:bathroom_tiles_light", { @@ -50,12 +44,9 @@ minetest.register_node("homedecor:bathroom_tiles_light", { paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node }) local tr_cbox = { diff --git a/homedecor/bedroom.lua b/homedecor/bedroom.lua index 71dcdc06..ddb7f997 100644 --- a/homedecor/bedroom.lua +++ b/homedecor/bedroom.lua @@ -52,13 +52,11 @@ homedecor.register("bed_regular", { on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) if not placer:get_player_control().sneak then return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing) end end, after_dig_node = function(pos, oldnode, oldmetadata, digger) - unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger) homedecor.unextend_bed(pos) end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -91,9 +89,7 @@ homedecor.register("bed_extended", { sounds = default.node_sound_wood_defaults(), expand = { forward = "air" }, on_rotate = screwdriver.disallow, - after_place_node = unifieddyes.recolor_on_place, after_dig_node = function(pos, oldnode, oldmetadata, digger) - unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger) homedecor.unextend_bed(pos) end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -124,10 +120,8 @@ homedecor.register("bed_kingsize", { on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, after_dig_node = function(pos, oldnode, oldmetadata, digger) - unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger) local inv = digger:get_inventory() if digger:get_player_control().sneak and inv:room_for_item("main", "homedecor:bed_regular 2") then inv:remove_item("main", "homedecor:bed_kingsize 1") @@ -137,7 +131,7 @@ homedecor.register("bed_kingsize", { on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) homedecor.beds_on_rightclick(pos, node, clicker) return itemstack - end + end, }) for _, w in pairs({ N_("mahogany"), N_("oak") }) do diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 69616de4..a139063f 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -546,6 +546,17 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:shutter_colored", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:shutter", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ type = "fuel", recipe = "homedecor:shutter_oak", @@ -867,6 +878,28 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:curtain_closed", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:curtain_closed", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:curtain_open", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:curtain_open", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + local mats = { { "brass", "homedecor:pole_brass" }, { "wrought_iron", "homedecor:pole_wrought_iron" }, @@ -1195,7 +1228,6 @@ minetest.register_craft( { minetest.register_craft({ output = "homedecor:glowlight_half 6", recipe = { - { "dye:white", "dye:white", "dye:white" }, { "default:glass", "homedecor:power_crystal", "default:glass", }, } }) @@ -1203,11 +1235,38 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:glowlight_half 6", recipe = { - { "dye:white", "dye:white", "dye:white" }, {"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", }, } }) +minetest.register_craft({ + output = "homedecor:glowlight_half", + recipe = { + {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}, + {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"} + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_half", + type = "shapeless", + recipe = { + "homedecor:glowlight_quarter", + "homedecor:glowlight_quarter" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_half", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_half", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ output = "homedecor:glowlight_quarter 6", recipe = { @@ -1215,6 +1274,17 @@ minetest.register_craft({ } }) +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_quarter", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_quarter", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ output = "homedecor:glowlight_small_cube 8", recipe = { @@ -1239,20 +1309,14 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "homedecor:glowlight_half", - recipe = { - {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}, - {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"} - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_half", - type = "shapeless", - recipe = { - "homedecor:glowlight_quarter", - "homedecor:glowlight_quarter" +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_small_cube", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_small_cube", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" } }) @@ -2227,6 +2291,17 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_light", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_light", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft( { output = "homedecor:bathroom_tiles_medium 4", recipe = { @@ -2235,6 +2310,17 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_medium", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_medium", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft( { output = "homedecor:bathroom_tiles_dark 4", recipe = { @@ -2243,6 +2329,17 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_dark", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_dark", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- misc electrical minetest.register_craft( { @@ -2476,6 +2573,17 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:bed_regular", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_regular", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft( { output = "homedecor:bed_kingsize", recipe = { @@ -2483,6 +2591,29 @@ minetest.register_craft( { }, }) +unifieddyes.register_color_craft({ + output = "homedecor:bed_kingsize", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_kingsize", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bed_kingsize", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_regular", + recipe = { + "NEUTRAL_NODE", + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft( { output = "homedecor:bottle_green", recipe = { @@ -2843,6 +2974,17 @@ minetest.register_craft({ }, }) +unifieddyes.register_color_craft({ + output = "homedecor:desk_lamp", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:desk_lamp", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ output = "homedecor:hanging_lantern 2", recipe = { diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index 6c4526c8..4acfa581 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -83,9 +83,7 @@ homedecor.register("kitchen_chair_padded", { sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node, on_rotate = unifieddyes.fix_after_screwdriver_nsew, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) pos.y = pos.y+0 -- where do I put my ass ? @@ -110,9 +108,7 @@ homedecor.register("armchair", { node_box = ac_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node, on_rotate = unifieddyes.fix_after_screwdriver_nsew, }) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index fea13cfd..a995242c 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -70,6 +70,17 @@ minetest.register_craft({ }, }) +unifieddyes.register_color_craft({ + output = "homedecor:armchair", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:armchair", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ type = "shapeless", output = "homedecor:kitchen_chair_padded", @@ -79,6 +90,17 @@ minetest.register_craft({ }, }) +unifieddyes.register_color_craft({ + output = "homedecor:kitchen_chair_padded", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:kitchen_chair_padded", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ type = "fuel", recipe = "homedecor:kitchen_chair_wood", @@ -106,6 +128,17 @@ minetest.register_craft({ }, }) +unifieddyes.register_color_craft({ + output = "homedecor:standing_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:standing_lamp_off", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + minetest.register_craft({ type = "fuel", recipe = "homedecor:table_lamp_off", @@ -148,13 +181,15 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "homedecor:standing_lamp_off", +unifieddyes.register_color_craft({ + output = "homedecor:table_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:table_lamp_off", recipe = { - { "homedecor:table_lamp_off"}, - { "group:stick"}, - { "group:stick"}, - }, + "NEUTRAL_NODE", + "MAIN_DYE" + } }) minetest.register_craft({ diff --git a/homedecor/handlers/expansion.lua b/homedecor/handlers/expansion.lua index e9d2ec53..779e0770 100644 --- a/homedecor/handlers/expansion.lua +++ b/homedecor/handlers/expansion.lua @@ -211,22 +211,21 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks local rightnode = minetest.get_node(rightpos) local inv = placer:get_inventory() - local lastdye = unifieddyes.last_used_dye[placer_name] if leftnode.name == "homedecor:bed_regular" then local newname = string.gsub(thisnode.name, "_regular", "_kingsize") - local meta = minetest.get_meta(leftpos) + local meta = minetest.get_meta(pos) + local leftmeta = minetest.get_meta(leftpos) + minetest.set_node(pos, {name = "air"}) - minetest.set_node(leftpos, { name = newname, param2 = param2}) - meta:set_string("dye", lastdye) - inv:add_item("main", lastdye) + minetest.swap_node(leftpos, { name = newname, param2 = param2}) elseif rightnode.name == "homedecor:bed_regular" then local newname = string.gsub(thisnode.name, "_regular", "_kingsize") - local meta = minetest.get_meta(rightpos) + local meta = minetest.get_meta(pos) + local rightmeta = minetest.get_meta(rightpos) + minetest.set_node(rightpos, {name = "air"}) - minetest.set_node(pos, { name = newname, param2 = param2}) - meta:set_string("dye", lastdye) - inv:add_item("main", lastdye) + minetest.swap_node(pos, { name = newname, param2 = param2}) end local toppos = {x=pos.x, y=pos.y+1.0, z=pos.z} @@ -235,14 +234,7 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks if trybunks and is_buildable_to(placer_name, toppos, topposfwd) then local newname = string.gsub(thisnode.name, "_regular", "_extended") local newparam2 = param2 % 8 - if inv:contains_item("main", lastdye) then - minetest.set_node(toppos, { name = thisnode.name, param2 = param2}) - if lastdye then inv:remove_item("main", lastdye.." 1") end - else - minetest.set_node(toppos, { name = thisnode.name, param2 = newparam2}) - minetest.chat_send_player(placer_name, "Ran out of "..lastdye..", using neutral color.") - unifieddyes.last_used_dye[placer_name] = nil - end + minetest.swap_node(toppos, { name = thisnode.name, param2 = param2}) minetest.swap_node(pos, { name = newname, param2 = param2}) itemstack:take_item() end diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index cca06b72..a33c7615 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -46,9 +46,7 @@ minetest.register_node("homedecor:glowlight_half", { sounds = default.node_sound_glass_defaults(), after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node }) minetest.register_node("homedecor:glowlight_quarter", { @@ -86,9 +84,7 @@ minetest.register_node("homedecor:glowlight_quarter", { sounds = default.node_sound_glass_defaults(), after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node }) minetest.register_node("homedecor:glowlight_small_cube", { @@ -126,9 +122,7 @@ minetest.register_node("homedecor:glowlight_small_cube", { sounds = default.node_sound_glass_defaults(), after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node }) homedecor.register("plasma_lamp", { @@ -449,7 +443,6 @@ local function reg_lamp(suffix, nxt, light, brightness) paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, walkable = false, light_source = light, selection_box = tlamp_cbox, @@ -457,14 +450,17 @@ local function reg_lamp(suffix, nxt, light, brightness) groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1, not_in_creative_inventory=((light ~= nil) and 1) or nil, }, - drop = "homedecor:table_lamp_off", on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "homedecor:table_lamp_"..repl[suffix] minetest.set_node(pos, node) end, on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node + drop = { + items = { + {items = {"homedecor:table_lamp_off"}, inherit_color = true }, + } + } + }) homedecor.register("standing_lamp_"..suffix, { @@ -480,7 +476,6 @@ local function reg_lamp(suffix, nxt, light, brightness) paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, walkable = false, light_source = light, groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1, @@ -494,9 +489,12 @@ local function reg_lamp(suffix, nxt, light, brightness) minetest.set_node(pos, node) end, on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node, - expand = { top="air" }, + --expand = { top="air" }, + drop = { + items = { + {items = {"homedecor:standing_lamp_off"}, inherit_color = true }, + } + } }) -- for old maps that had the original 3dforniture mod @@ -535,9 +533,7 @@ homedecor.register("desk_lamp", { groups = {snappy=3, ud_param2_colorable = 1}, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node, on_rotate = unifieddyes.fix_after_screwdriver_nsew }) diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua index 44aa4abd..52c03cd1 100644 --- a/homedecor/shutters.lua +++ b/homedecor/shutters.lua @@ -41,9 +41,7 @@ homedecor.register("shutter", { node_box = shutter_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node }) homedecor.register("shutter_colored", { @@ -60,10 +58,7 @@ homedecor.register("shutter_colored", { node_box = shutter_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node, - drop = "homedecor:shutter" }) minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua index 71935b0c..c7eff500 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor/window_treatments.lua @@ -112,10 +112,8 @@ minetest.register_node("homedecor:curtain_closed", { paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", selection_box = { type = "wallmounted" }, - after_dig_node = unifieddyes.after_dig_node, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) @@ -141,10 +139,8 @@ minetest.register_node("homedecor:curtain_open", { paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", selection_box = { type = "wallmounted" }, - after_dig_node = unifieddyes.after_dig_node, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}) diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 54909cb7..b37f6516 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -28,7 +28,6 @@ minetest.register_node("lavalamp:lavalamp", { paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, sunlight_propagates = true, walkable = false, light_source = 14, @@ -39,8 +38,6 @@ minetest.register_node("lavalamp:lavalamp", { groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, sounds = default.node_sound_glass_defaults(), on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "lavalamp:lavalamp_off" minetest.swap_node(pos, node) @@ -59,7 +56,6 @@ minetest.register_node("lavalamp:lavalamp_off", { paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", - place_param2 = 240, sunlight_propagates = true, walkable = false, selection_box = { @@ -70,13 +66,16 @@ minetest.register_node("lavalamp:lavalamp_off", { sounds = default.node_sound_glass_defaults(), drop = "lavalamp:lavalamp", on_construct = unifieddyes.on_construct, - after_place_node = unifieddyes.recolor_on_place, - after_dig_node = unifieddyes.after_dig_node, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "lavalamp:lavalamp" minetest.swap_node(pos, node) return itemstack end, + drop = { + items = { + {items = {"lavalamp:lavalamp"}, inherit_color = true }, + } + } }) minetest.register_craft({ @@ -88,6 +87,17 @@ minetest.register_craft({ } }) +unifieddyes.register_color_craft({ + output = "lavalamp:lavalamp", + palette = "extended", + type = "shapeless", + neutral_node = "lavalamp:lavalamp", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- convert to param2 coloring local colors = { diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index 1155050a..fcb84e57 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -25,9 +25,7 @@ minetest.register_node("lrfurn:armchair", { node_box = armchair_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) end, - after_dig_node = unifieddyes.after_dig_node, on_rotate = unifieddyes.fix_after_screwdriver_nsew, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) if not clicker:is_player() then @@ -58,6 +56,17 @@ minetest.register_craft({ } }) +unifieddyes.register_color_craft({ + output = "lrfurn:armchair", + palette = "wallmounted", + type = "shapeless", + neutral_node = "lrfurn:armchair", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- convert old static nodes to param2 color lrfurn.old_static_armchairs = {} diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 0ac264cc..97cc586f 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -60,10 +60,11 @@ end function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) local node = minetest.get_node(pos) + local colorbits = node.param2 - (node.param2 % 8) local yaw = placer:get_look_yaw() local dir = minetest.yaw_to_dir(yaw-1.5) local fdir = minetest.dir_to_wallmounted(dir) - minetest.swap_node(pos, { name = node.name, param2 = fdir }) + minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits }) end dofile(minetest.get_modpath("lrfurn").."/longsofas.lua") diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index 05db65d3..eeb3ca23 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -26,7 +26,6 @@ minetest.register_node("lrfurn:longsofa", { on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack, pointed_thing) lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) local playername = placer:get_player_name() if minetest.is_protected(pos, placer:get_player_name()) then return true end @@ -42,7 +41,6 @@ minetest.register_node("lrfurn:longsofa", { end return itemstack end, - after_dig_node = unifieddyes.after_dig_node, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) if not clicker:is_player() then return itemstack @@ -72,6 +70,17 @@ minetest.register_craft({ } }) +unifieddyes.register_color_craft({ + output = "lrfurn:longsofa", + palette = "wallmounted", + type = "shapeless", + neutral_node = "lrfurn:longsofa", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- convert old static nodes to param2 colorization lrfurn.old_static_longsofas = {} diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index de1b784c..6f89beaf 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -26,7 +26,6 @@ minetest.register_node("lrfurn:sofa", { on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack, pointed_thing) lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing) local playername = placer:get_player_name() if minetest.is_protected(pos, placer:get_player_name()) then return true end @@ -42,7 +41,6 @@ minetest.register_node("lrfurn:sofa", { end return itemstack end, - after_dig_node = unifieddyes.after_dig_node, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) if not clicker:is_player() then return itemstack @@ -72,6 +70,17 @@ minetest.register_craft({ } }) +unifieddyes.register_color_craft({ + output = "lrfurn:sofa", + palette = "wallmounted", + type = "shapeless", + neutral_node = "lrfurn:sofa", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- convert old static nodes to param2 color lrfurn.old_static_sofas = {} From 55fea4f6ca739a2506a3a2da3bef217f395a124d Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 28 Aug 2018 23:07:37 -0400 Subject: [PATCH 03/40] make doors and gates respond to vertical mesecon two nodes below using pressure plate rules --- homedecor/depends.txt | 1 + homedecor/doors_and_gates.lua | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/homedecor/depends.txt b/homedecor/depends.txt index 5a37ef61..1c71e745 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -13,3 +13,4 @@ beds? flowers? 3d_armor? skinsdb? +mesecons? diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index f29ea249..34ba0177 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -4,6 +4,8 @@ local S = homedecor_i18n.gettext local function N_(x) return x end +local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate + -- doors local function isSolid(pos, adjust) @@ -264,6 +266,7 @@ for i, side in ipairs(sides) do drop = "homedecor:door_"..doorname.."_left", mesecons = { effector = { + rules = m_rules, action_on = function(pos,node) local isClosed = getClosed(pos) if isClosed then @@ -405,6 +408,7 @@ for i, g in ipairs(gate_list) do end, mesecons = { effector = { + rules = m_rules, action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end } } @@ -433,6 +437,7 @@ for i, g in ipairs(gate_list) do return itemstack end def.mesecons.effector = { + rules = m_rules, action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end } From 41455647a2167fe9195158ac95fb1f6650171a2a Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 11 Sep 2018 06:19:31 -0400 Subject: [PATCH 04/40] lrfurn i18n fix --- lrfurn/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 97cc586f..631e79a4 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,3 +1,4 @@ +local S = homedecor_i18n.gettext lrfurn = {} screwdriver = screwdriver or {} From eb6089a03ec0fdffc3848c377a51833528715392 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 12 Sep 2018 18:49:51 -0400 Subject: [PATCH 05/40] make wooden banister colorable via Unified Dyes --- homedecor/crafts.lua | 13 +++++++ homedecor/handlers/expansion.lua | 4 ++- homedecor/misc-nodes.lua | 33 ++++++++++++++---- .../homedecor_banister_wood_colored_inv.png | Bin 0 -> 2491 bytes 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 homedecor/textures/homedecor_banister_wood_colored_inv.png diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index a139063f..f9edb539 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -3273,6 +3273,19 @@ for i in ipairs(homedecor.banister_materials) do }) end +unifieddyes.register_color_craft({ + output = "", + palette = "split", + neutral_node = "homedecor:banister_wood_horizontal", + type = "shapeless", + output_prefix = "homedecor:banister_wood_horizontal_", + output_suffix = "", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE", + } +}) + if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) end diff --git a/homedecor/handlers/expansion.lua b/homedecor/handlers/expansion.lua index 779e0770..bd87e90e 100644 --- a/homedecor/handlers/expansion.lua +++ b/homedecor/handlers/expansion.lua @@ -257,6 +257,8 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) if not pos then return itemstack end local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local meta = itemstack:get_meta() + local pindex = meta:get_int("palette_index") local abovepos = { x=pos.x, y=pos.y+1, z=pos.z } local abovenode = minetest.get_node(abovepos) @@ -371,7 +373,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) end end - minetest.set_node(pos, {name = new_place_name, param2 = fdir}) + minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex}) itemstack:take_item() return itemstack end diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 72830d59..4d52e56b 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -483,23 +483,19 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do local name, matdesc, tile1, tile2 = unpack(mat) local nodename = "banister_"..name.."_"..side - local groups = { snappy = 3, not_in_creative_inventory = 1 } local cbox = { type = "fixed", fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 } } if side == "horizontal" then - groups = { snappy = 3 } cbox = { type = "fixed", fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 } } - else - minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename) end - homedecor.register(nodename, { + local def = { description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc), mesh = "homedecor_banister_"..side..".obj", tiles = { @@ -507,12 +503,35 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do tile2, }, inventory_image = "homedecor_banister_"..name.."_inv.png", - groups = groups, selection_box = cbox, collision_box = cbox, + groups = { snappy = 3}, on_place = homedecor.place_banister, drop = "homedecor:banister_"..name.."_horizontal", - }) + } + + if side ~= "horizontal" then + def.groups.not_in_creative_inventory = 1 + end + + if name == "wood" then + def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey" + def.groups.ud_param2_colorable = 1 + def.paramtype2 = "colorfacedir" + end + homedecor.register(nodename, def) + + if name == "wood" then + local nn = "homedecor:"..nodename + local def2 = table.copy(minetest.registered_items[nn]) + def2.tiles = { + homedecor.white_wood, + homedecor.white_wood + } + def2.inventory_image = "homedecor_banister_wood_colored_inv.png" + + unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal") + end end end diff --git a/homedecor/textures/homedecor_banister_wood_colored_inv.png b/homedecor/textures/homedecor_banister_wood_colored_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1a7ee752931d561c656cac06cd0434a503003e GIT binary patch literal 2491 zcmV;s2}JgZP){;^pJlSlP@$qpQjYjt~N-4rH>;krD&mOYb z>_)#=CmsT@67Qb`W`S1>IPHj0X);8#+wC6!zcc7crBwGO-+1E<9LJ&6YH|4R;p_fc zDMho{WOa3w)zwv+&1SS>lu9KEg#yK5kwT%cQBa5hk_^$FVNC<50sjO}0e=)iEU&|u zXsqyNZe^Q+mVj+QuKR{h(HH zOG~s`t*$%Sw#~%E1S2CO>j|>B0YEk|3XA|>0KOHwVSxV{*8CfI&FIc$ptg=nN%K8g zmQ3tkv9r#+7H>My6DLjx zK!jl^CMPH5`1rUVqtTa5SnHcL8jY^TT(hiUNTgMs=P^7y%#Iy9uxEl2nfTF zX0zFS#4VrC<2Vk5LV-*s!|3SfdIGLbojUb<(UXIPVI3$-DOp@xL@CA2ojWr?5LaET z^(3$lIA{QwG=es?j?apC6!1JRxd`3sWY}F@U8P>H<9S|}C6S9op<7BxsZ_$`JU{Cd zfK$LjQcB)`|9!$R1h}VCseJe`OtOut+lD2FfyaOyad}Wmi698B5#5^s5NV2;N7vTY z)@U}Hv|24%tyY&&z!tj~0Hl=XfQJAIg+iq4lfZ`?5U2o9LWq}umw+eD4el}`yC2vI zd==Q8a2MZ*+I8mpKFM%BG&Ix=)xPhuu&|({l)tK0t4+H{o%%cQI6%2vre3dO+ji+= zvo9gSo4oxVa1Qv3lrqR>vl_s4T}NyE9bg)GGzfyR^%#)6`M7YJh!+A>tJR;*&CQ8T z17NbPcaoVQPz7c-otpkXX$j4Z3qWMESs!=-c;U#ABcl&K_}~Zmd|q3YB}Yd`)$ZN9 zFG(qvfiEShSl{F>60ls?wTu=~tyXm}3=k$QOqiE zU@dwxm&;uME||HC2ZO|0(Q6y&Oi+de&L(H=*Yb?4}N|DKA za;CJt*BnymQ7;x1LY#9NPN~wDRYPFiER4S=AHjMDeDC_e)565u`f}nPz z|H6srH$C3Lxf zErGjZsqXDCEv2N@YQ1(_0f^bLNck7gOIu zbX_-kE_mLAd~QTF~*y-P5m?pP8AdBqM+jVrjEkZCVUij;>AJy}ys_-ySDH zKA%Tx-C&bj_h~U;DVji`P{8xNOdkQbKkfoj%0MaQ4+H=qgf?5<=b{N%mK6eD=_3F^ z3;>nMWZFRxtPPq07a||rzI{8s@AoqRd?UKZ=kpq9*6a1gX2Wh80BBQ*iKsC$KR?f_ zufDqF<(FTU{bYdoK7arI{c6w*m``M896fr}bzQd~{eXup%W}~09}r4Sm*->4hYZlyi%!@ z+Fj4i&dMMNG*F6|E2Sg|f_Hlvw;w(#Y}+Q2$vlu|K_sQ*kw+fUQc4{^%jEn1#XALn zx%kS&pVI>N*s)_nz+DLj{OL{s;LTWl9@06*k!DF8^%=W!_B@YgpMAD=rvUIl;_m|K zo-7q~POKK9c`q+7^UO2P1iggYGyyo3nCzH2a+@X#EMl9YuIpY&)FcB5gJ`WC;BSeS z)2;}w>onbW-+dneOifJ<+y&zMgwbl;)dv8q*tMRRm{>F^@xTGlbar8*s!Y(?(@)bv zI(rVCd^iZmWHN7?>`)IH07d5@<4RPNoH=tw0KD~9I_Ibk9y}PtOJQ@4`Esu(($i!> zo6csb0z|Xf9ER>*L0YyYT77d|?gBSBDRSEZFe&kyMyO~un?E;u@M(63qa7hVG&CgW zbc1^uKb0sDod^>`JOMnRwf_Fp)YS9+NVB6(kU2?uxz}7H)m&9;Ewt7`2=RQ%@jtQy z1^{ik!5`gG00<#;j1B$x(L>e%t)-MKEG(Sw6@dP3=A~>(sS2PRr=xqjcI{fbdiAQf zV;InHi?+hD*{oVvSm=a>En7Yt449dj84klRIs)soTCG=7=`(zS2+*MOOSI^G(33}w z91))-0K)0%>8-%M?RNXSN~wjXo_gxj`9sdn?Q^?*_CGsCUoyV9(KP@7002ovPDHLk FV1n6usQ3T? literal 0 HcmV?d00001 From 5b631142aa83902f8bd0b3f1dcafd8f0401c207c Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 12 Sep 2018 22:43:05 -0400 Subject: [PATCH 06/40] take colored banisted "pseudo nodes" out of creative inv --- homedecor/misc-nodes.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 4d52e56b..389d26df 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -529,6 +529,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do homedecor.white_wood } def2.inventory_image = "homedecor_banister_wood_colored_inv.png" + def2.groups.not_in_creative_inventory = 1 unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal") end From fc781daca0328271e04d0a0631c75ad5b8063bdb Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 12 Sep 2018 23:03:41 -0400 Subject: [PATCH 07/40] get rid of old 89->256 color LBMs --- homedecor/bathroom_furniture.lua | 18 ------------------ homedecor/lighting.lua | 25 ------------------------- lavalamp/init.lua | 17 ----------------- 3 files changed, 60 deletions(-) diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 4840b26b..146ad69c 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -164,21 +164,3 @@ minetest.register_lbm({ meta:set_string("palette", "ext") end }) - -minetest.register_lbm({ - name = "homedecor:recolor_bathroom_tiles", - label = "Convert bathroom tiles to use UD extended palette", - run_at_every_load = false, - nodenames = { - "homedecor:bathroom_tiles_light", - "homedecor:bathroom_tiles_medium", - "homedecor:bathroom_tiles_dark", - }, - action = function(pos, node) - local meta = minetest.get_meta(pos) - if meta:get_string("palette") ~= "ext" then - minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] }) - meta:set_string("palette", "ext") - end - end -}) diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index a33c7615..9055f23a 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -735,28 +735,3 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..color) end }) - -minetest.register_lbm({ - name = "homedecor:recolor_lighting", - label = "Convert some kinds of lights to use UD extended palette", - run_at_every_load = false, - nodenames = { - "homedecor:table_lamp_off", - "homedecor:table_lamp_low", - "homedecor:table_lamp_med", - "homedecor:table_lamp_hi", - "homedecor:table_lamp_max", - "homedecor:standing_lamp_off", - "homedecor:standing_lamp_low", - "homedecor:standing_lamp_med", - "homedecor:standing_lamp_hi", - "homedecor:standing_lamp_max", - }, - action = function(pos, node) - local meta = minetest.get_meta(pos) - if meta:get_string("palette") ~= "ext" then - minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] }) - meta:set_string("palette", "ext") - end - end -}) diff --git a/lavalamp/init.lua b/lavalamp/init.lua index b37f6516..756bf1d3 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -146,20 +146,3 @@ minetest.register_lbm({ end }) - -minetest.register_lbm({ - name = "lavalamp:recolor", - label = "Convert 89-color lamps to use UD extended palette", - run_at_every_load = false, - nodenames = { - "lavalamp:lavalamp", - "lavalamp:lavalamp_off" - }, - action = function(pos, node) - local meta = minetest.get_meta(pos) - if meta:get_string("palette") ~= "ext" then - minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] }) - meta:set_string("palette", "ext") - end - end -}) From 4980844320fff6ef53b684ad95e8cd92b1117c5b Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 13 Sep 2018 10:31:29 -0400 Subject: [PATCH 08/40] use airbrush_replacement_node instead of ud_replacement_node in shutter --- homedecor/shutters.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua index 52c03cd1..0e7b0f26 100644 --- a/homedecor/shutters.lua +++ b/homedecor/shutters.lua @@ -34,7 +34,7 @@ homedecor.register("shutter", { wield_image = inv, paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", - ud_replacement_node = "homedecor:shutter_colored", + airbrush_replacement_node = "homedecor:shutter_colored", groups = { snappy = 3, ud_param2_colorable = 1 }, sounds = default.node_sound_wood_defaults(), selection_box = shutter_cbox, From 25fef974e31de377ea4b23cd2ef6e08c33f81c2e Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 13 Sep 2018 22:32:46 -0400 Subject: [PATCH 09/40] add palette to wood banister --- homedecor/misc-nodes.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 389d26df..9be77cbb 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -515,6 +515,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do end if name == "wood" then + def.palette = "unifieddyes_palette_greys.png" def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey" def.groups.ud_param2_colorable = 1 def.paramtype2 = "colorfacedir" From 69e87419ea2dad82d594b271e91a7ba5e56c4807 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 16 Oct 2018 15:06:07 -0400 Subject: [PATCH 10/40] add alternate recipe for green welcome mat (workaround for a moreblocks bug) --- homedecor/crafts.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f9edb539..32d10009 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -2169,6 +2169,15 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:welcome_mat_green 2", + recipe = { + { "", "dye:white", "" }, + { "dye:black", "dye:black", "dye:black" }, + { "wool:green", "wool:green", "wool:green" }, + }, +}) + minetest.register_craft({ type = "shapeless", output = "homedecor:window_plain 8", From 6a3c009276a9186abd25bfeec93478808e2fd8a5 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 18 Oct 2018 06:54:26 -0400 Subject: [PATCH 11/40] if darkage is also installed, don't register large homedecor lattice lamp or the recipes to create it or to split it into 8 small lamps. instead, add an alias to darkage:lamp and a recipe to split that. --- homedecor/crafts.lua | 35 ++++++++++++++++++++++------------- homedecor/depends.txt | 1 + homedecor/lighting.lua | 18 +++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 32d10009..981729dc 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1207,21 +1207,30 @@ minetest.register_craft({ -- wood-lattice lamps -minetest.register_craft( { - output = "homedecor:lattice_lantern_large 2", - recipe = { - { "dye:black", "dye:yellow", "dye:black" }, - { "group:stick", "building_blocks:woodglass", "group:stick" }, - { "group:stick", "homedecor:power_crystal", "group:stick" } - }, -}) +if minetest.get_modpath("darkage") then + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { + { "darkage:lamp" }, + }, + }) +else + minetest.register_craft( { + output = "homedecor:lattice_lantern_large 2", + recipe = { + { "dye:black", "dye:yellow", "dye:black" }, + { "group:stick", "building_blocks:woodglass", "group:stick" }, + { "group:stick", "homedecor:power_crystal", "group:stick" } + }, + }) -minetest.register_craft( { - output = "homedecor:lattice_lantern_small 8", - recipe = { + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { { "homedecor:lattice_lantern_large" }, - }, -}) + }, + }) +end -- glowlights diff --git a/homedecor/depends.txt b/homedecor/depends.txt index 1c71e745..baaeb859 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -14,3 +14,4 @@ flowers? 3d_armor? skinsdb? mesecons? +darkage? diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 9055f23a..965912be 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -360,13 +360,17 @@ homedecor.register("ceiling_lantern", { walkable = false }) -homedecor.register("lattice_lantern_large", { - description = S("Lattice lantern (large)"), - tiles = { 'homedecor_lattice_lantern_large.png' }, - groups = { snappy = 3 }, - light_source = default.LIGHT_MAX, - sounds = default.node_sound_glass_defaults(), -}) +if minetest.get_modpath("darkage") then + minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp") +else + homedecor.register("lattice_lantern_large", { + description = S("Lattice lantern (large)"), + tiles = { 'homedecor_lattice_lantern_large.png' }, + groups = { snappy = 3 }, + light_source = default.LIGHT_MAX, + sounds = default.node_sound_glass_defaults(), + }) +end homedecor.register("lattice_lantern_small", { description = S("Lattice lantern (small)"), From f98371089930b0a6076b30d105f1cf6a29d3e71c Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 18 Oct 2018 07:17:08 -0400 Subject: [PATCH 12/40] reduce light output of small lattice cube lantern (especially if it comes from a darkage:lamp) --- homedecor/lighting.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 965912be..ddd0e446 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -360,8 +360,11 @@ homedecor.register("ceiling_lantern", { walkable = false }) +local sm_light = default.LIGHT_MAX-2 + if minetest.get_modpath("darkage") then minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp") + sm_light = default.LIGHT_MAX-5 else homedecor.register("lattice_lantern_large", { description = S("Lattice lantern (large)"), @@ -388,7 +391,7 @@ homedecor.register("lattice_lantern_small", { fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } }, groups = { snappy = 3 }, - light_source = default.LIGHT_MAX-1, + light_source = sm_light, sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) From fba875f4747fb85d8b37b5fc7129bee4e11b5036 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 18 Oct 2018 07:20:36 -0400 Subject: [PATCH 13/40] allow turning 8 small lattice lamps into one large. --- homedecor/crafts.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 981729dc..72ccfd52 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1214,6 +1214,21 @@ if minetest.get_modpath("darkage") then { "darkage:lamp" }, }, }) + + minetest.register_craft( { + output = "darkage:lamp", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) else minetest.register_craft( { output = "homedecor:lattice_lantern_large 2", @@ -1230,6 +1245,21 @@ else { "homedecor:lattice_lantern_large" }, }, }) + + minetest.register_craft( { + output = "homedecor:lattice_lantern_large", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) end -- glowlights From 0c58327df7ef6be08f6bf08f35dfd0e6051f5070 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 24 Oct 2018 19:03:29 -0400 Subject: [PATCH 14/40] add empty spool (craft from 7 plastic sheet) make steel and copper wire use it. reworked existing spool images --- homedecor/crafts.lua | 22 ++++++++++++++----- homedecor/textures/homedecor_copper_wire.png | Bin 354 -> 295 bytes homedecor/textures/homedecor_empty_spool.png | Bin 0 -> 214 bytes homedecor/textures/homedecor_steel_wire.png | Bin 321 -> 301 bytes 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 homedecor/textures/homedecor_empty_spool.png diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 72ccfd52..d16108cb 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -78,6 +78,11 @@ minetest.register_craftitem("homedecor:dvd_player", { inventory_image = "homedecor_dvd_player.png" }) +minetest.register_craftitem("homedecor:empty_spool", { + description = S("Empty wire spool"), + inventory_image = "homedecor_empty_spool.png" +}) + minetest.register_craftitem("homedecor:copper_wire", { description = S("Spool of copper wire"), inventory_image = "homedecor_copper_wire.png" @@ -206,21 +211,26 @@ minetest.register_craft( { }, }) +minetest.register_craft( { + output = "homedecor:empty_spool 2", + 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 = "homedecor:steel_wire 4", recipe = { - { "", "homedecor:plastic_sheeting", "" }, - { "default:steel_ingot", "homedecor:plastic_sheeting", "default:steel_ingot" }, - { "", "homedecor:plastic_sheeting", "" } + { "default:steel_ingot", "homedecor:empty_spool", "default:steel_ingot" }, }, }) minetest.register_craft( { output = "homedecor:copper_wire 4", recipe = { - { "", "homedecor:plastic_sheeting", "" }, - { "default:copper_ingot", "homedecor:plastic_sheeting", "default:copper_ingot" }, - { "", "homedecor:plastic_sheeting", "" } + { "default:copper_ingot", "homedecor:empty_spool", "default:copper_ingot" }, }, }) diff --git a/homedecor/textures/homedecor_copper_wire.png b/homedecor/textures/homedecor_copper_wire.png index e33eb2205a10c9c49d3fbac6eb15897448f2e23e..676e98fa59a75c271f5ac0c9e55dcb383f6b347f 100644 GIT binary patch delta 269 zcmV+o0rLLh0;d9yBYyzyNklTZej{9K@l1*gq(^T z0SXEqB@(7c8f)v2S#P4Du#jwmNzndoH2PmpvwtB_QGZZXy~q?r(MiBhbJH|bRRus% z6y$k68Un!UYN>sRh+1paTB{;5*u6ZLzmt}WLeHsO6a#bIAAcs(8LP)TQgcOWVy;cM z{%k$YA87rN$#lkO!1kl&WjencU3?xZ{qA1Wbt<%Xg zP3XD~RaGI&GHy3#k$H#eR3GZ4aoq0~@O-$2)^QoHwF+LUMLg`$U^gakG~J(Va8(>b zZEgUk3qv?x8Np>KhkAJu7ptQw diff --git a/homedecor/textures/homedecor_empty_spool.png b/homedecor/textures/homedecor_empty_spool.png new file mode 100644 index 0000000000000000000000000000000000000000..017a94fd20c34d95fc8342e9df02f0db5e4a64d0 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b3I)gLo80;o$SbUSV6#bzUdJG zfjgC~{*#=mh1NfC64-Rg>CGzD84+A%SN8|~`8*?WpMgfpa5~kR)YHQlO^dK*b=XraB`4f5$N;C&`1$k|s zef)*gf8GH9tlqubS59wCjXYtw|Ge&-sjcs%u9v!caTa(!^tZpfVcx$fzAL*Q8e9iD Ol)=;0&t;ucLK6VKXII() literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_steel_wire.png b/homedecor/textures/homedecor_steel_wire.png index 6534de0fd028f672a13d5611f5b6eef653503fdd..44f8240f97ac54da911ab333fb03f7249207a6ad 100644 GIT binary patch delta 275 zcmV+u0qp+40<8j&BYyz&NklyKpg)lmNMPbYDS+%v+$RxNe~7|D1U?^7+{`fy!WiDCrwlC z2K0T;AN z2ck&+PSACyO$TQJcO~!-2vk*zqIjtTRn_YfZ>C(9<%J-;bYQ+a@Se}(aX00+KhxX# Z0)?>W2A1sb0}KEF002ovPDHLkV1m3vfVuzx delta 295 zcmV+?0oeYn0>J{1BYy!1Nkl5`w-84<78F+#d;jRSAvV0(N9QS~) zZ-l!N2!h}|15MLxy0>kMFbqMs-+n{WG{kX?G)n5GHGao~9#eBX!by09z@s;Yuvm~8=Bma*UO!Sg&sQG_H(Aa{qu0fHcaW!c5x zr38jy{BeTc-$7MX=dSA(ciXmC3696(lHz*3f^b&?m&*koMVhOM`~8k#7%-0Ga=zVe tpG6|vl|U3lyC7NM?OBlshj6KXGw%$~x#X2}u@nFR002ovPDHLkV1i%rihlqA From 6dec410d296752ed0ef6b1b64f803db74c42dcb1 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 24 Oct 2018 19:27:14 -0400 Subject: [PATCH 15/40] better recipes for the spools (now the end cost is 0.5 ingot and 2.333 plastic per spool of wire) --- homedecor/crafts.lua | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index d16108cb..f9249814 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -212,7 +212,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:empty_spool 2", + output = "homedecor:empty_spool 3", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, { "", "homedecor:plastic_sheeting", "" }, @@ -221,17 +221,23 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:steel_wire 4", - recipe = { - { "default:steel_ingot", "homedecor:empty_spool", "default:steel_ingot" }, - }, + output = "homedecor:steel_wire 2", + type = "shapeless", + recipe = { + "default:steel_ingot", + "homedecor:empty_spool", + "homedecor:empty_spool", + }, }) minetest.register_craft( { - output = "homedecor:copper_wire 4", - recipe = { - { "default:copper_ingot", "homedecor:empty_spool", "default:copper_ingot" }, - }, + output = "homedecor:copper_wire 2", + type = "shapeless", + recipe = { + "default:copper_ingot", + "homedecor:empty_spool", + "homedecor:empty_spool", + }, }) minetest.register_craft( { From ec0e332918ecd9f8eb7c45b1ea5a2de30ef18896 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 12:18:15 -0400 Subject: [PATCH 16/40] get rid of phone ringing sound effect --- homedecor/electronics.lua | 14 -------------- .../sounds/homedecor_telephone_ringing.ogg | Bin 33622 -> 0 bytes 2 files changed, 14 deletions(-) delete mode 100644 homedecor/sounds/homedecor_telephone_ringing.ogg diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index 633adc18..cfcc6fc3 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -141,17 +141,3 @@ homedecor.register("telephone", { walkable = false, sounds = default.node_sound_wood_defaults(), }) - -minetest.register_abm({ - nodenames = "homedecor:telephone", - label = "sfx", - interval = 30, - chance = 15, - action = function(pos, node) - minetest.sound_play("homedecor_telephone_ringing", { - pos = pos, - gain = 1.0, - max_hear_distance = 5 - }) - end -}) diff --git a/homedecor/sounds/homedecor_telephone_ringing.ogg b/homedecor/sounds/homedecor_telephone_ringing.ogg deleted file mode 100644 index 8272ab1f7072e1376429d14eeb377b6fe4d6a200..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33622 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 From 379131142290f73c94bd28df9e6fcd29578bed65 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 12:30:21 -0400 Subject: [PATCH 17/40] get rid of glass office doors alias them to default glass doors --- homedecor/crafts.lua | 11 ----------- homedecor/doors_and_gates.lua | 8 +++----- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f9249814..e6344f0f 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1723,17 +1723,6 @@ minetest.register_craft( { }, }) --- Solid glass with metal handle - -minetest.register_craft( { - output = "homedecor:door_glass_left 2", - recipe = { - { "default:glass", "default:glass" }, - { "default:glass", "default:steel_ingot" }, - { "default:glass", "default:glass" }, - }, -}) - -- Closet doors -- oak diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index 34ba0177..afcc7ffc 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -142,11 +142,6 @@ local door_model_list = { usealpha = true }, - { name = "glass", - description = N_("Glass Office Door (@1 opening)"), - mesh = "homedecor_door_plain.obj" - }, - { name = "wood_glass_oak", description = N_("Glass and Wood, Oak-colored (@1 opening)"), mesh = "homedecor_door_wood_glass.obj", @@ -662,3 +657,6 @@ minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_cl minetest.register_alias("homedecor:jpn_door_top_open", "air") minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") + +minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b") +minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a") From d4e85cbab2360ab9a29efb100e7b749f042b5537 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 12:34:33 -0400 Subject: [PATCH 18/40] disable sleeping in beds --- homedecor/bedroom.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/homedecor/bedroom.lua b/homedecor/bedroom.lua index ddb7f997..7059809e 100644 --- a/homedecor/bedroom.lua +++ b/homedecor/bedroom.lua @@ -64,9 +64,9 @@ homedecor.register("bed_regular", { if itemname == "homedecor:bed_regular" then homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true) return itemstack - else - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack +-- else +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack end end }) @@ -92,10 +92,10 @@ homedecor.register("bed_extended", { after_dig_node = function(pos, oldnode, oldmetadata, digger) homedecor.unextend_bed(pos) end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, drop = "homedecor:bed_regular" }) @@ -128,10 +128,10 @@ homedecor.register("bed_kingsize", { inv:add_item("main", "homedecor:bed_regular 2") end end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, }) for _, w in pairs({ N_("mahogany"), N_("oak") }) do From c64dabfa285ee72e4d8d2cbca3948ad679103eff Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 12:40:13 -0400 Subject: [PATCH 19/40] use "default:wood" explicitly in homedecor:table recipe ("group:wood" conflicts with lrfurn coffee table, probably an issue with moreblocks) --- homedecor/furniture_recipes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index a995242c..51482c7b 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -2,7 +2,7 @@ minetest.register_craft({ output = "homedecor:table", recipe = { - { "group:wood","group:wood", "group:wood" }, + { "default:wood","default:wood", "default:wood" }, { "group:stick", "", "group:stick" }, }, }) From f7ff5ae3f452fbe725be6d0d8d647061695a6f79 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 12:43:14 -0400 Subject: [PATCH 20/40] allow crafting coffee table from two endtables --- lrfurn/coffeetable.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index f9246b8c..827657ac 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -47,6 +47,15 @@ minetest.register_node("lrfurn:coffeetable", { end, }) +minetest.register_craft({ + output = "lrfurn:coffeetable", + type = "shapeless", + recipe = { + "lrfurn:endtable", + "lrfurn:endtable" + } +}) + minetest.register_craft({ output = "lrfurn:coffeetable", recipe = { From bf79c7d4301d0b396aa83210538da6c42849b766 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 13:03:25 -0400 Subject: [PATCH 21/40] if both gloopblocks and moreblocks present, don't register "gravel spread" alias it to gloopblocks:slab_gravel_1 --- building_blocks/alias.lua | 4 +++ building_blocks/depends.txt | 1 + building_blocks/node_stairs.lua | 44 ++++++++++++++++++--------------- building_blocks/recipes.lua | 18 ++++++++------ 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 3ce0cd43..8d6520b0 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -19,6 +19,10 @@ if minetest.get_modpath("moreblocks") then minetest.unregister_item("moreblocks:tar") minetest.register_alias("moreblocks:tar", "building_blocks:Tar") stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar") + + if minetest.get_modpath("gloopblocks") then + minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1") + end end minetest.register_alias("adobe", "building_blocks:Adobe") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index f5cd549f..641d412a 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,4 +1,5 @@ default homedecor_i18n moreblocks? +gloopblocks? stairs? diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 9781293c..b0fecb4c 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -131,26 +131,30 @@ minetest.register_node("building_blocks:brobble_spread", { is_ground_content = true, groups = {crumbly=3}, }) -minetest.register_node("building_blocks:gravel_spread", { - drawtype = "raillike", - description = S("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}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_gravel_footstep", gain=0.5}, - dug = {name="default_gravel_footstep", gain=1.0}, - }), -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_node("building_blocks:gravel_spread", { + drawtype = "raillike", + description = S("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}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_gravel_footstep", gain=0.5}, + dug = {name="default_gravel_footstep", gain=1.0}, + }), + }) +end + minetest.register_node("building_blocks:Tarmac_spread", { drawtype = "raillike", description = S("Tarmac Spread"), diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index e8f810f7..42ac0a8b 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -60,12 +60,16 @@ minetest.register_craft({ {"default:glass", "default:glass"}, } }) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_craft({ + output = 'building_blocks:gravel_spread 4', + recipe = { + {"default:gravel", "default:gravel", "default:gravel"}, + } + }) +end + minetest.register_craft({ output = 'building_blocks:hardwood 2', recipe = { @@ -167,4 +171,4 @@ minetest.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, -}) \ No newline at end of file +}) From 93351aecda65e59aaaf35fd2c3439786ff492692 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 13:14:14 -0400 Subject: [PATCH 22/40] use three marble + bucket to make bathroom sink --- homedecor/furniture_recipes.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index 51482c7b..690e2f26 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -205,6 +205,7 @@ minetest.register_craft({ output = "homedecor:sink", recipe = { { "group:marble","bucket:bucket_empty", "group:marble" }, + { "", "group:marble", "" } }, }) From c5393f146221263015152afb4c27b7e766bd530d Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 13:15:24 -0400 Subject: [PATCH 23/40] use empty bucket in shower tray recipe --- homedecor/furniture_recipes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index 690e2f26..aeceeef3 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -226,7 +226,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:shower_tray", recipe = { - { "group:marble","bucket:bucket_water", "group:marble" }, + { "group:marble","bucket:bucket_empty", "group:marble" }, }, }) From 13a35d12a0cd3264dc741b1859c4e616b3d71210 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 30 Oct 2018 20:46:10 -0400 Subject: [PATCH 24/40] use basic_materials mod where possible --- chains/depends.txt | 2 - chains/init.lua | 179 ---- chains/models/chains.obj | 881 ------------------ chains/textures/chain_brass_inv.png | Bin 1886 -> 0 bytes chains/textures/chain_wrought_iron_inv.png | Bin 1730 -> 0 bytes chains/textures/chains_brass.png | Bin 344 -> 0 bytes chains/textures/chains_candle_flame.png | Bin 1490 -> 0 bytes chains/textures/chains_wrought_iron.png | Bin 386 -> 0 bytes computer/miscitems.lua | 6 +- computer/recipes.lua | 68 +- homedecor/crafts.lua | 598 +++--------- homedecor/depends.txt | 1 + homedecor/lighting.lua | 138 +++ .../models/homedecor_chains_top.obj | 0 .../models/homedecor_chandelier.obj | 0 homedecor/textures/homedecor_brass_ingot.png | Bin 309 -> 0 bytes .../textures/homedecor_candle_flat.png | Bin .../textures/homedecor_chainlink_brass.png | Bin 178 -> 0 bytes .../textures/homedecor_chainlink_steel.png | Bin 175 -> 0 bytes homedecor/textures/homedecor_copper_strip.png | Bin 326 -> 0 bytes homedecor/textures/homedecor_copper_wire.png | Bin 295 -> 0 bytes homedecor/textures/homedecor_empty_spool.png | Bin 214 -> 0 bytes .../textures/homedecor_heating_element.png | Bin 369 -> 0 bytes homedecor/textures/homedecor_ic.png | Bin 293 -> 0 bytes homedecor/textures/homedecor_motor.png | Bin 247 -> 0 bytes homedecor/textures/homedecor_oil_extract.png | Bin 1966 -> 0 bytes homedecor/textures/homedecor_paraffin.png | Bin 345 -> 0 bytes .../textures/homedecor_plastic_sheeting.png | Bin 293 -> 0 bytes .../textures/homedecor_plastic_strips.png | Bin 123 -> 0 bytes .../textures/homedecor_power_crystal.png | Bin 817 -> 0 bytes homedecor/textures/homedecor_silicon.png | Bin 769 -> 0 bytes homedecor/textures/homedecor_steel_strip.png | Bin 326 -> 0 bytes homedecor/textures/homedecor_steel_wire.png | Bin 301 -> 0 bytes .../textures/homedecor_terracotta_base.png | Bin 775 -> 0 bytes .../textures/top_chain_brass_inv.png | Bin .../textures/top_chain_wrought_iron_inv.png | Bin 36 files changed, 322 insertions(+), 1551 deletions(-) delete mode 100644 chains/depends.txt delete mode 100644 chains/init.lua delete mode 100644 chains/models/chains.obj delete mode 100644 chains/textures/chain_brass_inv.png delete mode 100644 chains/textures/chain_wrought_iron_inv.png delete mode 100644 chains/textures/chains_brass.png delete mode 100644 chains/textures/chains_candle_flame.png delete mode 100644 chains/textures/chains_wrought_iron.png rename chains/models/top_chains.obj => homedecor/models/homedecor_chains_top.obj (100%) rename chains/models/chains_chandelier.obj => homedecor/models/homedecor_chandelier.obj (100%) delete mode 100644 homedecor/textures/homedecor_brass_ingot.png rename chains/textures/chains_candle.png => homedecor/textures/homedecor_candle_flat.png (100%) delete mode 100644 homedecor/textures/homedecor_chainlink_brass.png delete mode 100644 homedecor/textures/homedecor_chainlink_steel.png delete mode 100644 homedecor/textures/homedecor_copper_strip.png delete mode 100644 homedecor/textures/homedecor_copper_wire.png delete mode 100644 homedecor/textures/homedecor_empty_spool.png delete mode 100644 homedecor/textures/homedecor_heating_element.png delete mode 100644 homedecor/textures/homedecor_ic.png delete mode 100644 homedecor/textures/homedecor_motor.png delete mode 100644 homedecor/textures/homedecor_oil_extract.png delete mode 100644 homedecor/textures/homedecor_paraffin.png delete mode 100644 homedecor/textures/homedecor_plastic_sheeting.png delete mode 100644 homedecor/textures/homedecor_plastic_strips.png delete mode 100644 homedecor/textures/homedecor_power_crystal.png delete mode 100644 homedecor/textures/homedecor_silicon.png delete mode 100644 homedecor/textures/homedecor_steel_strip.png delete mode 100644 homedecor/textures/homedecor_steel_wire.png delete mode 100644 homedecor/textures/homedecor_terracotta_base.png rename {chains => homedecor}/textures/top_chain_brass_inv.png (100%) rename {chains => homedecor}/textures/top_chain_wrought_iron_inv.png (100%) diff --git a/chains/depends.txt b/chains/depends.txt deleted file mode 100644 index 7b3e79f7..00000000 --- a/chains/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -homedecor diff --git a/chains/init.lua b/chains/init.lua deleted file mode 100644 index e7d2255a..00000000 --- a/chains/init.lua +++ /dev/null @@ -1,179 +0,0 @@ - -local S = homedecor_i18n.gettext - -local chains_sbox = { - type = "fixed", - fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 } -} - -local topchains_sbox = { - type = "fixed", - fixed = { - { -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 }, - { -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 } - } -} - -minetest.register_node("chains:chain", { - description = S("Hanging chain (wrought iron)"), - drawtype = "mesh", - mesh = "chains.obj", - tiles = {"chains_wrought_iron.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "chain_wrought_iron_inv.png", - groups = {cracky=3}, - selection_box = chains_sbox, -}) - -minetest.register_node("chains:chain_brass", { - description = S("Hanging chain (brass)"), - drawtype = "mesh", - mesh = "chains.obj", - tiles = {"chains_brass.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "chain_brass_inv.png", - groups = {cracky=3}, - selection_box = chains_sbox, -}) - -minetest.register_node("chains:chain_top", { - description = S("Hanging chain (ceiling mount, wrought iron)"), - drawtype = "mesh", - mesh = "top_chains.obj", - tiles = {"chains_wrought_iron.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "top_chain_wrought_iron_inv.png", - groups = {cracky=3}, - selection_box = topchains_sbox, -}) - -minetest.register_node("chains:chain_top_brass", { - description = S("Hanging chain (ceiling mount, brass)"), - drawtype = "mesh", - mesh = "top_chains.obj", - tiles = {"chains_brass.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "top_chain_brass_inv.png", - groups = {cracky=3}, - selection_box = topchains_sbox, -}) - -minetest.register_node("chains:chandelier", { - description = S("Chandelier (wrought iron)"), - paramtype = "light", - light_source = 12, - walkable = false, - climbable = true, - sunlight_propagates = true, - tiles = { - "chains_wrought_iron.png", - "chains_candle.png", - { - name="chains_candle_flame.png", - animation={ - type="vertical_frames", - aspect_w=16, - aspect_h=16, - length=3.0 - } - } - }, - drawtype = "mesh", - mesh = "chains_chandelier.obj", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("chains:chandelier_brass", { - description = S("Chandelier (brass)"), - paramtype = "light", - light_source = 12, - walkable = false, - climbable = true, - sunlight_propagates = true, - tiles = { - "chains_brass.png", - "chains_candle.png", - { - name="chains_candle_flame.png", - animation={ - type="vertical_frames", - aspect_w=16, - aspect_h=16, - length=3.0 - } - } - }, - drawtype = "mesh", - mesh = "chains_chandelier.obj", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - --- crafts - -minetest.register_craft({ - output = 'chains:chain 2', - recipe = { - {'glooptest:chainlink'}, - {'glooptest:chainlink'}, - {'glooptest:chainlink'}, - } -}) - -minetest.register_craft({ - output = 'chains:chain_top', - recipe = { - {'default:steel_ingot'}, - {'glooptest:chainlink'}, - }, -}) - -minetest.register_craft({ - output = 'chains:chandelier', - recipe = { - {'', 'glooptest:chainlink', ''}, - {'default:torch', 'glooptest:chainlink', 'default:torch'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - } -}) - --- brass versions - -minetest.register_craft({ - output = 'chains:chain_brass 2', - recipe = { - {'homedecor:chainlink_brass'}, - {'homedecor:chainlink_brass'}, - {'homedecor:chainlink_brass'}, - } -}) - -minetest.register_craft({ - output = 'chains:chain_top_brass', - recipe = { - {'technic:brass_ingot'}, - {'homedecor:chainlink_brass'}, - }, -}) - -minetest.register_craft({ - output = 'chains:chandelier_brass', - recipe = { - {'', 'homedecor:chainlink_brass', ''}, - {'default:torch', 'homedecor:chainlink_brass', 'default:torch'}, - {'technic:brass_ingot', 'technic:brass_ingot', 'technic:brass_ingot'}, - } -}) diff --git a/chains/models/chains.obj b/chains/models/chains.obj deleted file mode 100644 index 78724c98..00000000 --- a/chains/models/chains.obj +++ /dev/null @@ -1,881 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'chains.blend' -# www.blender.org -o Torus.016_Torus -v 0.000000 -0.429978 0.000002 -v 0.000000 -0.401109 0.055211 -v -0.014044 -0.391975 0.048870 -v -0.014044 -0.423304 0.000002 -v -0.009826 -0.379748 0.040970 -v -0.009826 -0.406012 0.000002 -v 0.009826 -0.379748 0.040970 -v 0.009826 -0.406012 0.000002 -v 0.014044 -0.391975 0.048870 -v 0.014044 -0.423304 0.000002 -v 0.000000 -0.316336 0.080195 -v -0.014044 -0.316336 0.069112 -v -0.009826 -0.316336 0.057941 -v 0.009826 -0.316336 0.057941 -v 0.014044 -0.316336 0.069112 -v 0.000000 -0.231564 0.055211 -v -0.014044 -0.240700 0.048870 -v -0.009826 -0.252925 0.040970 -v 0.009826 -0.252925 0.040970 -v 0.014044 -0.240700 0.048870 -v 0.000000 -0.202695 0.000002 -v -0.014044 -0.209368 0.000002 -v -0.009826 -0.226661 0.000002 -v 0.009826 -0.226661 0.000002 -v 0.014044 -0.209368 0.000002 -v 0.000000 -0.231564 -0.055206 -v -0.014044 -0.240700 -0.048868 -v -0.009826 -0.252925 -0.040967 -v 0.009826 -0.252925 -0.040967 -v 0.014044 -0.240700 -0.048865 -v 0.000000 -0.316336 -0.080190 -v -0.014044 -0.316336 -0.069108 -v -0.009826 -0.316336 -0.057936 -v 0.009826 -0.316336 -0.057936 -v 0.014044 -0.316336 -0.069108 -v 0.000000 -0.400361 -0.055206 -v -0.014044 -0.391975 -0.048868 -v -0.009826 -0.379748 -0.040967 -v 0.009826 -0.379748 -0.040967 -v 0.014044 -0.391975 -0.048868 -v 0.000000 -0.262249 0.000002 -v -0.061672 -0.233381 0.000002 -v -0.054590 -0.224245 -0.012569 -v 0.000000 -0.255577 -0.012569 -v -0.045765 -0.212018 -0.008794 -v 0.000000 -0.238285 -0.008794 -v -0.045765 -0.212018 0.008798 -v 0.000000 -0.238285 0.008798 -v -0.054590 -0.224245 0.012574 -v 0.000000 -0.255577 0.012574 -v -0.089582 -0.148609 0.000002 -v -0.077200 -0.148609 -0.012569 -v -0.064722 -0.148609 -0.008794 -v -0.064722 -0.148609 0.008799 -v -0.077200 -0.148609 0.012574 -v -0.061672 -0.063837 0.000002 -v -0.054590 -0.072971 -0.012569 -v -0.045765 -0.085198 -0.008794 -v -0.045765 -0.085198 0.008799 -v -0.054590 -0.072971 0.012574 -v 0.000000 -0.034967 0.000002 -v 0.000000 -0.041641 -0.012569 -v 0.000000 -0.058933 -0.008794 -v 0.000000 -0.058933 0.008799 -v 0.000000 -0.041641 0.012574 -v 0.061672 -0.063837 0.000002 -v 0.054590 -0.072971 -0.012569 -v 0.045765 -0.085198 -0.008794 -v 0.045765 -0.085198 0.008799 -v 0.054590 -0.072971 0.012574 -v 0.089582 -0.148609 0.000002 -v 0.077200 -0.148609 -0.012569 -v 0.064722 -0.148609 -0.008794 -v 0.064722 -0.148609 0.008799 -v 0.077200 -0.148609 0.012574 -v 0.061672 -0.232631 0.000002 -v 0.054590 -0.224245 -0.012569 -v 0.045765 -0.212018 -0.008794 -v 0.045765 -0.212018 0.008798 -v 0.054590 -0.224245 0.012574 -v 0.000000 0.073316 0.000002 -v 0.061672 0.102183 0.000002 -v 0.054590 0.111319 0.012574 -v 0.000000 0.079988 0.012574 -v 0.045765 0.123546 0.008799 -v 0.000000 0.097280 0.008799 -v 0.045765 0.123546 -0.008794 -v 0.000000 0.097280 -0.008794 -v 0.054590 0.111319 -0.012569 -v 0.000000 0.079988 -0.012569 -v 0.089582 0.186956 0.000002 -v 0.077200 0.186956 0.012574 -v 0.064722 0.186956 0.008799 -v 0.064722 0.186956 -0.008794 -v 0.077200 0.186956 -0.012569 -v 0.061672 0.271728 0.000002 -v 0.054590 0.262594 0.012574 -v 0.045765 0.250367 0.008799 -v 0.045765 0.250367 -0.008794 -v 0.054590 0.262594 -0.012569 -v 0.000000 0.300597 0.000002 -v 0.000000 0.293923 0.012574 -v 0.000000 0.276631 0.008799 -v 0.000000 0.276631 -0.008794 -v 0.000000 0.293923 -0.012569 -v -0.061672 0.271728 0.000002 -v -0.054590 0.262594 0.012574 -v -0.045765 0.250367 0.008799 -v -0.045765 0.250367 -0.008794 -v -0.054590 0.262594 -0.012569 -v -0.089582 0.186956 0.000002 -v -0.077200 0.186956 0.012574 -v -0.064722 0.186956 0.008799 -v -0.064722 0.186956 -0.008794 -v -0.077200 0.186956 -0.012569 -v -0.061672 0.102931 0.000002 -v -0.054590 0.111319 0.012574 -v -0.045765 0.123546 0.008799 -v -0.045765 0.123546 -0.008794 -v -0.054590 0.111319 -0.012569 -v 0.000000 -0.095037 0.000002 -v 0.000000 -0.066168 -0.055206 -v 0.014044 -0.057034 -0.048868 -v 0.014044 -0.088363 0.000002 -v 0.009826 -0.044807 -0.040967 -v 0.009826 -0.071071 0.000002 -v -0.009826 -0.044807 -0.040967 -v -0.009826 -0.071071 0.000002 -v -0.014044 -0.057034 -0.048868 -v -0.014044 -0.088363 0.000002 -v 0.000000 0.018605 -0.080190 -v 0.014044 0.018605 -0.069108 -v 0.009826 0.018605 -0.057936 -v -0.009826 0.018605 -0.057936 -v -0.014044 0.018605 -0.069108 -v 0.000000 0.103377 -0.055206 -v 0.014044 0.094243 -0.048868 -v 0.009826 0.082016 -0.040967 -v -0.009826 0.082016 -0.040967 -v -0.014044 0.094243 -0.048868 -v 0.000000 0.132246 0.000002 -v 0.014044 0.125572 0.000002 -v 0.009826 0.108280 0.000002 -v -0.009826 0.108280 0.000002 -v -0.014044 0.125572 0.000002 -v 0.000000 0.103377 0.055211 -v 0.014044 0.094243 0.048870 -v 0.009826 0.082016 0.040970 -v -0.009826 0.082016 0.040970 -v -0.014044 0.094243 0.048870 -v 0.000000 0.018605 0.080195 -v 0.014044 0.018605 0.069112 -v 0.009826 0.018605 0.057941 -v -0.009826 0.018605 0.057941 -v -0.014044 0.018605 0.069112 -v 0.000000 -0.065420 0.055211 -v 0.014044 -0.057032 0.048870 -v 0.009826 -0.044807 0.040970 -v -0.009826 -0.044807 0.040970 -v -0.014044 -0.057032 0.048870 -v 0.000000 -0.598329 0.000002 -v 0.061672 -0.569460 0.000002 -v 0.054590 -0.560326 0.012574 -v 0.000000 -0.591655 0.012574 -v 0.045765 -0.548099 0.008798 -v 0.000000 -0.574363 0.008798 -v 0.045765 -0.548099 -0.008794 -v 0.000000 -0.574363 -0.008794 -v 0.054590 -0.560326 -0.012569 -v 0.000000 -0.591655 -0.012569 -v 0.089582 -0.484687 0.000002 -v 0.077200 -0.484687 0.012574 -v 0.064722 -0.484687 0.008798 -v 0.064722 -0.484687 -0.008794 -v 0.077200 -0.484687 -0.012569 -v 0.061672 -0.399915 0.000002 -v 0.054590 -0.409051 0.012574 -v 0.045765 -0.421278 0.008798 -v 0.045765 -0.421278 -0.008794 -v 0.054590 -0.409051 -0.012569 -v 0.000000 -0.371048 0.000002 -v 0.000000 -0.377719 0.012574 -v 0.000000 -0.395012 0.008798 -v 0.000000 -0.395012 -0.008794 -v 0.000000 -0.377719 -0.012569 -v -0.061672 -0.399915 0.000002 -v -0.054590 -0.409051 0.012574 -v -0.045765 -0.421278 0.008798 -v -0.045765 -0.421278 -0.008794 -v -0.054590 -0.409051 -0.012569 -v -0.089582 -0.484687 0.000002 -v -0.077200 -0.484687 0.012574 -v -0.064722 -0.484687 0.008798 -v -0.064722 -0.484687 -0.008794 -v -0.077200 -0.484687 -0.012569 -v -0.061672 -0.568712 0.000002 -v -0.054590 -0.560326 0.012574 -v -0.045765 -0.548099 0.008798 -v -0.045765 -0.548099 -0.008794 -v -0.054590 -0.560326 -0.012569 -v 0.000000 0.241043 0.000002 -v 0.000000 0.269910 0.055211 -v -0.014044 0.279047 0.048870 -v -0.014044 0.247717 0.000002 -v -0.009826 0.291274 0.040970 -v -0.009826 0.265007 0.000002 -v 0.009826 0.291274 0.040970 -v 0.009826 0.265007 0.000002 -v 0.014044 0.279047 0.048870 -v 0.014044 0.247717 0.000002 -v 0.000000 0.354683 0.080195 -v -0.014044 0.354683 0.069112 -v -0.009826 0.354683 0.057941 -v 0.009826 0.354683 0.057941 -v 0.014044 0.354683 0.069112 -v 0.000000 0.439455 0.055211 -v -0.014044 0.430321 0.048870 -v -0.009826 0.418094 0.040970 -v 0.009826 0.418094 0.040970 -v 0.014044 0.430321 0.048870 -v 0.000000 0.468325 0.000002 -v -0.014044 0.461651 0.000002 -v -0.009826 0.444361 0.000002 -v 0.009826 0.444361 0.000002 -v 0.014044 0.461651 0.000002 -v 0.000000 0.439455 -0.055206 -v -0.014044 0.430321 -0.048868 -v -0.009826 0.418094 -0.040967 -v 0.009826 0.418094 -0.040967 -v 0.014044 0.430321 -0.048868 -v 0.000000 0.354683 -0.080190 -v -0.014044 0.354683 -0.069108 -v -0.009826 0.354683 -0.057936 -v 0.009826 0.354683 -0.057936 -v 0.014044 0.354683 -0.069108 -v 0.000000 0.270661 -0.055206 -v -0.014044 0.279047 -0.048868 -v -0.009826 0.291274 -0.040967 -v 0.009826 0.291274 -0.040967 -v 0.014044 0.279047 -0.048868 -vt 0.187500 0.125000 -vt 0.250000 0.125000 -vt 0.250000 0.187500 -vt 0.187500 0.187500 -vt 0.250000 0.250000 -vt 0.187500 0.250000 -vt 0.250000 0.312500 -vt 0.187500 0.312500 -vt 0.250000 0.375000 -vt 0.187500 0.375000 -vt 0.187500 0.062500 -vt 0.250000 0.062500 -vt 0.312500 0.125000 -vt 0.312500 0.187500 -vt 0.312500 0.250000 -vt 0.312500 0.312500 -vt 0.312500 0.375000 -vt 0.312500 0.062500 -vt 0.375000 0.125000 -vt 0.375000 0.187500 -vt 0.375000 0.250000 -vt 0.375000 0.312500 -vt 0.375000 0.375000 -vt 0.375000 0.062500 -vt 0.437500 0.125000 -vt 0.437500 0.187500 -vt 0.437500 0.250000 -vt 0.437500 0.312500 -vt 0.437500 0.375000 -vt 0.437500 0.062500 -vt 0.500000 0.125000 -vt 0.500000 0.187500 -vt 0.500000 0.250000 -vt 0.500000 0.312500 -vt 0.500000 0.375000 -vt 0.500000 0.062500 -vt -0.000000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.187500 -vt -0.000000 0.187500 -vt 0.062500 0.250000 -vt -0.000000 0.250000 -vt 0.062500 0.312500 -vt -0.000000 0.312500 -vt 0.062500 0.375000 -vt -0.000000 0.375000 -vt -0.000000 0.062500 -vt 0.062500 0.062500 -vt 0.125000 0.125000 -vt 0.125000 0.187500 -vt 0.125000 0.250000 -vt 0.125000 0.312500 -vt 0.125000 0.375000 -vt 0.125000 0.062500 -vt 0.750000 0.625000 -vt 0.812500 0.625000 -vt 0.812500 0.687500 -vt 0.750000 0.687500 -vt 0.750000 0.375000 -vt 0.812500 0.375000 -vt 0.812500 0.437500 -vt 0.750000 0.437500 -vt 0.812500 0.500000 -vt 0.750000 0.500000 -vt 0.812500 0.562500 -vt 0.750000 0.562500 -vt 0.875000 0.625000 -vt 0.875000 0.687500 -vt 0.875000 0.375000 -vt 0.875000 0.437500 -vt 0.875000 0.500000 -vt 0.875000 0.562500 -vt 0.937500 0.625000 -vt 0.937500 0.687500 -vt 0.937500 0.375000 -vt 0.937500 0.437500 -vt 0.937500 0.500000 -vt 0.937500 0.562500 -vt 1.000000 0.625000 -vt 1.000000 0.687500 -vt 1.000000 0.375000 -vt 1.000000 0.437500 -vt 1.000000 0.500000 -vt 1.000000 0.562500 -vt 0.500000 0.625000 -vt 0.562500 0.625000 -vt 0.562500 0.687500 -vt 0.500000 0.687500 -vt 0.562500 0.375000 -vt 0.562500 0.437500 -vt 0.500000 0.437500 -vt 0.562500 0.500000 -vt 0.500000 0.500000 -vt 0.562500 0.562500 -vt 0.500000 0.562500 -vt 0.625000 0.625000 -vt 0.625000 0.687500 -vt 0.625000 0.375000 -vt 0.625000 0.437500 -vt 0.625000 0.500000 -vt 0.625000 0.562500 -vt 0.687500 0.625000 -vt 0.687500 0.687500 -vt 0.687500 0.375000 -vt 0.687500 0.437500 -vt 0.687500 0.500000 -vt 0.687500 0.562500 -vt 0.250000 0.625000 -vt 0.312500 0.625000 -vt 0.312500 0.687500 -vt 0.250000 0.687500 -vt 0.312500 0.437500 -vt 0.250000 0.437500 -vt 0.312500 0.500000 -vt 0.250000 0.500000 -vt 0.312500 0.562500 -vt 0.250000 0.562500 -vt 0.375000 0.625000 -vt 0.375000 0.687500 -vt 0.375000 0.437500 -vt 0.375000 0.500000 -vt 0.375000 0.562500 -vt 0.437500 0.625000 -vt 0.437500 0.687500 -vt 0.437500 0.437500 -vt 0.437500 0.500000 -vt 0.437500 0.562500 -vt -0.000000 0.625000 -vt 0.062500 0.625000 -vt 0.062500 0.687500 -vt -0.000000 0.687500 -vt 0.062500 0.437500 -vt -0.000000 0.437500 -vt 0.062500 0.500000 -vt -0.000000 0.500000 -vt 0.062500 0.562500 -vt -0.000000 0.562500 -vt 0.125000 0.625000 -vt 0.125000 0.687500 -vt 0.125000 0.437500 -vt 0.125000 0.500000 -vt 0.125000 0.562500 -vt 0.187500 0.625000 -vt 0.187500 0.687500 -vt 0.187500 0.437500 -vt 0.187500 0.500000 -vt 0.187500 0.562500 -vt 0.687500 0.750000 -vt 0.750000 0.750000 -vt 0.750000 0.812500 -vt 0.687500 0.812500 -vt 0.750000 0.875000 -vt 0.687500 0.875000 -vt 0.750000 0.937500 -vt 0.687500 0.937500 -vt 0.750000 1.000000 -vt 0.687500 1.000000 -vt 0.812500 0.750000 -vt 0.812500 0.812500 -vt 0.812500 0.875000 -vt 0.812500 0.937500 -vt 0.812500 1.000000 -vt 0.875000 0.750000 -vt 0.875000 0.812500 -vt 0.875000 0.875000 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.937500 0.750000 -vt 0.937500 0.812500 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.937500 1.000000 -vt 1.000000 0.750000 -vt 1.000000 0.812500 -vt 1.000000 0.875000 -vt 1.000000 0.937500 -vt 1.000000 1.000000 -vt 0.500000 0.750000 -vt 0.562500 0.750000 -vt 0.562500 0.812500 -vt 0.500000 0.812500 -vt 0.562500 0.875000 -vt 0.500000 0.875000 -vt 0.562500 0.937500 -vt 0.500000 0.937500 -vt 0.562500 1.000000 -vt 0.500000 1.000000 -vt 0.625000 0.750000 -vt 0.625000 0.812500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.625000 1.000000 -vt 0.750000 0.312500 -vt 0.812500 0.312500 -vt 0.750000 0.062500 -vt 0.812500 0.062500 -vt 0.812500 0.125000 -vt 0.750000 0.125000 -vt 0.812500 0.187500 -vt 0.750000 0.187500 -vt 0.812500 0.250000 -vt 0.750000 0.250000 -vt 0.875000 0.312500 -vt 0.875000 0.062500 -vt 0.875000 0.125000 -vt 0.875000 0.187500 -vt 0.875000 0.250000 -vt 0.937500 0.312500 -vt 0.937500 0.062500 -vt 0.937500 0.125000 -vt 0.937500 0.187500 -vt 0.937500 0.250000 -vt 1.000000 0.312500 -vt 1.000000 0.062500 -vt 1.000000 0.125000 -vt 1.000000 0.187500 -vt 1.000000 0.250000 -vt 0.562500 0.312500 -vt 0.562500 0.062500 -vt 0.562500 0.125000 -vt 0.562500 0.187500 -vt 0.562500 0.250000 -vt 0.625000 0.312500 -vt 0.625000 0.062500 -vt 0.625000 0.125000 -vt 0.625000 0.187500 -vt 0.625000 0.250000 -vt 0.687500 0.312500 -vt 0.687500 0.062500 -vt 0.687500 0.125000 -vt 0.687500 0.187500 -vt 0.687500 0.250000 -vt 0.250000 0.937500 -vt 0.312500 0.937500 -vt 0.312500 1.000000 -vt 0.250000 1.000000 -vt 0.312500 0.750000 -vt 0.250000 0.750000 -vt 0.312500 0.812500 -vt 0.250000 0.812500 -vt 0.312500 0.875000 -vt 0.250000 0.875000 -vt 0.375000 0.937500 -vt 0.375000 1.000000 -vt 0.375000 0.750000 -vt 0.375000 0.812500 -vt 0.375000 0.875000 -vt 0.437500 0.937500 -vt 0.437500 1.000000 -vt 0.437500 0.750000 -vt 0.437500 0.812500 -vt 0.437500 0.875000 -vt 0.000000 0.937500 -vt 0.062500 0.937500 -vt 0.062500 1.000000 -vt 0.000000 1.000000 -vt 0.062500 0.750000 -vt 0.000000 0.750000 -vt 0.062500 0.812500 -vt 0.000000 0.812500 -vt 0.062500 0.875000 -vt 0.000000 0.875000 -vt 0.125000 0.937500 -vt 0.125000 1.000000 -vt 0.125000 0.750000 -vt 0.125000 0.812500 -vt 0.125000 0.875000 -vt 0.187500 0.937500 -vt 0.187500 1.000000 -vt 0.187500 0.750000 -vt 0.187500 0.812500 -vt 0.187500 0.875000 -vn 0.000000 -1.000000 -0.004800 -vn 0.000000 -0.657400 0.753500 -vn -0.898300 -0.248500 0.362300 -vn -0.863600 -0.504100 -0.003400 -vn -0.661500 0.421500 -0.620200 -vn -0.746000 0.665900 0.000000 -vn 0.661500 0.421500 -0.620200 -vn 0.746000 0.665900 0.000000 -vn 0.898300 -0.248500 0.362300 -vn 0.863600 -0.504100 -0.003400 -vn 0.000000 0.000000 1.000000 -vn -0.925200 0.000000 0.379500 -vn -0.617100 0.000000 -0.786900 -vn 0.617100 0.000000 -0.786900 -vn 0.925200 0.000000 0.379500 -vn 0.000000 0.657400 0.753500 -vn -0.898300 0.248400 0.362300 -vn -0.661500 -0.421500 -0.620200 -vn 0.661500 -0.421500 -0.620200 -vn 0.898300 0.248400 0.362300 -vn 0.000000 1.000000 0.000000 -vn -0.866100 0.499800 0.000000 -vn -0.746000 -0.665900 0.000000 -vn 0.746000 -0.665900 0.000000 -vn 0.866100 0.499800 0.000000 -vn 0.000000 0.657400 -0.753500 -vn -0.898300 0.248400 -0.362400 -vn -0.661600 -0.421500 0.620200 -vn 0.661500 -0.421500 0.620200 -vn 0.898300 0.248400 -0.362300 -vn 0.000000 -0.000900 -1.000000 -vn -0.924600 -0.000600 -0.380700 -vn -0.617100 0.000000 0.786900 -vn 0.617100 0.000000 0.786900 -vn 0.924700 -0.000600 -0.380700 -vn 0.000000 -0.650300 -0.759600 -vn -0.895600 -0.254600 -0.364800 -vn -0.661600 0.421500 0.620200 -vn 0.661600 0.421500 0.620200 -vn 0.895600 -0.254600 -0.364800 -vn 0.004900 -1.000000 0.000000 -vn -0.729700 -0.683800 0.000000 -vn -0.324500 -0.256300 -0.910500 -vn 0.003300 -0.475500 -0.879700 -vn 0.578700 0.436200 -0.689100 -vn 0.000000 0.666600 -0.745400 -vn 0.578700 0.436200 0.689100 -vn 0.000000 0.666600 0.745400 -vn -0.324500 -0.256300 0.910500 -vn 0.003300 -0.475500 0.879700 -vn -1.000000 0.000000 0.000000 -vn -0.359600 0.000000 -0.933100 -vn 0.756400 0.000000 -0.654100 -vn 0.756400 0.000000 0.654100 -vn -0.359600 0.000000 0.933100 -vn -0.729700 0.683700 0.000000 -vn -0.324500 0.256300 -0.910500 -vn 0.578700 -0.436200 -0.689100 -vn 0.578700 -0.436200 0.689100 -vn -0.324500 0.256300 0.910500 -vn 0.000000 0.470900 -0.882200 -vn 0.000000 -0.666600 -0.745400 -vn 0.000000 -0.666600 0.745400 -vn 0.000000 0.470900 0.882200 -vn 0.729700 0.683700 0.000000 -vn 0.324500 0.256300 -0.910500 -vn -0.578700 -0.436200 -0.689100 -vn -0.578700 -0.436200 0.689100 -vn 0.324500 0.256300 0.910500 -vn 1.000000 -0.001100 0.000000 -vn 0.361000 -0.000700 -0.932600 -vn -0.756400 0.000000 -0.654100 -vn -0.756400 0.000000 0.654100 -vn 0.361000 -0.000700 0.932600 -vn 0.736100 -0.676800 0.000000 -vn 0.327100 -0.263100 -0.907600 -vn -0.578700 0.436200 -0.689100 -vn -0.578700 0.436200 0.689100 -vn 0.327100 -0.263100 0.907600 -vn -0.004900 -1.000000 0.000000 -vn 0.729700 -0.683800 0.000000 -vn 0.324500 -0.256300 0.910500 -vn -0.003300 -0.475400 0.879700 -vn 0.324500 -0.256300 -0.910500 -vn -0.003300 -0.475400 -0.879700 -vn 1.000000 0.000000 0.000000 -vn 0.359600 0.000000 0.933100 -vn 0.359600 0.000000 -0.933100 -vn -1.000000 -0.001100 0.000000 -vn -0.361000 -0.000700 0.932600 -vn -0.361000 -0.000700 -0.932600 -vn -0.736100 -0.676800 0.000000 -vn -0.327100 -0.263100 0.907600 -vn -0.327100 -0.263100 -0.907600 -vn 0.000000 -1.000000 0.004800 -vn 0.000000 -0.657400 -0.753500 -vn 0.898300 -0.248500 -0.362400 -vn 0.863600 -0.504100 0.003400 -vn -0.898300 -0.248500 -0.362400 -vn -0.863600 -0.504100 0.003400 -vn 0.000000 0.000000 -1.000000 -vn 0.925200 0.000000 -0.379500 -vn -0.925200 0.000000 -0.379500 -vn 0.898300 0.248500 -0.362400 -vn 0.661600 -0.421500 0.620200 -vn -0.898300 0.248500 -0.362400 -vn 0.898300 0.248500 0.362300 -vn -0.898300 0.248500 0.362300 -vn 0.000000 -0.000900 1.000000 -vn 0.924700 -0.000600 0.380700 -vn -0.924700 -0.000600 0.380700 -vn 0.000000 -0.650300 0.759600 -vn 0.895600 -0.254600 0.364700 -vn -0.895600 -0.254600 0.364700 -vn 0.729700 -0.683700 0.000000 -vn 0.729700 0.683800 0.000000 -vn -0.729700 0.683800 0.000000 -vn -0.898300 -0.248400 0.362300 -vn -0.863600 -0.504100 -0.003500 -vn 0.898300 -0.248400 0.362300 -vn 0.863600 -0.504100 -0.003500 -vn -0.661500 -0.421500 0.620200 -vn 0.924600 -0.000600 -0.380700 -vn -0.661500 0.421500 0.620200 -vn 0.661500 0.421500 0.620200 -s 1 -f 1/1/1 2/2/2 3/3/3 4/4/4 -f 4/4/4 3/3/3 5/5/5 6/6/6 -f 6/6/6 5/5/5 7/7/7 8/8/8 -f 8/8/8 7/7/7 9/9/9 10/10/10 -f 1/1/1 10/11/10 9/12/9 2/2/2 -f 2/2/2 11/13/11 12/14/12 3/3/3 -f 3/3/3 12/14/12 13/15/13 5/5/5 -f 5/5/5 13/15/13 14/16/14 7/7/7 -f 7/7/7 14/16/14 15/17/15 9/9/9 -f 9/12/9 15/18/15 11/13/11 2/2/2 -f 11/13/11 16/19/16 17/20/17 12/14/12 -f 12/14/12 17/20/17 18/21/18 13/15/13 -f 13/15/13 18/21/18 19/22/19 14/16/14 -f 14/16/14 19/22/19 20/23/20 15/17/15 -f 15/18/15 20/24/20 16/19/16 11/13/11 -f 16/19/16 21/25/21 22/26/22 17/20/17 -f 17/20/17 22/26/22 23/27/23 18/21/18 -f 18/21/18 23/27/23 24/28/24 19/22/19 -f 19/22/19 24/28/24 25/29/25 20/23/20 -f 20/24/20 25/30/25 21/25/21 16/19/16 -f 21/25/21 26/31/26 27/32/27 22/26/22 -f 22/26/22 27/32/27 28/33/28 23/27/23 -f 23/27/23 28/33/28 29/34/29 24/28/24 -f 24/28/24 29/34/29 30/35/30 25/29/25 -f 25/30/25 30/36/30 26/31/26 21/25/21 -f 26/37/26 31/38/31 32/39/32 27/40/27 -f 27/40/27 32/39/32 33/41/33 28/42/28 -f 28/42/28 33/41/33 34/43/34 29/44/29 -f 29/44/29 34/43/34 35/45/35 30/46/30 -f 30/47/30 35/48/35 31/38/31 26/37/26 -f 31/38/31 36/49/36 37/50/37 32/39/32 -f 32/39/32 37/50/37 38/51/38 33/41/33 -f 33/41/33 38/51/38 39/52/39 34/43/34 -f 34/43/34 39/52/39 40/53/40 35/45/35 -f 35/48/35 40/54/40 36/49/36 31/38/31 -f 36/49/36 1/1/1 4/4/4 37/50/37 -f 37/50/37 4/4/4 6/6/6 38/51/38 -f 38/51/38 6/6/6 8/8/8 39/52/39 -f 39/52/39 8/8/8 10/10/10 40/53/40 -f 1/1/1 36/49/36 40/54/40 10/11/10 -f 41/55/41 42/56/42 43/57/43 44/58/44 -f 44/59/44 43/60/43 45/61/45 46/62/46 -f 46/62/46 45/61/45 47/63/47 48/64/48 -f 48/64/48 47/63/47 49/65/49 50/66/50 -f 41/55/41 50/66/50 49/65/49 42/56/42 -f 42/56/42 51/67/51 52/68/52 43/57/43 -f 43/60/43 52/69/52 53/70/53 45/61/45 -f 45/61/45 53/70/53 54/71/54 47/63/47 -f 47/63/47 54/71/54 55/72/55 49/65/49 -f 49/65/49 55/72/55 51/67/51 42/56/42 -f 51/67/51 56/73/56 57/74/57 52/68/52 -f 52/69/52 57/75/57 58/76/58 53/70/53 -f 53/70/53 58/76/58 59/77/59 54/71/54 -f 54/71/54 59/77/59 60/78/60 55/72/55 -f 55/72/55 60/78/60 56/73/56 51/67/51 -f 56/73/56 61/79/21 62/80/61 57/74/57 -f 57/75/57 62/81/61 63/82/62 58/76/58 -f 58/76/58 63/82/62 64/83/63 59/77/59 -f 59/77/59 64/83/63 65/84/64 60/78/60 -f 60/78/60 65/84/64 61/79/21 56/73/56 -f 61/85/21 66/86/65 67/87/66 62/88/61 -f 62/35/61 67/89/66 68/90/67 63/91/62 -f 63/91/62 68/90/67 69/92/68 64/93/63 -f 64/93/63 69/92/68 70/94/69 65/95/64 -f 65/95/64 70/94/69 66/86/65 61/85/21 -f 66/86/65 71/96/70 72/97/71 67/87/66 -f 67/89/66 72/98/71 73/99/72 68/90/67 -f 68/90/67 73/99/72 74/100/73 69/92/68 -f 69/92/68 74/100/73 75/101/74 70/94/69 -f 70/94/69 75/101/74 71/96/70 66/86/65 -f 71/96/70 76/102/75 77/103/76 72/97/71 -f 72/98/71 77/104/76 78/105/77 73/99/72 -f 73/99/72 78/105/77 79/106/78 74/100/73 -f 74/100/73 79/106/78 80/107/79 75/101/74 -f 75/101/74 80/107/79 76/102/75 71/96/70 -f 76/102/75 41/55/41 44/58/44 77/103/76 -f 77/104/76 44/59/44 46/62/46 78/105/77 -f 78/105/77 46/62/46 48/64/48 79/106/78 -f 79/106/78 48/64/48 50/66/50 80/107/79 -f 41/55/41 76/102/75 80/107/79 50/66/50 -f 81/108/80 82/109/81 83/110/82 84/111/83 -f 84/9/83 83/17/82 85/112/78 86/113/48 -f 86/113/48 85/112/78 87/114/77 88/115/46 -f 88/115/46 87/114/77 89/116/84 90/117/85 -f 81/108/80 90/117/85 89/116/84 82/109/81 -f 82/109/81 91/118/86 92/119/87 83/110/82 -f 83/17/82 92/23/87 93/120/73 85/112/78 -f 85/112/78 93/120/73 94/121/72 87/114/77 -f 87/114/77 94/121/72 95/122/88 89/116/84 -f 89/116/84 95/122/88 91/118/86 82/109/81 -f 91/118/86 96/123/65 97/124/69 92/119/87 -f 92/23/87 97/29/69 98/125/68 93/120/73 -f 93/120/73 98/125/68 99/126/67 94/121/72 -f 94/121/72 99/126/67 100/127/66 95/122/88 -f 95/122/88 100/127/66 96/123/65 91/118/86 -f 96/123/65 101/85/21 102/88/64 97/124/69 -f 97/29/69 102/35/64 103/91/63 98/125/68 -f 98/125/68 103/91/63 104/93/62 99/126/67 -f 99/126/67 104/93/62 105/95/61 100/127/66 -f 100/127/66 105/95/61 101/85/21 96/123/65 -f 101/128/21 106/129/56 107/130/60 102/131/64 -f 102/46/64 107/45/60 108/132/59 103/133/63 -f 103/133/63 108/132/59 109/134/58 104/135/62 -f 104/135/62 109/134/58 110/136/57 105/137/61 -f 105/137/61 110/136/57 106/129/56 101/128/21 -f 106/129/56 111/138/89 112/139/90 107/130/60 -f 107/45/60 112/53/90 113/140/54 108/132/59 -f 108/132/59 113/140/54 114/141/53 109/134/58 -f 109/134/58 114/141/53 115/142/91 110/136/57 -f 110/136/57 115/142/91 111/138/89 106/129/56 -f 111/138/89 116/143/92 117/144/93 112/139/90 -f 112/53/90 117/10/93 118/145/47 113/140/54 -f 113/140/54 118/145/47 119/146/45 114/141/53 -f 114/141/53 119/146/45 120/147/94 115/142/91 -f 115/142/91 120/147/94 116/143/92 111/138/89 -f 116/143/92 81/108/80 84/111/83 117/144/93 -f 117/10/93 84/9/83 86/113/48 118/145/47 -f 118/145/47 86/113/48 88/115/46 119/146/45 -f 119/146/45 88/115/46 90/117/85 120/147/94 -f 81/108/80 116/143/92 120/147/94 90/117/85 -f 121/148/95 122/149/96 123/150/97 124/151/98 -f 124/151/98 123/150/97 125/152/39 126/153/8 -f 126/153/8 125/152/39 127/154/38 128/155/6 -f 128/155/6 127/154/38 129/156/99 130/157/100 -f 121/148/95 130/103/100 129/58/99 122/149/96 -f 122/149/96 131/158/101 132/159/102 123/150/97 -f 123/150/97 132/159/102 133/160/34 125/152/39 -f 125/152/39 133/160/34 134/161/33 127/154/38 -f 127/154/38 134/161/33 135/162/103 129/156/99 -f 129/58/99 135/57/103 131/158/101 122/149/96 -f 131/158/101 136/163/26 137/164/104 132/159/102 -f 132/159/102 137/164/104 138/165/105 133/160/34 -f 133/160/34 138/165/105 139/166/28 134/161/33 -f 134/161/33 139/166/28 140/167/106 135/162/103 -f 135/57/103 140/68/106 136/163/26 131/158/101 -f 136/163/26 141/168/21 142/169/25 137/164/104 -f 137/164/104 142/169/25 143/170/24 138/165/105 -f 138/165/105 143/170/24 144/171/23 139/166/28 -f 139/166/28 144/171/23 145/172/22 140/167/106 -f 140/68/106 145/74/22 141/168/21 136/163/26 -f 141/168/21 146/173/16 147/174/107 142/169/25 -f 142/169/25 147/174/107 148/175/19 143/170/24 -f 143/170/24 148/175/19 149/176/18 144/171/23 -f 144/171/23 149/176/18 150/177/108 145/172/22 -f 145/74/22 150/80/108 146/173/16 141/168/21 -f 146/178/16 151/179/109 152/180/110 147/181/107 -f 147/181/107 152/180/110 153/182/14 148/183/19 -f 148/183/19 153/182/14 154/184/13 149/185/18 -f 149/185/18 154/184/13 155/186/111 150/187/108 -f 150/88/108 155/87/111 151/179/109 146/178/16 -f 151/179/109 156/188/112 157/189/113 152/180/110 -f 152/180/110 157/189/113 158/190/7 153/182/14 -f 153/182/14 158/190/7 159/191/5 154/184/13 -f 154/184/13 159/191/5 160/192/114 155/186/111 -f 155/87/111 160/97/114 156/188/112 151/179/109 -f 156/188/112 121/148/95 124/151/98 157/189/113 -f 157/189/113 124/151/98 126/153/8 158/190/7 -f 158/190/7 126/153/8 128/155/6 159/191/5 -f 159/191/5 128/155/6 130/157/100 160/192/114 -f 121/148/95 156/188/112 160/97/114 130/103/100 -f 161/193/80 162/194/115 163/60/82 164/59/83 -f 164/195/83 163/196/82 165/197/78 166/198/48 -f 166/198/48 165/197/78 167/199/77 168/200/46 -f 168/200/46 167/199/77 169/201/84 170/202/85 -f 161/193/80 170/202/85 169/201/84 162/194/115 -f 162/194/115 171/203/86 172/69/87 163/60/82 -f 163/196/82 172/204/87 173/205/73 165/197/78 -f 165/197/78 173/205/73 174/206/72 167/199/77 -f 167/199/77 174/206/72 175/207/88 169/201/84 -f 169/201/84 175/207/88 171/203/86 162/194/115 -f 171/203/86 176/208/116 177/75/69 172/69/87 -f 172/204/87 177/209/69 178/210/68 173/205/73 -f 173/205/73 178/210/68 179/211/67 174/206/72 -f 174/206/72 179/211/67 180/212/66 175/207/88 -f 175/207/88 180/212/66 176/208/116 171/203/86 -f 176/208/116 181/213/21 182/81/64 177/75/69 -f 177/209/69 182/214/64 183/215/63 178/210/68 -f 178/210/68 183/215/63 184/216/62 179/211/67 -f 179/211/67 184/216/62 185/217/61 180/212/66 -f 180/212/66 185/217/61 181/213/21 176/208/116 -f 181/34/21 186/218/117 187/89/60 182/35/64 -f 182/36/64 187/219/60 188/220/59 183/31/63 -f 183/31/63 188/220/59 189/221/58 184/32/62 -f 184/32/62 189/221/58 190/222/57 185/33/61 -f 185/33/61 190/222/57 186/218/117 181/34/21 -f 186/218/117 191/223/89 192/98/90 187/89/60 -f 187/219/60 192/224/90 193/225/54 188/220/59 -f 188/220/59 193/225/54 194/226/53 189/221/58 -f 189/221/58 194/226/53 195/227/91 190/222/57 -f 190/222/57 195/227/91 191/223/89 186/218/117 -f 191/223/89 196/228/92 197/104/93 192/98/90 -f 192/224/90 197/229/93 198/230/47 193/225/54 -f 193/225/54 198/230/47 199/231/45 194/226/53 -f 194/226/53 199/231/45 200/232/94 195/227/91 -f 195/227/91 200/232/94 196/228/92 191/223/89 -f 196/228/92 161/193/80 164/59/83 197/104/93 -f 197/229/93 164/195/83 166/198/48 198/230/47 -f 198/230/47 166/198/48 168/200/46 199/231/45 -f 199/231/45 168/200/46 170/202/85 200/232/94 -f 161/193/80 196/228/92 200/232/94 170/202/85 -f 201/233/1 202/234/2 203/235/118 204/236/119 -f 204/111/119 203/110/118 205/237/5 206/238/6 -f 206/238/6 205/237/5 207/239/7 208/240/8 -f 208/240/8 207/239/7 209/241/120 210/242/121 -f 201/233/1 210/242/121 209/241/120 202/234/2 -f 202/234/2 211/243/11 212/244/12 203/235/118 -f 203/110/118 212/119/12 213/245/13 205/237/5 -f 205/237/5 213/245/13 214/246/14 207/239/7 -f 207/239/7 214/246/14 215/247/15 209/241/120 -f 209/241/120 215/247/15 211/243/11 202/234/2 -f 211/243/11 216/248/16 217/249/108 212/244/12 -f 212/119/12 217/124/108 218/250/18 213/245/13 -f 213/245/13 218/250/18 219/251/19 214/246/14 -f 214/246/14 219/251/19 220/252/107 215/247/15 -f 215/247/15 220/252/107 216/248/16 211/243/11 -f 216/248/16 221/185/21 222/187/22 217/249/108 -f 217/124/108 222/88/22 223/178/23 218/250/18 -f 218/250/18 223/178/23 224/181/24 219/251/19 -f 219/251/19 224/181/24 225/183/25 220/252/107 -f 220/252/107 225/183/25 221/185/21 216/248/16 -f 221/253/21 226/254/26 227/255/106 222/256/22 -f 222/131/22 227/130/106 228/257/122 223/258/23 -f 223/258/23 228/257/122 229/259/29 224/260/24 -f 224/260/24 229/259/29 230/261/104 225/262/25 -f 225/262/25 230/261/104 226/254/26 221/253/21 -f 226/254/26 231/263/31 232/264/32 227/255/106 -f 227/130/106 232/139/32 233/265/33 228/257/122 -f 228/257/122 233/265/33 234/266/34 229/259/29 -f 229/259/29 234/266/34 235/267/123 230/261/104 -f 230/261/104 235/267/123 231/263/31 226/254/26 -f 231/263/31 236/268/36 237/269/37 232/264/32 -f 232/139/32 237/144/37 238/270/124 233/265/33 -f 233/265/33 238/270/124 239/271/125 234/266/34 -f 234/266/34 239/271/125 240/272/40 235/267/123 -f 235/267/123 240/272/40 236/268/36 231/263/31 -f 236/268/36 201/233/1 204/236/119 237/269/37 -f 237/144/37 204/111/119 206/238/6 238/270/124 -f 238/270/124 206/238/6 208/240/8 239/271/125 -f 239/271/125 208/240/8 210/242/121 240/272/40 -f 201/233/1 236/268/36 240/272/40 210/242/121 diff --git a/chains/textures/chain_brass_inv.png b/chains/textures/chain_brass_inv.png deleted file mode 100644 index 8c2d554d12e7d50494fb3195252656a25aeb9def..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1886 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 Y0yypkc?hzDnE(I)07*qoM6N<$g3I$jPXGV_ diff --git a/chains/textures/chains_brass.png b/chains/textures/chains_brass.png deleted file mode 100644 index e2fb20db635f02d15a59c1acb9edbeb3dc50fbe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK_nP)PaSEs~+5-g}BgBNsAF?|hB z60Hg4>>r2kd_Opu(tc7|jq-+)nX@Ooolwe=RzB3@xpD3B=PR}7rp;k?s|v?O<9FSG z{q#;x#d!bqLCghuMQ;2a_0jXjdCg8{8}77(bQoz?;J#}yKV7#RdN+B48=dHv!cs0E z^PE=o+}2zZc0}570msCq-P>w4Hv3Gv^hOm9%O-l;f8NYN|G3h!Lwik-wvaY_RbWt# zh|fV*2>DFVd)Yj@w5N(L#lddEEK|000G`Lp(kwM&;3@eH|LB z)Jg^xu82|Do&LsnDkHkwpO=46QzU1yvstertROF(97WERf`y!X+DMP<} zAd1j?!R$ZzD2XEMJQQPZ8q>#Eyvo!`k;~$=eS6GIicwg;D_*hJrnW9}IIwt+URC6B z=Qz)PLXY`NB8RziES+cmOS-E(za?^*J!xOpz~Xt4!~*;PG1F(oD@yl74vjSfr3ds{w3{M_r5~wH+p{lnxsX_yM1{2(k;BrLe3Q8T4?1<0 zrbG_2U$8Y#yGr?{$Yo>6KzB(LrThb*Cowkmiiy98mmEuCRB9VEw$MY1?ykr|7d`a! zMJ~_J+qb7Lawy&9Tw?KCb{1*X*sX|BsV`Ew&E&i2iChkw`H#q@x<+r6^4FY6q6iO9 ziLtTY@lq6}G|ygFv8glq3nTQ=~`5t>iLs2o_m#m=h8 z<*>)6MJ|hTY)`QAZ%!pqgsFGL*x2v*Byl2%BFtT8cb(fO#i-b#UZ%03FLHQ#iQPr& zcMQyaCvxa6vw4RHr|EV?F7{Ao{w$V6F3;!uMsrEz@bC_*tW5A$5=FR>#Mqn2>VHL1 zYKzzwMc6YCIZPkpVxm!^{esq_$l5Ci= zyMKaiOXSe1(_P|P5=FU`#MmFt`V1+FqV#>1L=hTwT3ezBx6j(QD~fQSSrfTD{?)+t zhA2Y2p)YbMKfyZBexkWxU}0X2%7L5j)2Y*3WpiDO%3+t^61g;Y*to)##8*ia;riQR zZ0vWm%AzRibLfg9y!csPZQ++Wi2X-G}mv@rLLC?M> z6G`NM>Y@nkUCNg@mqbzSpA=(%EGcm^iPvHIJZFRZSm@(9BiBV}hp!bxWWvXl3x+Zeyn>s>e zK@{PzZb0Ucxt|n>^P!YLoPSag9aPfVSOJ8l4&N|P}i(J;98oHcB5qf2Qd7C3i6rnOJ z#{PIxA|+9TFA}$pa_g8VLVFH9QG|L~UyMrS3H1`&&(P5qIqXy&7DbppWuRLUxjdVo zHchLHU6IR^tJuQ^?HQ5Fd&$t#3!(_R+&eCcvO6cn{_1?2#OqL=6tB4WzQ|$eBJB#z z3OkFmn<9sH$8R(nB8T!kOQ#IgcSR1jK4#-G3twYbU*zyp;@Ugh_?LmbuE=5LGg{jQ zzDlA98qA*%MX5jLlO+Dyq$FO4&ypz0yNR10ilUrKJp4ku4x2Z`ORoN16v4WIW=Z65 z^EjO~G#rQ=dR}Q8s#in~k58j(sM!*u@?+xpcQiM6bOUV`=f$WfGkugsnP!#kHIaig sLpR?QMX<@rS&k=Bgq;;mCh>p#4}_TE3?}q|B>(^b07*qoM6N<$g8jAOoB#j- diff --git a/chains/textures/chains_wrought_iron.png b/chains/textures/chains_wrought_iron.png deleted file mode 100644 index 29af8dbd54baeb8ec725dce44e97f7e791e9802d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmV-|0e$|7P)ZwV5Jcx+R8ZNG<+3QqB8nnJQ(~n|8U6o{NQ2Mw$V^Yu_cZy299fIRQF31|L#r#| zzA0b*`FcoCsaHi-F7(7v19Ki*i`8;Mo+gFneB&tCU8>FFTEFkzSCt$S7n9Ugx1JW; z3tyLnAwx`?m4Z<&45)vv^{a31=dw=RGB7ZQH~tStUz0pt8V*uNEdrw}J&qesS)PH^Z(^bdRhjHd>YkLWAq06o|L!Qu-p+<5#rUFUc zecLz1e(mgI8^)Qhe-0dF>Z;SvBS8fK2uz;02I?jg@P---K#N8uo;DMPgkwyGEO|)J z+dyy^+4%ktL~d`4G3FkkXP$=bX)A6`NgQvkAL4j({Se2S>xVerTtCF|=K3LyH`fnw gyt#ge;O9z_@|)LT`Cf@8&U3Jo%tP=o4yxX<0usFs;iT00Vm5+`u2%N= z;J#}K_M>x6WAD^t0czck)4Iz93Z`Y+)%Hoe)`xk?0)KY{BMS!|MZ+ZA00000NkvXX Hu0mjf!x@x% diff --git a/chains/textures/chains_candle.png b/homedecor/textures/homedecor_candle_flat.png similarity index 100% rename from chains/textures/chains_candle.png rename to homedecor/textures/homedecor_candle_flat.png diff --git a/homedecor/textures/homedecor_chainlink_brass.png b/homedecor/textures/homedecor_chainlink_brass.png deleted file mode 100644 index 9a1ad87e5c4ec6bedb9fa3fcb8bf9c36b2841a57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=2k^8k@U}4@@yTw<_e> zl@)7JuCE4)GL{7S1v5B2yO9Ru_<6cGhH%KT9(3etHV|MqurTLclfJ;Oh9$Fh@A{^< z;{X3HV+MwRdBQvTS$DXyzI>(N-KXtxU**TObheBA+nWB{sdS{V1)3_Jdt ZY;yS)^B@^VH=qj`JYD@<);T3K0RX*6Kz#rJ diff --git a/homedecor/textures/homedecor_copper_strip.png b/homedecor/textures/homedecor_copper_strip.png deleted file mode 100644 index 22e572a1a2862e0a2e18c88cd4446e168a463616..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmV-M0lEH(P)Y`8QRl6>1%B6N=CI;5pv6_`|C`xS z|39tB`Tu28&HpzWTK<37J>~!1O;i6r**fk2mBnrUcXww0JJp-=X?d3G`^9mlXICZ} zm%|Mxwv_z;c245|&#Mdn|J>gA|KH&$|NmWB@&EtrtzZmdgTz2`AT^JsME$R_mH7`h zpvhI?-}-FF{}UqZ{$H6s`C!ZX{nYTeq`B4b~ Y0Jhw^anS{dXaE2J07*qoM6N<$f(d7-Z~y=R diff --git a/homedecor/textures/homedecor_copper_wire.png b/homedecor/textures/homedecor_copper_wire.png deleted file mode 100644 index 676e98fa59a75c271f5ac0c9e55dcb383f6b347f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmV+?0oeYDP)TZej{9K@l1*gq(^T0SXEqB@(7c8f)v2S#P4Du#jwmNzndo zH2PmpvwtB_QGZZXy~q?r(MiBhbJH|bRRus%6y$k68Un!UYN>sRh+1paTB{;5*u6ZL zzmt}WLeHsO6a#bIA12cotH(Q1b46-mu1&Z8Y(35&X#J7NbjE1F_M_%zJ||6LvLqo( z4FEfF>|Ga9uh;xZu&Lii30w$)v>s^#3I1^dLzbA1AcEcAAhj_C tqE}E={chq(mCyCy{^@N{<>1d0tS?zuCGzD84+A%SN8|~`8*?WpMgfpa5~kR)YHQlO^dK*b=XraB`4f5$N;C&`1$k|s zef)*gf8GH9tlqubS59wCjXYtw|Ge&-sjcs%u9v!caTa(!^tZpfVcx$fzAL*Q8e9iD Ol)=;0&t;ucLK6VKXII() diff --git a/homedecor/textures/homedecor_heating_element.png b/homedecor/textures/homedecor_heating_element.png deleted file mode 100644 index 42e00b7a9075466bdc4969f074798f07debab6b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)|qX6 z@{*qEs#o=@suPJ}+gEYYz8q@%erhbw%@Y%z2L?Xw`&Ix6fCPq+KnNN5pJyi#FX(u) zqTotUTJ%Da!c>y5y#%-vhd2^9(<3Nn#=Cu6LU6yK2>Vm++p!MIf7n(;bPwu#KH7PM zcER9$E=6<#%Bw0KNp081^|D9wIewfOJRRt0i7n}VAOyib1eL79#eB+5&=9>G-_??b z*CWkr9TH}~T~mZx0<{-KyI{Sv;Ndg>+eBAYT}EeSi8IDvdJK0nJ!5R;y6RO>o{4%!RUSCcpnSb?EjDXgu~oqow_# P00000NkvXXu0mjfbef`4 diff --git a/homedecor/textures/homedecor_ic.png b/homedecor/textures/homedecor_ic.png deleted file mode 100644 index 4c8889451813f0c8727e0efac36ff761b5f047fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU!KjfKP~P za74IgfWMQMm#dGDPe`zDXlQU$l(V)`Gl7#ae!VaIKe&p=APB*-uL zKVHCaR!*bvb8f^mY(D}5g$--J~2#QIM$&r{Q^96y+6-Y#45 zTFOgP#I;eyQ>IYH*{d?W;OJ$Oz5EG1j`zR2TsArJ`Od^t$-d<+0!^y=VrSeF)*iL! zQ@Ico&!QeEa#z)ud&4?y&S|NNj@L^yPJdGJxO|24kiinYIS+KwDtcC}+P5p=ASdUy vTK3Jkx0#vV3)XFQd7uBqTIGFkor(M*_EfD+S3VsC`h>yL)z4*}Q$iB}YXn`L diff --git a/homedecor/textures/homedecor_oil_extract.png b/homedecor/textures/homedecor_oil_extract.png deleted file mode 100644 index e34623d0551bbf2334f46393b2a66ade0ca7b8b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1966 zcmV;f2T}NmP))Rd!KV>=4LXXt)b124^d+!s8kw|Fe7L~6^YPd(_)Klv4VXQ`XDIycx03ad|5pJ~IZ~(kls0c)4hflp3Y5<-){$j&g zI$(?)H74_wm_W=RqMdB*SB4sZI7+_koVm-nl~8A5IOkxQp{kFcn4SCZPy#SLJ+mK# zuUhLu=I+NbGmNz$qA~CFdqW4nGsjLgiReh+%)avK7g~^IgA79iV*2EX*}2Du3IJow zA#3Sq5I7XE-{)_@#(;=e6i1(*ed)kZ05Cm0vp-G!BgPo?u6}PQ7-L|vt#OQ?-{15A zJag=1lMR2#F!lw3U3K-l!XaY;M6vhy%-nZ3Hv?2Z4d83W7#L&MOniu_%mM~*`1#qF zKC>wSc>3wty#SuDhTxomF(xm321t^!yr2k$@0>b)W@1wTFg-mpN=)}M(=KKP5ko|f zrfJvZz3)G%d`AEPQS439^xK;X0AuKmg8J6-nz7$6MJ};`RrPZxX6KG<3IL8hd+I|4 z^^GAg8*uJS*H1R9YJ!5gSO8#5LHFfj*B5{%pPFHx%Ga4`R}ffO7a|B7utCtdj0<7I z23!~d!~<81s`@b(hL2TUGFJ+KW14b~j|PnfTsVqwWCSh@!N!8f0LU1iqEOL6;-Sm} z25^{(kJJ)?Q>V{Ngrkio!o~=~umNjr*6bM6+47|5Y9LRfa-k03>O;&l$7R zI+u$WRWC6rh@)tmPyB6l41s+`%rZ0R8jl=^Y4zkNXMj%<5Of?wmE{GMoeL23CUmy2 z!P{NL1oa9+c2ChMR`F0#hzfj?bXw;CwiD4!wF3aaM_0fYboB+|72ao#l6ZLUb7wP$ zeJW+=p`bujchnJp-93V}Ce?i+`AQ3*inNm%YO(dLHq1orG=PZql%3CdeJhu$0-B}6 zK1q;75yYomPOjWfcrP$jwK+XKGg=!4oH~7GLcBLcH5Y~sLEzx5fwNg5#B5-#0W(0v zD7OMc01<)rf;9CINf1RTk|ajE9bg z7EQ@CK!gBD=UyU0v)QB|4C}KCT)w>63sf04@lS6Y0Pq6>8HJ7j2%!l3$GH~u{<5eps>oYjjm@zqOr9pf#>1mvib%4#NfwJP zPZ)e+%=#VRlNOX9PL7g<0q_A)q;_`)qPX!U# zSv{nT;*Bx|Y8aR_c*mke6>T6Q2U`i>#6!_T=Ykt5RCo;UgIhoODtluh+q2gXSvwWv rlxFN&(J)=jtZ0kTh2#0x-pREfDC$N*K|~Z4L`Bdur1ORjbfHC|ln#V!@?U;3x!wNy#c})~ zE(_bXeKbvD7eygNnx@ui;WSOQ%F=b6kgKYavMfJCuxW(DFvvKLI`@6AApr6`--jrR zcM2#(Fwe8B>nh8#Xb4Vl@dE5aRDor>Biy!4LvRA1u4}UkiK1v9qKYjXAOeCDfMyRk zNRmX+q>j00000NkvXXu0mjfHCcNh diff --git a/homedecor/textures/homedecor_plastic_strips.png b/homedecor/textures/homedecor_plastic_strips.png deleted file mode 100644 index 6ec83a8301a2ce7563871475acd061a6bdfe2d24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCr=m0kch)?FKy&yaNs!X@ZLUl z+Jf}v|Fc*ZY+U-qLuLl!-M@Nfd@EL6Rh`MM5_$jYbJGQkycrJ6QWqN7OcpR2GuXYX WT>oq#<262@X$+pOelF{r5}E+gX(=H9 diff --git a/homedecor/textures/homedecor_power_crystal.png b/homedecor/textures/homedecor_power_crystal.png deleted file mode 100644 index f1c28e80547b2ade2e3ad9d04690351752d0eb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 817 zcmV-11J3-3P) zZ%mYR0KoB|Cm^E@>ok=dXX3-%c?!pc97GUWbD5fNOj^BY=2}L!nffYOptzAsa_j#B z3tw1nDO-Om=4{18?awf)jpm|%Ti6`CIJoD}@Ao|SJil+W)#eLp_4$Z@!mg#o?5=3w zsU-vA|I%H?99o~anYL2cTCDYf^fB>Y(cN6cL!wk2yA@hXwR5^0e}5R-AAOLvl_BwO zvLky#VupV9PNs(&g6w1qxp(hI4Ypu@+z31C*3({BD6S{-+v_1Q!|!{*q$BCsNAAHs zv6<|-J;>fhvO|xN?`c9G+O&YK#yR48cy8S!?bV9TT6D*9^wS1B9)_+O^qz9`juNf+ z#nCUUUg*D=nk}xy!8M=hy_M2EaxdzWB>8s?f}S+&N<&8&_NQ@=S0gVq__`yK5r32Y zYYX#-QrpcZ1?J%x?(izCixI5TYmk@YSeXdckFDfL;e5FSchtZ+HP5rIM!Wq^Q6R>l z$mv|n?-z@(>^T0bx8S}pmrT%xHC%_Bs3rUT7QE*Ttifiolwn%ss4L6Jy%$?7?2jHk zKlP^Yrd1UE$|CISQXD6Vef18^@g!c4f!!a+{;3jqem-(4itSfnUYPHzfyAirx+B=K z3g=2CHZi1*BUK7>Vj13;f%!uPYG5I%?+!x@M9@1I=Xe;l--y4h0JfDdeNy0l9mbO}R3;HP_UdniK3P_64OQZvU4iYD zA$2{HH2Je7aG;*xr6wlFIvM9E>fr6z+=l&g1m!lPf(>hh5@HrD;rrY(2`tM%vI@i?uA%RjjR~Ru{kPcI9By+@s~dU6S@ozea7Ws00000NkvXXu0mjfutA!B diff --git a/homedecor/textures/homedecor_silicon.png b/homedecor/textures/homedecor_silicon.png deleted file mode 100644 index 847b366ccb9bd9ce285ccc275a6ca284fb3d75b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 769 zcmV+c1OEJpP)V@kMmH`p`ycT4I@X3iVE9{Sc9lH zdl3~uKiP|*7ZC(Oy^UT~e?l*M6@!SN}?zQjdx~p5WjW$kSxQ5;+H8 zFR@7+<03nvu|ztZtD;=4B1G}XSv5$i30XBDDh5(&5d#O@@cP4;Tj*|OG_yl&^=jQo zwy~_3%VZ0P(n$oP4044AV(}#6yn>XPhp6cAjYklep!!q1{G+|JjC9&q2QXNxHk?Ed z)DsCwgI;JNNC~*IvIeg|f^5D9YAONWSO7!rQ4D)VG3*(GQKX6EG2pgJvZRd&Y2Z*n=Ur7b9Ljy#6qfirx=|rjX5=j|mlHpHOrX zv&}YynIhKLpJ6;mBRa`J(TX@4jAHM=AodTrA5)-vAf@II ziiw~(sUL~4Tl)qNY!)iV`tzMGtWx8poUyDKwRq%Y`{HO=Yz`2cZdRNmDWyN9(gmD4 zbq0YDjbL~Z3@iQ27`2UhtNr}Kp{RH*@l&{j;V`-Lh=Kg3jd&7x*oiH8#cBX9Fr~jQwym-8a!Fq9kHYM%KS0fYf%w~K@}m*} Y0ADb?S;9pEJpcdz07*qoM6N<$g5}4dO8@`> diff --git a/homedecor/textures/homedecor_steel_wire.png b/homedecor/textures/homedecor_steel_wire.png deleted file mode 100644 index 44f8240f97ac54da911ab333fb03f7249207a6ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmV+|0n+}7P)yKpg)lmNMPbYDS+%v+$RxNe~7|D1;&yV4i2Z_pGZYO;hd$^nK4E%aABSM2O=UfN7domW5?mXxo;D z1gEYe2m(ZeP(q9vW_Kp=|4twxuqDcNu&~>Lx2WJ9zCGZajR8@p3mcPH|4iK)7$z2g|O!amhA8Y00000NkvXXu0mjf05XFJ diff --git a/homedecor/textures/homedecor_terracotta_base.png b/homedecor/textures/homedecor_terracotta_base.png deleted file mode 100644 index 9f04aad595e3c28a84ad751ffbf90dfa0ddddb9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP) zOGs2v90%av|J-x$%(>T@QD@YdDKgEVA}FjD(ZhlsSVAqL*P;j)xd_?`R*(d>XjKse zErN(z1wB_4H9;5^Q6^UQFk`X_$I+S5dEM9PE?S5X)c4_Eyghk<@IM~zZRPL`oat(P zcdBz8Jg8D=1OZg;eh&o7krn*;XC?%f+)v-Ct2hN%T>G}kgw z$!3uLnZ&CPU$^%5XCGh&2G7p>U!=>pyw<+3KJ(+-73nyVshZ}Li*T$8q?C|m#o`J( ziCGvtiT$mc$u<*ZN2cBk4L7Bd--$#3t|m~(=P{NV#rsr-jZRK4Inv@^49}jZ!r-Be zK8RhbVtu)ixxC`o;KZb^aBY#nFf^s<+)!bJ!;`b+K%6mz zbuME;KTTCEESnpG<`W1A9|HApxKoqh3`mWQi)Ha@YkazN8Ne0}j{&sWj)bl;iiUJF za*jEXT8R2M$aPW9O~4n9z;z|GOa@KSi1Pi@&lmtd+hizufYXwIMo3PYayXrrmMbAu z6?P#9eUcpWrv=91PUCU=7@6VRnn Date: Wed, 31 Oct 2018 12:16:50 -0400 Subject: [PATCH 25/40] use basic_materials padlock instead of steel ingot for lockable items. --- homedecor/handlers/inventory.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor/handlers/inventory.lua b/homedecor/handlers/inventory.lua index 62269e6f..dd091339 100644 --- a/homedecor/handlers/inventory.lua +++ b/homedecor/handlers/inventory.lua @@ -182,7 +182,7 @@ function homedecor.handle_inventory(name, def, original_def) minetest.register_craft({ type = "shapeless", output = "homedecor:" .. locked_name, - recipe = { "homedecor:" .. name, "default:steel_ingot" } + recipe = { "homedecor:" .. name, "basic_materials:padlock" } }) end From e291a45d997e0c31c33ebf1a419307cf34c1710b Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 8 Nov 2018 18:58:34 -0500 Subject: [PATCH 26/40] license fixups: use LGPL 3.0 for code, CC-by-SA 4.0 for media and everything else --- LICENSE | 450 ++++++++++++++++++++++++++++-- computer/README.txt | 18 -- computer/miscitems.lua | 2 - computer/recipes.lua | 2 - homedecor/copyright.txt | 12 +- homedecor/wardrobe.lua | 2 +- homedecor_3d_extras/copyright.txt | 12 - lavalamp/README.txt | 18 -- lrfurn/README.txt | 18 -- plasmascreen/README.md | 2 - 10 files changed, 433 insertions(+), 103 deletions(-) delete mode 100644 homedecor_3d_extras/copyright.txt diff --git a/LICENSE b/LICENSE index 0a3df5e6..624a8eca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,17 +1,15 @@ -For the Lua code: LGPL 3.0 or higher -For all models, all textures, and all sounds: CC-by-SA 3.0 or higher -For everything else: WTFPL +License for code: LGPL 3.0 +License for media and all other assets: CC-by-SA 4.0 -Exceptions to the above: +These licenses apply to all modules and components in this modpack, +unless otherwise stated. -Fancy mesh fire model and texture by NathanS (CC-0). - -=============================================================================== +############################################################################### GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -174,26 +172,432 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. -=============================================================================== +############################################################################### -This work is licensed under the Creative Commons Attribution-ShareAlike -4.0 International License. To view a copy of this license, visit -http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to -Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. +Attribution-ShareAlike 4.0 International -=============================================================================== +======================================================================= - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. - Copyright (C) 2004 Sam Hocevar +Using Creative Commons Public Licenses - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors - 0. You just DO WHAT THE FUCK YOU WANT TO. + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/computer/README.txt b/computer/README.txt index 6d6c7dcf..beed59e6 100644 --- a/computer/README.txt +++ b/computer/README.txt @@ -33,10 +33,6 @@ computer:admiral128 There's also a `computer:computer' alias to `computer:babytower'. -License: -Sourcecode: WTFPL (see below) -Graphics: WTFPL (see below) - Thanks to all the people in the forums and the #minetest IRC channel for their support and suggestions; in no particular order: OldCoder, Josh, tonyka, VanessaE, davidpace, Jordach, and all the other @@ -45,17 +41,3 @@ Thanks to all the people in the forums and the #minetest IRC channel for See also: http://minetest.net/ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2012 Diego Martínez - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/computer/miscitems.lua b/computer/miscitems.lua index a750378a..bbef89ba 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -1,6 +1,4 @@ - -- Copyright (C) 2012-2013 Diego Martínez --- License is WTFPL (see README.txt). -- This file defines some items in order to not have to depend on other mods. diff --git a/computer/recipes.lua b/computer/recipes.lua index d5624250..8ab59d85 100644 --- a/computer/recipes.lua +++ b/computer/recipes.lua @@ -1,6 +1,4 @@ - -- Copyright (C) 2012-2013 Diego Martínez --- License is WTFPL (see README.txt). minetest.register_craft({ output = "computer:shefriendSOO", diff --git a/homedecor/copyright.txt b/homedecor/copyright.txt index fa4892f0..7dc11a36 100644 --- a/homedecor/copyright.txt +++ b/homedecor/copyright.txt @@ -4,15 +4,13 @@ Some code copied and modified from the game's default mods (especially doors) and ironzorg's flowers mod. Licenses: -* For the lua code, LGPL. -* For the door open/close sound, CC-By-SA 3.0 by Slanesh on freesound.org +* Door open/close sound by Slanesh on freesound.org http://freesound.org/people/Slanesh/sounds/31768/ -* For the gate open/close sound, CC0, by j1987 on freesound.org +* Gate open/close by j1987 on freesound.org http://freesound.org/people/j1987/sounds/106116/ -* For the doorbell sound, CC0 by guitarguy1985 on freesound.org +* Doorbell sound by guitarguy1985 on freesound.org http://freesound.org/people/guitarguy1985/sounds/69384/ -* For the book sound, Public Domain by mckinneysound's on http://www.freesfx.co.uk/ +* Book soundn by mckinneysound's on http://www.freesfx.co.uk/ http://www.freesfx.co.uk/sfx/book?p=3 -* For the phone ring, Public Domain by andyt's on http://www.freesfx.co.uk/ +* Phone ringing sound by andyt's on http://www.freesfx.co.uk/ http://www.freesfx.co.uk/sfx/phone?p=5 -* For all images and everything else, WTFPL. diff --git a/homedecor/wardrobe.lua b/homedecor/wardrobe.lua index 40511d09..85155550 100644 --- a/homedecor/wardrobe.lua +++ b/homedecor/wardrobe.lua @@ -27,7 +27,7 @@ if skinsdb_mod_path then skin_obj:set_texture("homedecor_clothes_"..skin_name..".png") skin_obj:set_meta("name", "Wardrobe "..skin_name) skin_obj:set_meta("author", 'Calinou and Jordach') - skin_obj:set_meta("license", 'WTFPL') + skin_obj:set_meta("license", 'CC-by-SA-4.0') local file = io.open(homedecor.modpath.."/textures/homedecor_clothes_"..skin_name..".png", "r") skin_obj:set_meta("format", skins.get_skin_format(file)) file:close() diff --git a/homedecor_3d_extras/copyright.txt b/homedecor_3d_extras/copyright.txt deleted file mode 100644 index 690bdc52..00000000 --- a/homedecor_3d_extras/copyright.txt +++ /dev/null @@ -1,12 +0,0 @@ -Most code and all textures by Vanessa Ezekowitz. - -Some code copied and modified from the game's default mods (especially -doors) and ironzorg's flowers mod. - -Licenses: -* For the lua code, LGPL. -* For the door open/close sound, CC-By-SA 3.0 by Slanesh on freesound.org - http://freesound.org/people/Slanesh/sounds/31768/ -* For the gate open/close sound, CC0, by j1987 on freesound.org - http://freesound.org/people/j1987/sounds/106116/ -* For all images and everything else, WTFPL. diff --git a/lavalamp/README.txt b/lavalamp/README.txt index c192e25d..832d624f 100644 --- a/lavalamp/README.txt +++ b/lavalamp/README.txt @@ -20,23 +20,5 @@ Recipe: Mod dependencies: wool, bucket -License: -Sourcecode: WTFPL (see below) -Graphics: WTFPL (see below) - See also: http://minetest.net/ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/lrfurn/README.txt b/lrfurn/README.txt index de8ee8d3..c86df3c2 100644 --- a/lrfurn/README.txt +++ b/lrfurn/README.txt @@ -63,23 +63,5 @@ Recipes: Mod dependencies: default, wool -License: -Sourcecode: WTFPL (see below) -Graphics: WTFPL (see below) - See also: http://minetest.net/ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/plasmascreen/README.md b/plasmascreen/README.md index 4f338640..867c2621 100644 --- a/plasmascreen/README.md +++ b/plasmascreen/README.md @@ -12,5 +12,3 @@ the mod may occasionally refuse to place it (or it just appears for a moment). Just move over a bit, so that your target position is more directly in front of you. -Code, textures and model are WTFPL. - From bcf9238e4779a11e2c1f9d2bdd7f7125e9639060 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 9 Nov 2018 20:23:42 -0500 Subject: [PATCH 27/40] use currency mod's 25-cent Minegeld coin for soda machine --- homedecor/crafts.lua | 5 ----- homedecor/depends.txt | 1 + homedecor/gastronomy.lua | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 98f24705..68463a9f 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -47,11 +47,6 @@ minetest.register_craftitem("homedecor:soda_can", { on_use = minetest.item_eat(2), }) -minetest.register_craftitem("homedecor:coin", { - description = S("Gold Coin (for soda vending machine)"), - inventory_image = "homedecor_coin.png", -}) - -- the actual crafts minetest.register_craft( { diff --git a/homedecor/depends.txt b/homedecor/depends.txt index 29ab645a..2a3d340b 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -3,6 +3,7 @@ basic_materials unifieddyes homedecor_i18n creative +currency building_blocks? signs_lib? moreblocks? diff --git a/homedecor/gastronomy.lua b/homedecor/gastronomy.lua index d2617002..8274b3f4 100644 --- a/homedecor/gastronomy.lua +++ b/homedecor/gastronomy.lua @@ -219,7 +219,7 @@ homedecor.register("soda_machine", { local fdir_to_fwd = { {0, -1}, {-1, 0}, {0, 1}, {1, 0} } local fdir = node.param2 local pos_drop = { x=pos.x+fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+fdir_to_fwd[fdir+1][2] } - if wieldname == "homedecor:coin" then + if wieldname == "currency:minegeld_cent_25" then minetest.spawn_item(pos_drop, "homedecor:soda_can") minetest.sound_play("insert_coin", { pos=pos, max_hear_distance = 5 @@ -234,3 +234,5 @@ homedecor.register("soda_machine", { end end }) + +minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25") From 37c6b99ac1032dc1bda37cba86a59a7c20c7aa25 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Mon, 12 Nov 2018 08:23:19 -0500 Subject: [PATCH 28/40] make currency opt depend --- homedecor/depends.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor/depends.txt b/homedecor/depends.txt index 2a3d340b..ec574795 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -3,7 +3,7 @@ basic_materials unifieddyes homedecor_i18n creative -currency +currency? building_blocks? signs_lib? moreblocks? From 52375443edb4f0053481ec099fc84d13db16d276 Mon Sep 17 00:00:00 2001 From: Pedro Gimeno Date: Sun, 24 Mar 2019 18:38:27 +0100 Subject: [PATCH 29/40] Fix the tap particles spilling out of the sink --- homedecor/bathroom_sanitation.lua | 29 ++++++++++++++------------ homedecor/handlers/water_particles.lua | 1 + 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua index bd592183..eb4a58d1 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor/bathroom_sanitation.lua @@ -81,11 +81,22 @@ homedecor.register("toilet_paper", { --Sink -local sink_cbox = { +local sink_sbox = { type = "fixed", fixed = { -5/16, -8/16, 1/16, 5/16, 8/16, 8/16 } } +local sink_cbox = { + type = "fixed", + fixed = { + { -5/16, 5/16, 1/16, -4/16, 8/16, 8/16 }, + { 5/16, 5/16, 1/16, 4/16, 8/16, 8/16 }, + { -5/16, 5/16, 1/16, 5/16, 8/16, 2/16 }, + { -5/16, 5/16, 6/16, 5/16, 8/16, 8/16 }, + { -4/16, -8/16, 1/16, 4/16, 5/16, 6/16 } + } +} + homedecor.register("sink", { description = S("Bathroom Sink"), mesh = "homedecor_bathroom_sink.obj", @@ -95,19 +106,10 @@ homedecor.register("sink", { "default_water.png" }, inventory_image="homedecor_bathroom_sink_inv.png", - selection_box = sink_cbox, + selection_box = sink_sbox, + collision_box = sink_cbox, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), - node_box = { - type = "fixed", - fixed = { - { -5/16, 5/16, 1/16, -4/16, 8/16, 8/16 }, - { 5/16, 5/16, 1/16, 4/16, 8/16, 8/16 }, - { -5/16, 5/16, 1/16, 5/16, 8/16, 2/16 }, - { -5/16, 5/16, 6/16, 5/16, 8/16, 8/16 }, - { -4/16, -8/16, 1/16, 4/16, 5/16, 6/16 } - } - }, on_destruct = function(pos) homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) end @@ -127,7 +129,8 @@ local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing) velocity_x = { min = -0.1, max = 0.1 }, velocity_y = -0.3, velocity_z = { min = -0.1, max = 0 }, - spread = 0 + spread = 0, + die_on_collision = true, } homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") end diff --git a/homedecor/handlers/water_particles.lua b/homedecor/handlers/water_particles.lua index d318d582..8042599c 100644 --- a/homedecor/handlers/water_particles.lua +++ b/homedecor/handlers/water_particles.lua @@ -71,6 +71,7 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname) amount = 60, time = 0, collisiondetection = true, + collision_removal = particledef.die_on_collision, minpos = {x=pos.x - minx, y=pos.y + outlety, z=pos.z - minz}, maxpos = {x=pos.x - maxx, y=pos.y + outlety, z=pos.z - maxz}, minvel = {x = minvelx, y = velocityy, z = minvelz}, From 554ec8028d448ff94ef0b43b66de7d46e1172dee Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Mon, 26 Nov 2018 14:34:16 -0500 Subject: [PATCH 30/40] use basic_materials motor --- homedecor/crafts.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 68463a9f..aaef1dd3 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1541,7 +1541,7 @@ minetest.register_craft( { recipe = { { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, - { "default:steel_ingot", "technic:motor", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } }, }) @@ -1558,7 +1558,7 @@ minetest.register_craft( { output = "homedecor:dryer", recipe = { { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, - { "default:steel_ingot", "bucket:bucket_empty", "technic:motor" }, + { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -1587,7 +1587,7 @@ minetest.register_craft( { output = "homedecor:dishwasher", recipe = { { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "technic:motor" }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) @@ -1888,8 +1888,8 @@ minetest.register_craft({ output = "homedecor:air_conditioner", recipe = { { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, - { "default:steel_ingot", "technic:motor", "default:steel_ingot" }, - { "default:steel_ingot", "technic:motor", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, }, }) @@ -1905,7 +1905,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:ceiling_fan", recipe = { - { "technic:motor" }, + { "basic_materials:motor" }, { "homedecor:fan_blades" }, { "homedecor:glowlight_small_cube" } } @@ -1989,7 +1989,7 @@ minetest.register_craft({ output = "homedecor:dvd_player 2", recipe = { { "", "basic_materials:plastic_sheet", "" }, - { "default:obsidian_glass", "technic:motor", "technic:motor" }, + { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, }, }) From 95590f23c554e55421894e33b0c8a0c1170af9e6 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Sat, 20 Apr 2019 10:01:42 -0400 Subject: [PATCH 31/40] Separate-out the wardrobe into its own mod Standalone -- can be used without the rest of home decor --- homedecor/crafts.lua | 9 - homedecor/init.lua | 1 - .../textures/homedecor_clothes_female4.png | Bin 1198 -> 0 bytes .../homedecor_clothes_female4_preview.png | Bin 591 -> 0 bytes .../textures/homedecor_clothes_female5.png | Bin 1219 -> 0 bytes .../homedecor_clothes_female5_preview.png | Bin 880 -> 0 bytes homedecor/wardrobe.lua | 146 -------- homedecor_wardrobe/depends.txt | 2 + homedecor_wardrobe/init.lua | 325 ++++++++++++++++++ .../models/homedecor_bedroom_wardrobe.obj | 0 .../textures/homedecor_clothes_female1.png | Bin .../homedecor_clothes_female1_preview.png | Bin .../textures/homedecor_clothes_female2.png | Bin .../homedecor_clothes_female2_preview.png | Bin .../textures/homedecor_clothes_female3.png | Bin .../homedecor_clothes_female3_preview.png | Bin .../textures/homedecor_clothes_female4.png | Bin 0 -> 612 bytes .../homedecor_clothes_female4_preview.png | Bin 0 -> 326 bytes .../textures/homedecor_clothes_female5.png | Bin 0 -> 1216 bytes .../homedecor_clothes_female5_preview.png | Bin 0 -> 564 bytes .../textures/homedecor_clothes_male1.png | Bin .../homedecor_clothes_male1_preview.png | Bin .../textures/homedecor_clothes_male2.png | Bin .../homedecor_clothes_male2_preview.png | Bin .../textures/homedecor_clothes_male3.png | Bin .../homedecor_clothes_male3_preview.png | Bin .../textures/homedecor_clothes_male4.png | Bin .../homedecor_clothes_male4_preview.png | Bin .../textures/homedecor_clothes_male5.png | Bin .../homedecor_clothes_male5_preview.png | Bin .../textures/homedecor_generic_wood_plain.png | Bin 0 -> 293 bytes .../textures/homedecor_wardrobe_doors.png | Bin 0 -> 668 bytes .../textures/homedecor_wardrobe_drawers.png | Bin 0 -> 683 bytes .../textures/homedecor_wardrobe_inv.png | Bin 0 -> 5893 bytes 34 files changed, 327 insertions(+), 156 deletions(-) delete mode 100644 homedecor/textures/homedecor_clothes_female4.png delete mode 100644 homedecor/textures/homedecor_clothes_female4_preview.png delete mode 100644 homedecor/textures/homedecor_clothes_female5.png delete mode 100644 homedecor/textures/homedecor_clothes_female5_preview.png delete mode 100644 homedecor/wardrobe.lua create mode 100644 homedecor_wardrobe/depends.txt create mode 100644 homedecor_wardrobe/init.lua rename {homedecor => homedecor_wardrobe}/models/homedecor_bedroom_wardrobe.obj (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female1.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female1_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female2.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female2_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female3.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_female3_preview.png (100%) create mode 100644 homedecor_wardrobe/textures/homedecor_clothes_female4.png create mode 100644 homedecor_wardrobe/textures/homedecor_clothes_female4_preview.png create mode 100644 homedecor_wardrobe/textures/homedecor_clothes_female5.png create mode 100644 homedecor_wardrobe/textures/homedecor_clothes_female5_preview.png rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male1.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male1_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male2.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male2_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male3.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male3_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male4.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male4_preview.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male5.png (100%) rename {homedecor => homedecor_wardrobe}/textures/homedecor_clothes_male5_preview.png (100%) create mode 100644 homedecor_wardrobe/textures/homedecor_generic_wood_plain.png create mode 100644 homedecor_wardrobe/textures/homedecor_wardrobe_doors.png create mode 100644 homedecor_wardrobe/textures/homedecor_wardrobe_drawers.png create mode 100644 homedecor_wardrobe/textures/homedecor_wardrobe_inv.png diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index aaef1dd3..73753185 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -2194,15 +2194,6 @@ minetest.register_craft( { }, }) -minetest.register_craft( { - output = "homedecor:wardrobe", - recipe = { - { "homedecor:drawer_small", "homedecor:kitchen_cabinet" }, - { "homedecor:drawer_small", "default:wood" }, - { "homedecor:drawer_small", "default:wood" } - }, -}) - minetest.register_craft( { output = "homedecor:pool_table", recipe = { diff --git a/homedecor/init.lua b/homedecor/init.lua index 1b54359b..7d93e98a 100644 --- a/homedecor/init.lua +++ b/homedecor/init.lua @@ -115,7 +115,6 @@ dofile(modpath.."/cobweb.lua") dofile(modpath.."/books.lua") dofile(modpath.."/exterior.lua") dofile(modpath.."/trash_cans.lua") -dofile(modpath.."/wardrobe.lua") dofile(modpath.."/crafts.lua") diff --git a/homedecor/textures/homedecor_clothes_female4.png b/homedecor/textures/homedecor_clothes_female4.png deleted file mode 100644 index 3e64c5d4a9028d30fb57f3d9c64f4f7b074e7ec3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 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 diff --git a/homedecor/textures/homedecor_clothes_female5_preview.png b/homedecor/textures/homedecor_clothes_female5_preview.png deleted file mode 100644 index f07d654bb243e57b8d519fdb8fb469fab2afd87c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 880 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 r?=LX%v$0&S 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 bkJ0}CQ#hWB4az~q00000NkvXXu0mjf$L1jV literal 0 HcmV?d00001 From b08c0905c010cc2262bc4bc0593427b0fcba12e7 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 20 Apr 2019 15:49:36 -0400 Subject: [PATCH 32/40] Split the big "homedecor" mod into multiple sub-mods Any of these new submods can be run without any other components that were once part of the big "homedecor" mod, other than homedecor_common and homedecor_i18n Reduced dependencies where possible, but each submod still has its various dependencies more or less the same as before, i.e. some need basic_materials, others need unifieddyes, some need building_blocks, and so on. All of the stuff that used to be under homedecor/handlers got moved to homedecor_common, as did any models and/or textures that are used by more than one other homedecor component. All the miscellaneous items that didn't warrant their own mod ended up in homedecor_misc, which can also be thought of as the remains of the original "homedecor" mod, renamed. --- homedecor/copyright.txt => copyright.txt | 6 +- homedecor/bathroom_furniture.lua | 166 - homedecor/crafts.lua | 3024 ----------------- homedecor/electronics.lua | 143 - homedecor/furniture_recipes.lua | 280 -- homedecor/handlers/init.lua | 24 - homedecor/kitchen_appliances.lua | 256 -- homedecor/kitchen_furniture.lua | 157 - homedecor/laundry.lua | 61 - homedecor/shutters.lua | 101 - homedecor/textures/homedecor_coin.png | Bin 331 -> 0 bytes homedecor/textures/homedecor_fan_blades.png | Bin 372 -> 0 bytes homedecor/textures/homedecor_marble.png | Bin 233 -> 0 bytes .../textures/homedecor_wardrobe_doors.png | Bin 668 -> 0 bytes .../textures/homedecor_wardrobe_drawers.png | Bin 683 -> 0 bytes homedecor/textures/homedecor_wardrobe_inv.png | Bin 5893 -> 0 bytes homedecor_3d_extras/depends.txt | 3 +- homedecor_bathroom/depends.txt | 6 + .../init.lua | 291 +- .../models/homedecor_bathroom_faucet.obj | 0 .../models/homedecor_bathroom_set.obj | 0 .../models/homedecor_bathroom_sink.obj | 0 .../models/homedecor_bathtub_clawfoot.obj | 0 .../models/homedecor_medicine_cabinet.obj | 0 .../homedecor_medicine_cabinet_open.obj | 0 .../models/homedecor_shower_head.obj | 0 .../models/homedecor_toilet_closed.obj | 0 .../models/homedecor_toilet_open.obj | 0 .../models/homedecor_toilet_paper.obj | 0 .../models/homedecor_towel_rod.obj | 0 .../textures/3dforniture_taps_brass_inv.png | Bin .../textures/3dforniture_taps_inv.png | Bin .../forniture_marble_base_ducha_top.png | Bin .../textures/homedecor_bathroom_set_cup.png | Bin .../textures/homedecor_bathroom_set_inv.png | Bin .../homedecor_bathroom_set_mirror.png | Bin .../homedecor_bathroom_set_toothbrush.png | Bin .../homedecor_bathroom_set_toothpaste.png | Bin .../textures/homedecor_bathroom_set_tray.png | Bin .../textures/homedecor_bathroom_sink_inv.png | Bin .../textures/homedecor_bathroom_tiles_bg.png | Bin .../textures/homedecor_bathroom_tiles_fg.png | Bin ...medecor_bathtub_clawfoot_bottom_inside.png | Bin .../homedecor_medicine_cabinet_inside.png | Bin .../homedecor_medicine_cabinet_inv.png | Bin .../homedecor_medicine_cabinet_mirror.png | Bin .../textures/homedecor_shower_head.png | Bin .../textures/homedecor_shower_head_inv.png | Bin .../textures/homedecor_toilet_paper_inv.png | Bin .../textures/homedecor_towel_rod_inv.png | Bin homedecor_bedroom/depends.txt | 6 + .../bedroom.lua => homedecor_bedroom/init.lua | 125 +- .../models/homedecor_bed_extended.obj | 0 .../models/homedecor_bed_kingsize.obj | 0 .../models/homedecor_bed_regular.obj | 0 .../textures/homedecor_bed_bottom.png | Bin .../textures/homedecor_bed_frame.png | Bin .../textures/homedecor_bed_inv.png | Bin .../textures/homedecor_bed_kingsize_inv.png | Bin ...cor_nightstand_mahogany_1_drawer_front.png | Bin ...cor_nightstand_mahogany_2_drawer_front.png | Bin .../homedecor_nightstand_mahogany_back.png | Bin .../homedecor_nightstand_mahogany_lr.png | Bin .../homedecor_nightstand_mahogany_tb.png | Bin ...omedecor_nightstand_oak_1_drawer_front.png | Bin ...omedecor_nightstand_oak_2_drawer_front.png | Bin .../homedecor_nightstand_oak_back.png | Bin .../textures/homedecor_nightstand_oak_lr.png | Bin .../textures/homedecor_nightstand_oak_tb.png | Bin homedecor_books/depends.txt | 6 + .../books.lua => homedecor_books/init.lua | 25 + .../models/homedecor_book.obj | 0 .../models/homedecor_book_open.obj | 0 .../textures/homedecor_book_cover.png | Bin .../textures/homedecor_book_cover_trim.png | Bin .../textures/homedecor_book_edges.png | Bin .../textures/homedecor_book_inv.png | Bin .../textures/homedecor_book_pages.png | Bin .../textures/homedecor_book_trim_inv.png | Bin homedecor_climate_control/depends.txt | 5 + .../init.lua | 68 +- .../models/homedecor_ac.obj | 0 .../models/homedecor_desk_fan.b3d | Bin .../models/homedecor_radiator.obj | 0 .../textures/homedecor_ac.png | Bin .../textures/homedecor_ceiling_fan_bottom.png | Bin .../textures/homedecor_ceiling_fan_inv.png | Bin .../textures/homedecor_ceiling_fan_sides.png | Bin .../textures/homedecor_ceiling_fan_top.png | Bin .../textures/homedecor_desk_fan_body.png | Bin .../textures/homedecor_desk_fan_inv.png | Bin .../textures}/homedecor_desk_fan_uv.png | Bin .../textures/homedecor_heater_back.png | Bin .../textures/homedecor_heater_front.png | Bin .../textures/homedecor_heater_inv.png | Bin .../textures/homedecor_heater_sides.png | Bin .../textures/homedecor_heater_tb.png | Bin .../textures/homedecor_radiator_controls.png | Bin .../textures/homedecor_radiator_inv.png | Bin homedecor_clocks/depends.txt | 6 + .../clocks.lua => homedecor_clocks/init.lua | 50 + .../models/homedecor_analog_clock.obj | 0 .../models/homedecor_grandfather_clock.obj | 0 .../textures/homedecor_alarm_clock_back.png | Bin .../textures/homedecor_alarm_clock_bottom.png | Bin .../textures/homedecor_alarm_clock_front.png | Bin .../textures/homedecor_alarm_clock_inv.png | Bin .../textures/homedecor_alarm_clock_sides.png | Bin .../textures/homedecor_alarm_clock_top.png | Bin .../textures/homedecor_analog_clock_back.png | Bin .../textures/homedecor_analog_clock_face.png | Bin .../homedecor_analog_clock_plastic_inv.png | Bin .../homedecor_analog_clock_wood_inv.png | Bin .../textures/homedecor_digital_clock_back.png | Bin .../homedecor_digital_clock_edges.png | Bin .../homedecor_digital_clock_front.png | Bin .../textures/homedecor_digital_clock_inv.png | Bin .../homedecor_grandfather_clock_face.png | Bin .../homedecor_grandfather_clock_face_edge.png | Bin .../homedecor_grandfather_clock_inv.png | Bin homedecor_cobweb/depends.txt | 3 + .../cobweb.lua => homedecor_cobweb/init.lua | 24 +- .../textures/homedecor_cobweb.png | Bin .../textures/homedecor_cobweb_plantlike.png | Bin .../textures/homedecor_cobweb_torchlike.png | Bin homedecor_common/crafts.lua | 73 + homedecor_common/depends.txt | 4 + .../expansion.lua | 0 .../furnaces.lua | 0 {homedecor => homedecor_common}/init.lua | 68 +- .../inventory.lua | 0 .../models/homedecor_cube.obj | 0 .../models/homedecor_slope.obj | 0 .../models/homedecor_slope_inner_corner.obj | 0 .../models/homedecor_slope_outer_corner.obj | 0 .../mt_game_beds_functions.lua | 0 .../nodeboxes.lua | 0 .../registration.lua | 2 +- .../handlers => homedecor_common}/sit.lua | 0 .../textures/homedecor_blanktile.png | Bin .../textures/homedecor_drawer_small.png | Bin .../textures/homedecor_generic_metal.png | Bin .../homedecor_generic_metal_brass.png | Bin .../homedecor_generic_metal_bright.png | Bin .../textures/homedecor_generic_metal_gold.png | Bin .../homedecor_generic_metal_gold2.png | Bin .../homedecor_generic_metal_lines_overlay.png | Bin .../homedecor_generic_metal_wrought_iron.png | Bin .../textures/homedecor_generic_plastic.png | Bin .../homedecor_generic_quilted_paper.png | Bin .../textures/homedecor_generic_terrycloth.png | Bin .../homedecor_generic_wood_luxury.png | Bin .../textures/homedecor_generic_wood_old.png | Bin .../textures/homedecor_generic_wood_plain.png | Bin .../textures/homedecor_generic_wood_red.png | Bin .../textures/homedecor_light.png | Bin .../textures/homedecor_polished_copper.png | Bin .../homedecor_roof_tile_terracotta.png | Bin .../textures/homedecor_shingles_asphalt.png | Bin .../homedecor_shingles_terracotta.png | Bin .../homedecor_shingles_terracotta_inv.png | Bin .../textures/homedecor_shingles_wood.png | Bin .../textures/homedecor_water_particle.png | Bin .../water_particles.lua | 0 homedecor_doors_and_gates/depends.txt | 7 + .../init.lua | 273 +- .../models/homedecor_door_closet.obj | 0 .../models/homedecor_door_closet_right.obj | 0 .../models/homedecor_door_fancy.obj | 0 .../models/homedecor_door_fancy_right.obj | 0 .../models/homedecor_door_japanese_closed.obj | 0 .../models/homedecor_door_japanese_open.obj | 0 .../models/homedecor_door_plain.obj | 0 .../models/homedecor_door_plain_right.obj | 0 .../models/homedecor_door_wood_glass.obj | 0 .../homedecor_door_wood_glass_right.obj | 0 .../models/homedecor_door_woodglass_typea.obj | 0 .../homedecor_door_woodglass_typea_right.obj | 0 .../models/homedecor_door_wrought_iron.obj | 0 .../homedecor_door_wrought_iron_right.obj | 0 .../models/homedecor_wall_japanese_bottom.obj | 0 .../models/homedecor_wall_japanese_middle.obj | 0 .../models/homedecor_wall_japanese_top.obj | 0 .../textures/homedecor_door_bedroom.png | Bin .../textures/homedecor_door_bedroom_inv.png | Bin .../homedecor_door_closet_mahogany.png | Bin .../homedecor_door_closet_mahogany_inv.png | Bin .../textures/homedecor_door_closet_oak.png | Bin .../homedecor_door_closet_oak_inv.png | Bin .../homedecor_door_exterior_fancy.png | Bin .../homedecor_door_exterior_fancy_insert.png | Bin .../homedecor_door_exterior_fancy_inv.png | Bin .../textures/homedecor_door_glass.png | Bin .../textures/homedecor_door_glass_inv.png | Bin .../textures/homedecor_door_japanese_inv.png | Bin .../homedecor_door_wood_glass_insert.png | Bin .../homedecor_door_wood_glass_mahogany.png | Bin ...homedecor_door_wood_glass_mahogany_inv.png | Bin .../homedecor_door_wood_glass_oak.png | Bin .../homedecor_door_wood_glass_oak_inv.png | Bin .../homedecor_door_wood_glass_white.png | Bin .../homedecor_door_wood_glass_white_inv.png | Bin .../textures/homedecor_door_wood_plain.png | Bin .../homedecor_door_wood_plain_inv.png | Bin .../textures/homedecor_door_woodglass2.png | Bin .../homedecor_door_woodglass2_inv.png | Bin .../textures/homedecor_door_woodglass_inv.png | Bin .../homedecor_door_woodglass_typea.png | Bin .../homedecor_door_woodglass_typea_insert.png | Bin .../textures/homedecor_door_wrought_iron.png | Bin .../homedecor_door_wrought_iron_inv.png | Bin .../homedecor_gate_barbed_wire_edges.png | Bin .../homedecor_gate_barbed_wire_fb.png | Bin .../textures/homedecor_gate_chainlink_fb.png | Bin .../textures/homedecor_gate_chainlink_lr.png | Bin .../textures/homedecor_gate_chainlink_tb.png | Bin .../textures/homedecor_gate_half_door_fb.png | Bin .../textures/homedecor_gate_half_door_lr.png | Bin .../textures/homedecor_gate_half_door_tb.png | Bin .../homedecor_gate_half_door_white_fb.png | Bin .../homedecor_gate_half_door_white_lr.png | Bin .../homedecor_gate_half_door_white_tb.png | Bin .../textures/homedecor_gate_picket_back.png | Bin .../textures/homedecor_gate_picket_front.png | Bin .../homedecor_gate_picket_white_back.png | Bin .../homedecor_gate_picket_white_front.png | Bin .../textures/homedecor_japanese_paper.png | Bin .../textures/homedecor_jpn_door_inv.png | Bin homedecor_electrical/depends.txt | 4 + .../init.lua | 27 + .../sounds/homedecor_doorbell.ogg | Bin .../textures/homedecor_doorbell.png | Bin .../textures/homedecor_doorbell_inv.png | Bin .../textures/homedecor_light_switch_back.png | Bin .../textures/homedecor_light_switch_edges.png | Bin .../textures/homedecor_light_switch_front.png | Bin .../textures/homedecor_light_switch_inv.png | Bin .../textures/homedecor_outlet_back.png | Bin .../textures/homedecor_outlet_edges.png | Bin .../textures/homedecor_outlet_inv.png | Bin homedecor_electronics/depends.txt | 5 + homedecor_electronics/init.lua | 301 ++ .../models/homedecor_speaker_large.obj | 0 .../models/homedecor_speaker_large_open.obj | 0 .../models/homedecor_speaker_small.obj | 0 .../models/homedecor_telephone.obj | 0 .../textures/homedecor_dvd_player.png | Bin .../textures/homedecor_dvdvcr_back.png | Bin .../textures/homedecor_dvdvcr_bottom.png | Bin .../textures/homedecor_dvdvcr_front.png | Bin .../textures/homedecor_dvdvcr_inv.png | Bin .../textures/homedecor_dvdvcr_sides.png | Bin .../textures/homedecor_dvdvcr_top.png | Bin .../textures/homedecor_projection_screen.png | Bin .../homedecor_projection_screen_inv.png | Bin .../textures/homedecor_speaker_driver.png | Bin .../textures/homedecor_speaker_driver_inv.png | Bin .../textures/homedecor_speaker_front.png | Bin .../textures/homedecor_speaker_open_front.png | Bin .../textures/homedecor_speaker_sides.png | Bin .../textures/homedecor_stereo_back.png | Bin .../textures/homedecor_stereo_bottom.png | Bin .../textures/homedecor_stereo_front.png | Bin .../textures/homedecor_stereo_left.png | Bin .../textures/homedecor_stereo_top.png | Bin .../textures/homedecor_telephone_base.png | Bin .../textures/homedecor_telephone_cord.png | Bin .../textures/homedecor_telephone_dial.png | Bin .../textures/homedecor_telephone_handset.png | Bin .../textures/homedecor_telephone_inv.png | Bin .../textures/homedecor_television_back.png | Bin .../textures/homedecor_television_bottom.png | Bin .../textures/homedecor_television_front.png | Bin .../homedecor_television_front_animated.png | Bin .../textures/homedecor_television_left.png | Bin .../textures/homedecor_television_top.png | Bin .../textures/homedecor_vcr.png | Bin homedecor_exterior/depends.txt | 8 + .../init.lua | 250 +- .../models/homedecor_barbecue.obj | 0 .../models/homedecor_bench_large_1.obj | 0 .../models/homedecor_bench_large_2.obj | 0 .../models/homedecor_chimney.obj | 0 .../models/homedecor_deckchair.obj | 0 .../models/homedecor_doghouse.obj | 0 .../models/homedecor_shrubbery.obj | 0 .../models/homedecor_well.obj | 0 .../textures/homedecor_barbecue_meat.png | Bin .../textures/homedecor_bench_large_1_inv.png | Bin .../textures/homedecor_bench_large_2_inv.png | Bin .../textures/homedecor_chimney_tb.png | Bin .../textures/homedecor_deckchair.png | Bin .../homedecor_deckchair_striped_blue.png | Bin .../textures/homedecor_doghouse_inv.png | Bin .../textures/homedecor_embers.png | Bin .../textures/homedecor_lattice.png | Bin .../textures/homedecor_lattice_vegetal.png | Bin .../textures/homedecor_rope_texture.png | Bin .../textures/homedecor_shrubbery_green.png | Bin .../homedecor_shrubbery_green_bottom.png | Bin .../textures/homedecor_shrubbery_red.png | Bin .../homedecor_shrubbery_red_bottom.png | Bin .../textures/homedecor_shrubbery_roots.png | Bin .../textures/homedecor_shrubbery_yellow.png | Bin .../homedecor_shrubbery_yellow_bottom.png | Bin .../textures/homedecor_stonepath_inv.png | Bin .../textures/homedecor_swing_inv.png | Bin .../textures/homedecor_swing_top.png | Bin .../textures/homedecor_swingrope_sides.png | Bin .../textures/homedecor_well_inv.png | Bin homedecor_fences/depends.txt | 6 + .../fences.lua => homedecor_fences/init.lua | 180 + .../models/homedecor_fence_barbed_wire.obj | 0 .../homedecor_fence_barbed_wire_corner.obj | 0 .../models/homedecor_fence_chainlink.obj | 0 .../homedecor_fence_chainlink_corner.obj | 0 .../textures/homedecor_fence_barbed_wire.png | Bin .../textures/homedecor_fence_brass.png | Bin ...homedecor_fence_chainlink_corner_front.png | Bin .../homedecor_fence_chainlink_corner_top.png | Bin .../textures/homedecor_fence_chainlink_fb.png | Bin .../homedecor_fence_chainlink_sides.png | Bin .../textures/homedecor_fence_chainlink_tb.png | Bin ...ecor_fence_corner_wrought_iron_2_sides.png | Bin ...medecor_fence_corner_wrought_iron_2_tb.png | Bin .../textures/homedecor_fence_picket.png | Bin .../homedecor_fence_picket_backside.png | Bin .../textures/homedecor_fence_picket_white.png | Bin .../homedecor_fence_picket_white_backside.png | Bin .../homedecor_fence_privacy_backside.png | Bin .../homedecor_fence_privacy_backside2.png | Bin .../homedecor_fence_privacy_corner_front.png | Bin .../homedecor_fence_privacy_corner_right.png | Bin .../homedecor_fence_privacy_corner_tb.png | Bin .../homedecor_fence_privacy_front.png | Bin .../homedecor_fence_privacy_sides.png | Bin .../textures/homedecor_fence_privacy_tb.png | Bin .../textures/homedecor_fence_wrought_iron.png | Bin .../homedecor_fence_wrought_iron_2_fb.png | Bin .../homedecor_fence_wrought_iron_2_sides.png | Bin .../homedecor_fence_wrought_iron_2_tb.png | Bin .../textures/homedecor_sign_brass_post.png | Bin .../homedecor_sign_brass_post_back.png | Bin .../homedecor_sign_brass_post_bottom.png | Bin .../homedecor_sign_brass_post_front.png | Bin .../homedecor_sign_brass_post_side.png | Bin .../homedecor_sign_brass_post_top.png | Bin .../homedecor_sign_wrought_iron_post.png | Bin .../homedecor_sign_wrought_iron_post_back.png | Bin ...omedecor_sign_wrought_iron_post_bottom.png | Bin ...homedecor_sign_wrought_iron_post_front.png | Bin .../homedecor_sign_wrought_iron_post_side.png | Bin .../homedecor_sign_wrought_iron_post_top.png | Bin homedecor_foyer/depends.txt | 4 + .../foyer.lua => homedecor_foyer/init.lua | 52 + .../models/homedecor_coatrack.obj | 0 .../textures/homedecor_coatrack_inv.png | Bin .../homedecor_coatrack_wallmount_inv.png | Bin .../textures/homedecor_welcome_mat_bottom.png | Bin .../textures/homedecor_welcome_mat_brown.png | Bin .../textures/homedecor_welcome_mat_green.png | Bin .../textures/homedecor_welcome_mat_grey.png | Bin homedecor_furniture/depends.txt | 8 + .../init.lua | 287 +- .../models/forniture_armchair.obj | 0 .../models/homedecor_kitchen_chair.obj | 0 .../models/homedecor_openframe_bookshelf.obj | 0 .../textures/homedecor_armchair_inv.png | Bin .../textures/homedecor_chair_padded_inv.png | Bin .../textures/homedecor_chair_wood_inv.png | Bin .../homedecor_openframe_bookshelf_books.png | Bin homedecor_furniture_medieval/depends.txt | 4 + .../init.lua | 0 .../models/forniture_chains.obj | 0 .../models/forniture_torch.obj | 0 .../models/homedecor_wall_lamp.obj | 0 .../textures/forniture_chains_inv.png | Bin .../textures/forniture_coal.png | Bin .../textures/forniture_marble_top_toilet.png | Bin .../textures/forniture_torch_flame.png | Bin .../textures/forniture_torch_inv.png | Bin .../textures/homedecor_wall_lamp_inv.png | Bin homedecor_gastronomy/depends.txt | 8 + .../init.lua | 231 +- .../models/homedecor_4_bottles.obj | 0 .../models/homedecor_beer_mug.obj | 0 .../models/homedecor_beer_taps.obj | 0 .../models/homedecor_bottle.obj | 0 .../models/homedecor_coffeemaker.obj | 0 .../models/homedecor_cutlery_set.obj | 0 .../models/homedecor_soda_machine.obj | 0 .../models/homedecor_wine_rack.obj | 0 .../homedecor_4_bottles_brown_inv.png | Bin .../homedecor_4_bottles_green_inv.png | Bin .../homedecor_4_bottles_multi_inv.png | Bin .../textures/homedecor_beer_mug.png | Bin .../textures/homedecor_beer_mug_inv.png | Bin .../textures/homedecor_beertap_inv.png | Bin .../textures/homedecor_bottle_brown.png | Bin .../textures/homedecor_bottle_brown2.png | Bin .../textures/homedecor_bottle_brown3.png | Bin .../textures/homedecor_bottle_brown4.png | Bin .../textures/homedecor_bottle_brown_inv.png | Bin .../textures/homedecor_bottle_green.png | Bin .../textures/homedecor_bottle_green_inv.png | Bin .../textures/homedecor_coffeemaker_case.png | Bin .../textures/homedecor_coffeemaker_cup.png | Bin .../homedecor_coffeemaker_decanter.png | Bin .../textures/homedecor_coffeemaker_inv.png | Bin .../textures/homedecor_cutlery_set.png | Bin .../textures/homedecor_cutlery_set_inv.png | Bin .../textures/homedecor_soda_can.png | Bin .../textures/homedecor_soda_machine.png | Bin .../textures/homedecor_steam.png | Bin .../textures/homedecor_toaster_inv.png | Bin .../textures/homedecor_toaster_sides.png | Bin .../textures/homedecor_toaster_toploaf.png | Bin .../textures/homedecor_wine_rack_inv.png | Bin homedecor_kitchen/depends.txt | 9 + homedecor_kitchen/init.lua | 552 +++ .../models/homedecor_copper_pans.obj | 0 .../models/homedecor_kitchen_faucet.obj | 0 .../models/homedecor_kitchen_sink.obj | 0 .../models/homedecor_paper_towel.obj | 0 .../models/homedecor_refrigerator.obj | 0 .../textures/homedecor_copper_pans_inv.png | Bin .../textures/homedecor_dishwasher_back.png | Bin .../textures/homedecor_dishwasher_bottom.png | Bin .../textures/homedecor_dishwasher_front.png | Bin .../textures/homedecor_dishwasher_sides.png | Bin .../textures/homedecor_dishwasher_top.png | Bin .../homedecor_kitchen_cabinet_bevel.png | Bin .../homedecor_kitchen_cabinet_front.png | Bin .../homedecor_kitchen_cabinet_front_half.png | Bin .../homedecor_kitchen_cabinet_top.png | Bin .../homedecor_kitchen_cabinet_top_granite.png | Bin .../homedecor_kitchen_cabinet_top_marble.png | Bin .../homedecor_kitchen_cabinet_top_steel.png | Bin .../homedecor_kitchen_cabinet_top_wood.png | Bin .../textures/homedecor_kitchen_faucet_inv.png | Bin .../textures/homedecor_kitchen_sink_top.png | Bin .../textures/homedecor_microwave_front.png | Bin .../homedecor_microwave_front_active.png | Bin .../textures/homedecor_microwave_top.png | Bin .../textures/homedecor_oven_bottom.png | Bin .../textures/homedecor_oven_front.png | Bin .../textures/homedecor_oven_front_active.png | Bin .../textures/homedecor_oven_side.png | Bin .../textures/homedecor_oven_steel_bottom.png | Bin .../textures/homedecor_oven_steel_front.png | Bin .../homedecor_oven_steel_front_active.png | Bin .../textures/homedecor_oven_steel_side.png | Bin .../textures/homedecor_oven_steel_top.png | Bin .../textures/homedecor_oven_top.png | Bin .../textures/homedecor_paper_towel_inv.png | Bin .../textures/homedecor_refrigerator_steel.png | Bin .../homedecor_refrigerator_steel_inv.png | Bin .../textures/homedecor_refrigerator_white.png | Bin .../homedecor_refrigerator_white_inv.png | Bin homedecor_laundry/depends.txt | 5 + homedecor_laundry/init.lua | 112 + .../models/homedecor_ironing_board.obj | 0 .../textures/homedecor_dryer_back.png | Bin .../textures/homedecor_dryer_bottom.png | Bin .../textures/homedecor_dryer_front.png | Bin .../textures/homedecor_dryer_sides.png | Bin .../textures/homedecor_dryer_top.png | Bin .../homedecor_washing_machine_back.png | Bin .../homedecor_washing_machine_bottom.png | Bin .../homedecor_washing_machine_front.png | Bin .../homedecor_washing_machine_sides.png | Bin .../homedecor_washing_machine_top.png | Bin {homedecor => homedecor_lighting}/depends.txt | 14 +- .../init.lua | 336 +- .../models/homedecor_candle_thick.obj | 0 .../models/homedecor_candle_thin.obj | 0 .../models/homedecor_candlestick.obj | 0 .../models/homedecor_ceiling_lamp.obj | 0 .../models/homedecor_ceiling_lantern.obj | 0 .../models/homedecor_chains_top.obj | 0 .../models/homedecor_chandelier.obj | 0 .../models/homedecor_desk_lamp.obj | 0 .../models/homedecor_ground_lantern.obj | 0 .../models/homedecor_hanging_lantern.obj | 0 .../models/homedecor_oil_lamp.obj | 0 .../models/homedecor_oil_lamp_tabletop.obj | 0 .../models/homedecor_plasma_ball.obj | 0 .../models/homedecor_standing_lamp.obj | 0 .../models/homedecor_table_lamp.obj | 0 .../models/homedecor_wall_sconce.obj | 0 .../models/plasma_lamp.obj | 0 .../textures/homedecor_candle_flame.png | Bin .../textures/homedecor_candle_flat.png | Bin .../textures/homedecor_candle_inv.png | Bin .../textures/homedecor_candle_sides.png | Bin .../textures/homedecor_candle_thin_inv.png | Bin .../homedecor_candlestick_brass_inv.png | Bin ...homedecor_candlestick_wrought_iron_inv.png | Bin .../textures/homedecor_ceiling_lamp_glass.png | Bin .../textures/homedecor_ceiling_lamp_inv.png | Bin .../homedecor_ceiling_lantern_inv.png | Bin .../textures/homedecor_desk_lamp_inv.png | Bin .../textures/homedecor_glowlight_bottom.png | Bin .../homedecor_glowlight_cube_sides.png | Bin ...homedecor_glowlight_cube_sides_overlay.png | Bin .../textures/homedecor_glowlight_cube_tb.png | Bin .../homedecor_glowlight_cube_tb_overlay.png | Bin .../homedecor_glowlight_thick_sides.png | Bin ...omedecor_glowlight_thick_sides_overlay.png | Bin .../homedecor_glowlight_thin_sides.png | Bin ...homedecor_glowlight_thin_sides_overlay.png | Bin .../textures/homedecor_glowlight_top.png | Bin .../homedecor_glowlight_top_overlay.png | Bin .../textures/homedecor_ground_lantern_inv.png | Bin .../homedecor_hanging_lantern_inv.png | Bin .../homedecor_lattice_lantern_large.png | Bin .../homedecor_lattice_lantern_small_sides.png | Bin .../homedecor_lattice_lantern_small_tb.png | Bin .../textures/homedecor_oil_lamp_glass.png | Bin .../textures/homedecor_oil_lamp_inv.png | Bin .../textures/homedecor_oil_lamp_tabletop.png | Bin .../homedecor_oil_lamp_tabletop_inv.png | Bin .../textures/homedecor_oil_lamp_wick.png | Bin .../textures/homedecor_plasma_ball_glass.png | Bin .../textures/homedecor_plasma_ball_inv.png | Bin .../homedecor_plasma_ball_streamers.png | Bin .../textures/homedecor_plasma_storm.png | Bin .../homedecor_standing_lamp_foot_inv.png | Bin .../homedecor_standing_lamp_top_inv.png | Bin .../homedecor_table_lamp_foot_inv.png | Bin .../textures/homedecor_table_lamp_top_inv.png | Bin ...omedecor_table_standing_lamp_lightbulb.png | Bin .../textures/homedecor_wall_sconce_back.png | Bin .../textures/homedecor_wall_sconce_inv.png | Bin homedecor_misc/depends.txt | 8 + .../misc-nodes.lua => homedecor_misc/init.lua | 478 ++- .../homedecor_banister_diagonal_left.obj | 0 .../homedecor_banister_diagonal_right.obj | 0 .../models/homedecor_banister_horizontal.obj | 0 .../models/homedecor_dartboard.obj | 0 .../models/homedecor_dvd_cabinet.obj | 0 .../models/homedecor_fishtank.obj | 0 .../models/homedecor_flowerpot.obj | 0 .../models/homedecor_piano.obj | 0 .../models/homedecor_pool_table.obj | 0 .../models/homedecor_potted_plant.obj | 0 .../models/homedecor_round_pole.obj | 0 .../models/homedecor_skateboard.obj | 0 .../models/homedecor_small_rug.obj | 0 .../models/homedecor_spiral_staircase.obj | 0 .../models/homedecor_sport_bench.obj | 0 .../models/homedecor_tool_cabinet.obj | 0 .../models/homedecor_trophy.obj | 0 .../sounds/homedecor_book_close.ogg | Bin .../sounds/homedecor_door_close.ogg | Bin .../sounds/homedecor_door_open.ogg | Bin .../sounds/homedecor_faucet.ogg | Bin .../sounds/homedecor_gate_open_close.ogg | Bin .../sounds/homedecor_shower.ogg | Bin .../sounds/homedecor_toilet_flush.ogg | Bin .../sounds/homedecor_trash_all.ogg | Bin .../sounds/insert_coin.ogg | Bin .../sounds/toaster.ogg | Bin .../textures/flowers_bonsai.png | Bin .../textures/flowers_cactus.png | Bin .../textures/homedecor_banister_brass_inv.png | Bin .../homedecor_banister_white_dark_inv.png | Bin .../homedecor_banister_wood_colored_inv.png | Bin .../textures/homedecor_banister_wood_inv.png | Bin .../homedecor_banister_wrought_iron_inv.png | Bin .../textures/homedecor_cardbox_big_sides.png | Bin .../textures/homedecor_cardbox_big_tb.png | Bin .../textures/homedecor_cardbox_sides.png | Bin .../textures/homedecor_cardbox_tb.png | Bin .../textures/homedecor_ceiling_paint.png | Bin .../homedecor_ceiling_paint_roller.png | Bin .../textures/homedecor_ceiling_tile.png | Bin .../textures/homedecor_dartboard.png | Bin .../textures/homedecor_dartboard_inv.png | Bin .../textures/homedecor_dvdcd_cabinet_back.png | Bin .../homedecor_dvdcd_cabinet_front.png | Bin .../textures/homedecor_fishtank_filter.png | Bin .../textures/homedecor_fishtank_fishes.png | Bin .../homedecor_fishtank_fishes_lighted.png | Bin .../textures/homedecor_fishtank_gravel.png | Bin .../homedecor_fishtank_gravel_lighted.png | Bin .../textures/homedecor_fishtank_sides.png | Bin .../homedecor_fishtank_sides_lighted.png | Bin .../textures/homedecor_fishtank_water_top.png | Bin .../homedecor_fishtank_water_top_lighted.png | Bin .../textures/homedecor_flower_pot_black.png | Bin .../textures/homedecor_flower_pot_green.png | Bin .../homedecor_flower_pot_terracotta.png | Bin .../homedecor_flowerpot_small_inv.png | Bin .../textures/homedecor_piano_inv.png | Bin .../textures/homedecor_piano_keys.png | Bin .../textures/homedecor_pole_brass_inv.png | Bin .../homedecor_pole_wrought_iron_inv.png | Bin .../textures/homedecor_pool_table_baize.png | Bin .../textures/homedecor_pool_table_balls.png | Bin .../textures/homedecor_pool_table_cue.png | Bin .../textures/homedecor_pool_table_inv.png | Bin .../textures/homedecor_pool_table_pockets.png | Bin .../textures/homedecor_rug_large.png | Bin .../textures/homedecor_rug_persian.png | Bin .../textures/homedecor_rug_small.png | Bin .../textures/homedecor_skateboard.png | Bin .../textures/homedecor_skateboard_inv.png | Bin .../textures/homedecor_sport_bench_inv.png | Bin .../textures/homedecor_tatami.png | Bin .../homedecor_tool_cabinet_drawers.png | Bin .../textures/homedecor_tool_cabinet_inv.png | Bin .../textures/homedecor_tool_cabinet_misc.png | Bin .../textures/homedecor_trophy_inv.png | Bin .../textures/top_chain_brass_inv.png | Bin .../textures/top_chain_wrought_iron_inv.png | Bin homedecor_office/depends.txt | 7 + .../office.lua => homedecor_office/init.lua | 76 + .../models/homedecor_calendar.obj | 0 .../models/homedecor_desk.obj | 0 .../models/homedecor_desk_globe.obj | 0 .../models/homedecor_filing_cabinet.obj | 0 .../models/homedecor_office_chair_basic.obj | 0 .../models/homedecor_office_chair_upscale.obj | 0 .../textures/homedecor_calendar.png | Bin .../textures/homedecor_calendar_inv.png | Bin .../textures/homedecor_desk_drawers.png | Bin .../textures/homedecor_desk_globe_inv.png | Bin .../textures/homedecor_desk_inv.png | Bin .../textures/homedecor_earth.png | Bin .../homedecor_filing_cabinet_bottom.png | Bin .../homedecor_filing_cabinet_front.png | Bin .../textures/homedecor_office_chair_basic.png | Bin .../homedecor_office_chair_upscale.png | Bin homedecor_pictures_and_paintings/depends.txt | 4 + homedecor_pictures_and_paintings/init.lua | 162 + .../models/homedecor_painting.obj | 0 .../models/homedecor_picture_frame.obj | 0 .../textures/homedecor_blank_canvas.png | Bin .../textures/homedecor_painting1.png | Bin .../textures/homedecor_painting10.png | Bin .../textures/homedecor_painting11.png | Bin .../textures/homedecor_painting12.png | Bin .../textures/homedecor_painting13.png | Bin .../textures/homedecor_painting14.png | Bin .../textures/homedecor_painting15.png | Bin .../textures/homedecor_painting16.png | Bin .../textures/homedecor_painting17.png | Bin .../textures/homedecor_painting18.png | Bin .../textures/homedecor_painting19.png | Bin .../textures/homedecor_painting2.png | Bin .../textures/homedecor_painting20.png | Bin .../textures/homedecor_painting3.png | Bin .../textures/homedecor_painting4.png | Bin .../textures/homedecor_painting5.png | Bin .../textures/homedecor_painting6.png | Bin .../textures/homedecor_painting7.png | Bin .../textures/homedecor_painting8.png | Bin .../textures/homedecor_painting9.png | Bin .../textures/homedecor_painting_back.png | Bin .../textures/homedecor_picture_frame1_inv.png | Bin .../textures/homedecor_picture_frame2_inv.png | Bin .../textures/homedecor_picture_frame_back.png | Bin .../homedecor_picture_frame_image1.png | Bin .../homedecor_picture_frame_image2.png | Bin homedecor_roofing/depends.txt | 4 + .../roofing.lua => homedecor_roofing/init.lua | 52 +- .../homedecor_shingles_asphalt_inv.png | Bin .../textures/homedecor_shingles_glass.png | Bin .../textures/homedecor_shingles_wood_inv.png | Bin .../textures/homedecor_skylight_frosted.png | Bin .../homedecor_skylight_frosted_inv.png | Bin .../textures/homedecor_skylight_inv.png | Bin homedecor_tables/depends.txt | 4 + .../tables.lua => homedecor_tables/init.lua | 169 + .../models/homedecor_table_small_round.obj | 0 .../models/homedecor_table_small_square.obj | 0 .../textures/homedecor_glass_face_clean.png | Bin .../homedecor_glass_table_large_edges.png | Bin .../homedecor_glass_table_large_inv.png | Bin .../homedecor_glass_table_large_tb.png | Bin .../homedecor_glass_table_small_round.png | Bin .../homedecor_glass_table_small_round_inv.png | Bin .../homedecor_glass_table_small_square.png | Bin ...homedecor_glass_table_small_square_inv.png | Bin .../textures/homedecor_table_legs_brass.png | Bin .../homedecor_table_legs_wrought_iron.png | Bin .../homedecor_utility_table_edges.png | Bin .../textures/homedecor_utility_table_legs.png | Bin .../homedecor_utility_table_legs_inv.png | Bin .../textures/homedecor_utility_table_tb.png | Bin .../homedecor_wood_table_large_edges.png | Bin .../homedecor_wood_table_large_inv.png | Bin .../homedecor_wood_table_large_tb.png | Bin .../homedecor_wood_table_small_round.png | Bin .../homedecor_wood_table_small_round_inv.png | Bin .../homedecor_wood_table_small_square.png | Bin .../homedecor_wood_table_small_square_inv.png | Bin homedecor_trash_cans/depends.txt | 5 + .../init.lua | 26 +- .../models/homedecor_trash_can.obj | 0 .../models/homedecor_trash_can_green.obj | 0 .../models/homedecor_trash_can_green_open.obj | 0 .../textures/homedecor_trash_can.png | Bin .../homedecor_trash_can_green_inv.png | Bin .../textures/homedecor_trash_can_inv.png | Bin homedecor_wardrobe/depends.txt | 4 +- homedecor_windows_and_treatments/depends.txt | 6 + .../init.lua | 279 +- .../models/homedecor_window_shutter.obj | 0 .../models/homedecor_windowblind_thick.obj | 0 .../models/homedecor_windowblind_thin.obj | 0 .../textures/homedecor_curtain.png | Bin .../textures/homedecor_curtain_open.png | Bin .../homedecor_curtainrod_brass_inv.png | Bin .../homedecor_curtainrod_wood_inv.png | Bin .../homedecor_curtainrod_wrought_iron_inv.png | Bin .../textures/homedecor_flowerbox_bottom.png | Bin .../textures/homedecor_flowerbox_inv.png | Bin .../textures/homedecor_flowerbox_sides.png | Bin .../textures/homedecor_flowerbox_top.png | Bin .../textures/homedecor_stained_glass.png | Bin .../textures/homedecor_window_frame.png | Bin .../textures/homedecor_window_quartered.png | Bin .../textures/homedecor_window_shutter.png | Bin .../textures/homedecor_window_shutter_inv.png | Bin .../textures/homedecor_window_sides.png | Bin .../homedecor_windowblind_strings.png | Bin .../homedecor_windowblind_thick_inv.png | Bin .../homedecor_windowblind_thin_inv.png | Bin .../textures/homedecor_windowblinds.png | Bin homedecor/listnodes.sh => listnodes.sh | 0 732 files changed, 4520 insertions(+), 4430 deletions(-) rename homedecor/copyright.txt => copyright.txt (82%) delete mode 100644 homedecor/bathroom_furniture.lua delete mode 100644 homedecor/crafts.lua delete mode 100644 homedecor/electronics.lua delete mode 100644 homedecor/furniture_recipes.lua delete mode 100644 homedecor/handlers/init.lua delete mode 100644 homedecor/kitchen_appliances.lua delete mode 100644 homedecor/kitchen_furniture.lua delete mode 100644 homedecor/laundry.lua delete mode 100644 homedecor/shutters.lua delete mode 100644 homedecor/textures/homedecor_coin.png delete mode 100644 homedecor/textures/homedecor_fan_blades.png delete mode 100644 homedecor/textures/homedecor_marble.png delete mode 100644 homedecor/textures/homedecor_wardrobe_doors.png delete mode 100644 homedecor/textures/homedecor_wardrobe_drawers.png delete mode 100644 homedecor/textures/homedecor_wardrobe_inv.png create mode 100644 homedecor_bathroom/depends.txt rename homedecor/bathroom_sanitation.lua => homedecor_bathroom/init.lua (56%) rename {homedecor => homedecor_bathroom}/models/homedecor_bathroom_faucet.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_bathroom_set.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_bathroom_sink.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_bathtub_clawfoot.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_medicine_cabinet.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_medicine_cabinet_open.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_shower_head.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_toilet_closed.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_toilet_open.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_toilet_paper.obj (100%) rename {homedecor => homedecor_bathroom}/models/homedecor_towel_rod.obj (100%) rename {homedecor => homedecor_bathroom}/textures/3dforniture_taps_brass_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/3dforniture_taps_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/forniture_marble_base_ducha_top.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_cup.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_mirror.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_toothbrush.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_toothpaste.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_set_tray.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_sink_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_tiles_bg.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathroom_tiles_fg.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_bathtub_clawfoot_bottom_inside.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_medicine_cabinet_inside.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_medicine_cabinet_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_medicine_cabinet_mirror.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_shower_head.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_shower_head_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_toilet_paper_inv.png (100%) rename {homedecor => homedecor_bathroom}/textures/homedecor_towel_rod_inv.png (100%) create mode 100644 homedecor_bedroom/depends.txt rename homedecor/bedroom.lua => homedecor_bedroom/init.lua (74%) rename {homedecor => homedecor_bedroom}/models/homedecor_bed_extended.obj (100%) rename {homedecor => homedecor_bedroom}/models/homedecor_bed_kingsize.obj (100%) rename {homedecor => homedecor_bedroom}/models/homedecor_bed_regular.obj (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_bed_bottom.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_bed_frame.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_bed_inv.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_bed_kingsize_inv.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_mahogany_1_drawer_front.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_mahogany_2_drawer_front.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_mahogany_back.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_mahogany_lr.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_mahogany_tb.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_oak_1_drawer_front.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_oak_2_drawer_front.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_oak_back.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_oak_lr.png (100%) rename {homedecor => homedecor_bedroom}/textures/homedecor_nightstand_oak_tb.png (100%) create mode 100644 homedecor_books/depends.txt rename homedecor/books.lua => homedecor_books/init.lua (95%) rename {homedecor => homedecor_books}/models/homedecor_book.obj (100%) rename {homedecor => homedecor_books}/models/homedecor_book_open.obj (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_cover.png (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_cover_trim.png (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_edges.png (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_inv.png (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_pages.png (100%) rename {homedecor => homedecor_books}/textures/homedecor_book_trim_inv.png (100%) create mode 100644 homedecor_climate_control/depends.txt rename homedecor/climate-control.lua => homedecor_climate_control/init.lua (65%) rename {homedecor => homedecor_climate_control}/models/homedecor_ac.obj (100%) rename {homedecor => homedecor_climate_control}/models/homedecor_desk_fan.b3d (100%) rename {homedecor => homedecor_climate_control}/models/homedecor_radiator.obj (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_ac.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_ceiling_fan_bottom.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_ceiling_fan_inv.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_ceiling_fan_sides.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_ceiling_fan_top.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_desk_fan_body.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_desk_fan_inv.png (100%) rename {homedecor/models => homedecor_climate_control/textures}/homedecor_desk_fan_uv.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_heater_back.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_heater_front.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_heater_inv.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_heater_sides.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_heater_tb.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_radiator_controls.png (100%) rename {homedecor => homedecor_climate_control}/textures/homedecor_radiator_inv.png (100%) create mode 100644 homedecor_clocks/depends.txt rename homedecor/clocks.lua => homedecor_clocks/init.lua (59%) rename {homedecor => homedecor_clocks}/models/homedecor_analog_clock.obj (100%) rename {homedecor => homedecor_clocks}/models/homedecor_grandfather_clock.obj (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_back.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_bottom.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_front.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_inv.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_sides.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_alarm_clock_top.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_analog_clock_back.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_analog_clock_face.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_analog_clock_plastic_inv.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_analog_clock_wood_inv.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_digital_clock_back.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_digital_clock_edges.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_digital_clock_front.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_digital_clock_inv.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_grandfather_clock_face.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_grandfather_clock_face_edge.png (100%) rename {homedecor => homedecor_clocks}/textures/homedecor_grandfather_clock_inv.png (100%) create mode 100644 homedecor_cobweb/depends.txt rename homedecor/cobweb.lua => homedecor_cobweb/init.lua (92%) rename {homedecor => homedecor_cobweb}/textures/homedecor_cobweb.png (100%) rename {homedecor => homedecor_cobweb}/textures/homedecor_cobweb_plantlike.png (100%) rename {homedecor => homedecor_cobweb}/textures/homedecor_cobweb_torchlike.png (100%) create mode 100644 homedecor_common/crafts.lua create mode 100644 homedecor_common/depends.txt rename {homedecor/handlers => homedecor_common}/expansion.lua (100%) rename {homedecor/handlers => homedecor_common}/furnaces.lua (100%) rename {homedecor => homedecor_common}/init.lua (54%) rename {homedecor/handlers => homedecor_common}/inventory.lua (100%) rename {homedecor => homedecor_common}/models/homedecor_cube.obj (100%) rename {homedecor => homedecor_common}/models/homedecor_slope.obj (100%) rename {homedecor => homedecor_common}/models/homedecor_slope_inner_corner.obj (100%) rename {homedecor => homedecor_common}/models/homedecor_slope_outer_corner.obj (100%) rename {homedecor/handlers => homedecor_common}/mt_game_beds_functions.lua (100%) rename {homedecor/handlers => homedecor_common}/nodeboxes.lua (100%) rename {homedecor/handlers => homedecor_common}/registration.lua (98%) rename {homedecor/handlers => homedecor_common}/sit.lua (100%) rename {homedecor => homedecor_common}/textures/homedecor_blanktile.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_drawer_small.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_brass.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_bright.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_gold.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_gold2.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_lines_overlay.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_metal_wrought_iron.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_plastic.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_quilted_paper.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_terrycloth.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_wood_luxury.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_wood_old.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_wood_plain.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_generic_wood_red.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_light.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_polished_copper.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_roof_tile_terracotta.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_shingles_asphalt.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_shingles_terracotta.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_shingles_terracotta_inv.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_shingles_wood.png (100%) rename {homedecor => homedecor_common}/textures/homedecor_water_particle.png (100%) rename {homedecor/handlers => homedecor_common}/water_particles.lua (100%) create mode 100644 homedecor_doors_and_gates/depends.txt rename homedecor/doors_and_gates.lua => homedecor_doors_and_gates/init.lua (78%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_closet.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_closet_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_fancy.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_fancy_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_japanese_closed.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_japanese_open.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_plain.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_plain_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_wood_glass.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_wood_glass_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_woodglass_typea.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_woodglass_typea_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_wrought_iron.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_door_wrought_iron_right.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_wall_japanese_bottom.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_wall_japanese_middle.obj (100%) rename {homedecor => homedecor_doors_and_gates}/models/homedecor_wall_japanese_top.obj (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_bedroom.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_bedroom_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_closet_mahogany.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_closet_mahogany_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_closet_oak.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_closet_oak_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_exterior_fancy.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_exterior_fancy_insert.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_exterior_fancy_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_glass.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_glass_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_japanese_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_insert.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_mahogany.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_mahogany_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_oak.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_oak_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_white.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_glass_white_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_plain.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wood_plain_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_woodglass2.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_woodglass2_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_woodglass_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_woodglass_typea.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_woodglass_typea_insert.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wrought_iron.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_door_wrought_iron_inv.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_barbed_wire_edges.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_barbed_wire_fb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_chainlink_fb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_chainlink_lr.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_chainlink_tb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_fb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_lr.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_tb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_white_fb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_white_lr.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_half_door_white_tb.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_picket_back.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_picket_front.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_picket_white_back.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_gate_picket_white_front.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_japanese_paper.png (100%) rename {homedecor => homedecor_doors_and_gates}/textures/homedecor_jpn_door_inv.png (100%) create mode 100644 homedecor_electrical/depends.txt rename homedecor/electrics.lua => homedecor_electrical/init.lua (68%) rename {homedecor => homedecor_electrical}/sounds/homedecor_doorbell.ogg (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_doorbell.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_doorbell_inv.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_light_switch_back.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_light_switch_edges.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_light_switch_front.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_light_switch_inv.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_outlet_back.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_outlet_edges.png (100%) rename {homedecor => homedecor_electrical}/textures/homedecor_outlet_inv.png (100%) create mode 100644 homedecor_electronics/depends.txt create mode 100644 homedecor_electronics/init.lua rename {homedecor => homedecor_electronics}/models/homedecor_speaker_large.obj (100%) rename {homedecor => homedecor_electronics}/models/homedecor_speaker_large_open.obj (100%) rename {homedecor => homedecor_electronics}/models/homedecor_speaker_small.obj (100%) rename {homedecor => homedecor_electronics}/models/homedecor_telephone.obj (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvd_player.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_back.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_bottom.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_front.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_inv.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_sides.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_dvdvcr_top.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_projection_screen.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_projection_screen_inv.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_speaker_driver.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_speaker_driver_inv.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_speaker_front.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_speaker_open_front.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_speaker_sides.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_stereo_back.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_stereo_bottom.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_stereo_front.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_stereo_left.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_stereo_top.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_telephone_base.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_telephone_cord.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_telephone_dial.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_telephone_handset.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_telephone_inv.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_back.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_bottom.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_front.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_front_animated.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_left.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_television_top.png (100%) rename {homedecor => homedecor_electronics}/textures/homedecor_vcr.png (100%) create mode 100644 homedecor_exterior/depends.txt rename homedecor/exterior.lua => homedecor_exterior/init.lua (64%) rename {homedecor => homedecor_exterior}/models/homedecor_barbecue.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_bench_large_1.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_bench_large_2.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_chimney.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_deckchair.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_doghouse.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_shrubbery.obj (100%) rename {homedecor => homedecor_exterior}/models/homedecor_well.obj (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_barbecue_meat.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_bench_large_1_inv.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_bench_large_2_inv.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_chimney_tb.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_deckchair.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_deckchair_striped_blue.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_doghouse_inv.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_embers.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_lattice.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_lattice_vegetal.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_rope_texture.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_green.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_green_bottom.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_red.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_red_bottom.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_roots.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_yellow.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_shrubbery_yellow_bottom.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_stonepath_inv.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_swing_inv.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_swing_top.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_swingrope_sides.png (100%) rename {homedecor => homedecor_exterior}/textures/homedecor_well_inv.png (100%) create mode 100644 homedecor_fences/depends.txt rename homedecor/fences.lua => homedecor_fences/init.lua (71%) rename {homedecor => homedecor_fences}/models/homedecor_fence_barbed_wire.obj (100%) rename {homedecor => homedecor_fences}/models/homedecor_fence_barbed_wire_corner.obj (100%) rename {homedecor => homedecor_fences}/models/homedecor_fence_chainlink.obj (100%) rename {homedecor => homedecor_fences}/models/homedecor_fence_chainlink_corner.obj (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_barbed_wire.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_brass.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_chainlink_corner_front.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_chainlink_corner_top.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_chainlink_fb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_chainlink_sides.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_chainlink_tb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_corner_wrought_iron_2_sides.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_corner_wrought_iron_2_tb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_picket.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_picket_backside.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_picket_white.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_picket_white_backside.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_backside.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_backside2.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_corner_front.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_corner_right.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_corner_tb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_front.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_sides.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_privacy_tb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_wrought_iron.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_wrought_iron_2_fb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_wrought_iron_2_sides.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_fence_wrought_iron_2_tb.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post_back.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post_bottom.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post_front.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post_side.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_brass_post_top.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post_back.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post_bottom.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post_front.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post_side.png (100%) rename {homedecor => homedecor_fences}/textures/homedecor_sign_wrought_iron_post_top.png (100%) create mode 100644 homedecor_foyer/depends.txt rename homedecor/foyer.lua => homedecor_foyer/init.lua (63%) rename {homedecor => homedecor_foyer}/models/homedecor_coatrack.obj (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_coatrack_inv.png (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_coatrack_wallmount_inv.png (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_welcome_mat_bottom.png (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_welcome_mat_brown.png (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_welcome_mat_green.png (100%) rename {homedecor => homedecor_foyer}/textures/homedecor_welcome_mat_grey.png (100%) create mode 100644 homedecor_furniture/depends.txt rename homedecor/furniture.lua => homedecor_furniture/init.lua (53%) rename {homedecor => homedecor_furniture}/models/forniture_armchair.obj (100%) rename {homedecor => homedecor_furniture}/models/homedecor_kitchen_chair.obj (100%) rename {homedecor => homedecor_furniture}/models/homedecor_openframe_bookshelf.obj (100%) rename {homedecor => homedecor_furniture}/textures/homedecor_armchair_inv.png (100%) rename {homedecor => homedecor_furniture}/textures/homedecor_chair_padded_inv.png (100%) rename {homedecor => homedecor_furniture}/textures/homedecor_chair_wood_inv.png (100%) rename {homedecor => homedecor_furniture}/textures/homedecor_openframe_bookshelf_books.png (100%) create mode 100644 homedecor_furniture_medieval/depends.txt rename homedecor/furniture_medieval.lua => homedecor_furniture_medieval/init.lua (100%) rename {homedecor => homedecor_furniture_medieval}/models/forniture_chains.obj (100%) rename {homedecor => homedecor_furniture_medieval}/models/forniture_torch.obj (100%) rename {homedecor => homedecor_furniture_medieval}/models/homedecor_wall_lamp.obj (100%) rename {homedecor => homedecor_furniture_medieval}/textures/forniture_chains_inv.png (100%) rename {homedecor => homedecor_furniture_medieval}/textures/forniture_coal.png (100%) rename {homedecor => homedecor_furniture_medieval}/textures/forniture_marble_top_toilet.png (100%) rename {homedecor => homedecor_furniture_medieval}/textures/forniture_torch_flame.png (100%) rename {homedecor => homedecor_furniture_medieval}/textures/forniture_torch_inv.png (100%) rename {homedecor => homedecor_furniture_medieval}/textures/homedecor_wall_lamp_inv.png (100%) create mode 100644 homedecor_gastronomy/depends.txt rename homedecor/gastronomy.lua => homedecor_gastronomy/init.lua (53%) rename {homedecor => homedecor_gastronomy}/models/homedecor_4_bottles.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_beer_mug.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_beer_taps.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_bottle.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_coffeemaker.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_cutlery_set.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_soda_machine.obj (100%) rename {homedecor => homedecor_gastronomy}/models/homedecor_wine_rack.obj (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_4_bottles_brown_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_4_bottles_green_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_4_bottles_multi_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_beer_mug.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_beer_mug_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_beertap_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_brown.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_brown2.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_brown3.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_brown4.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_brown_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_green.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_bottle_green_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_coffeemaker_case.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_coffeemaker_cup.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_coffeemaker_decanter.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_coffeemaker_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_cutlery_set.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_cutlery_set_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_soda_can.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_soda_machine.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_steam.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_toaster_inv.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_toaster_sides.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_toaster_toploaf.png (100%) rename {homedecor => homedecor_gastronomy}/textures/homedecor_wine_rack_inv.png (100%) create mode 100644 homedecor_kitchen/depends.txt create mode 100644 homedecor_kitchen/init.lua rename {homedecor => homedecor_kitchen}/models/homedecor_copper_pans.obj (100%) rename {homedecor => homedecor_kitchen}/models/homedecor_kitchen_faucet.obj (100%) rename {homedecor => homedecor_kitchen}/models/homedecor_kitchen_sink.obj (100%) rename {homedecor => homedecor_kitchen}/models/homedecor_paper_towel.obj (100%) rename {homedecor => homedecor_kitchen}/models/homedecor_refrigerator.obj (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_copper_pans_inv.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_dishwasher_back.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_dishwasher_bottom.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_dishwasher_front.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_dishwasher_sides.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_dishwasher_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_bevel.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_front.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_front_half.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_top_granite.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_top_marble.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_top_steel.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_cabinet_top_wood.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_faucet_inv.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_kitchen_sink_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_microwave_front.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_microwave_front_active.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_microwave_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_bottom.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_front.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_front_active.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_side.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_steel_bottom.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_steel_front.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_steel_front_active.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_steel_side.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_steel_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_oven_top.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_paper_towel_inv.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_refrigerator_steel.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_refrigerator_steel_inv.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_refrigerator_white.png (100%) rename {homedecor => homedecor_kitchen}/textures/homedecor_refrigerator_white_inv.png (100%) create mode 100644 homedecor_laundry/depends.txt create mode 100644 homedecor_laundry/init.lua rename {homedecor => homedecor_laundry}/models/homedecor_ironing_board.obj (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_dryer_back.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_dryer_bottom.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_dryer_front.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_dryer_sides.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_dryer_top.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_washing_machine_back.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_washing_machine_bottom.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_washing_machine_front.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_washing_machine_sides.png (100%) rename {homedecor => homedecor_laundry}/textures/homedecor_washing_machine_top.png (100%) rename {homedecor => homedecor_lighting}/depends.txt (51%) rename homedecor/lighting.lua => homedecor_lighting/init.lua (76%) rename {homedecor => homedecor_lighting}/models/homedecor_candle_thick.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_candle_thin.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_candlestick.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_ceiling_lamp.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_ceiling_lantern.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_chains_top.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_chandelier.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_desk_lamp.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_ground_lantern.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_hanging_lantern.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_oil_lamp.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_oil_lamp_tabletop.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_plasma_ball.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_standing_lamp.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_table_lamp.obj (100%) rename {homedecor => homedecor_lighting}/models/homedecor_wall_sconce.obj (100%) rename {homedecor => homedecor_lighting}/models/plasma_lamp.obj (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candle_flame.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candle_flat.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candle_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candle_sides.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candle_thin_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candlestick_brass_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_candlestick_wrought_iron_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_ceiling_lamp_glass.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_ceiling_lamp_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_ceiling_lantern_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_desk_lamp_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_bottom.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_cube_sides.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_cube_sides_overlay.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_cube_tb.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_cube_tb_overlay.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_thick_sides.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_thick_sides_overlay.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_thin_sides.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_thin_sides_overlay.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_top.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_glowlight_top_overlay.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_ground_lantern_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_hanging_lantern_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_lattice_lantern_large.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_lattice_lantern_small_sides.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_lattice_lantern_small_tb.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_oil_lamp_glass.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_oil_lamp_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_oil_lamp_tabletop.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_oil_lamp_tabletop_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_oil_lamp_wick.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_plasma_ball_glass.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_plasma_ball_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_plasma_ball_streamers.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_plasma_storm.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_standing_lamp_foot_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_standing_lamp_top_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_table_lamp_foot_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_table_lamp_top_inv.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_table_standing_lamp_lightbulb.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_wall_sconce_back.png (100%) rename {homedecor => homedecor_lighting}/textures/homedecor_wall_sconce_inv.png (100%) create mode 100644 homedecor_misc/depends.txt rename homedecor/misc-nodes.lua => homedecor_misc/init.lua (59%) rename {homedecor => homedecor_misc}/models/homedecor_banister_diagonal_left.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_banister_diagonal_right.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_banister_horizontal.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_dartboard.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_dvd_cabinet.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_fishtank.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_flowerpot.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_piano.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_pool_table.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_potted_plant.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_round_pole.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_skateboard.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_small_rug.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_spiral_staircase.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_sport_bench.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_tool_cabinet.obj (100%) rename {homedecor => homedecor_misc}/models/homedecor_trophy.obj (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_book_close.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_door_close.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_door_open.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_faucet.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_gate_open_close.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_shower.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_toilet_flush.ogg (100%) rename {homedecor => homedecor_misc}/sounds/homedecor_trash_all.ogg (100%) rename {homedecor => homedecor_misc}/sounds/insert_coin.ogg (100%) rename {homedecor => homedecor_misc}/sounds/toaster.ogg (100%) rename {homedecor => homedecor_misc}/textures/flowers_bonsai.png (100%) rename {homedecor => homedecor_misc}/textures/flowers_cactus.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_banister_brass_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_banister_white_dark_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_banister_wood_colored_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_banister_wood_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_banister_wrought_iron_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_cardbox_big_sides.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_cardbox_big_tb.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_cardbox_sides.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_cardbox_tb.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_ceiling_paint.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_ceiling_paint_roller.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_ceiling_tile.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_dartboard.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_dartboard_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_dvdcd_cabinet_back.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_dvdcd_cabinet_front.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_filter.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_fishes.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_fishes_lighted.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_gravel.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_gravel_lighted.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_sides.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_sides_lighted.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_water_top.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_fishtank_water_top_lighted.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_flower_pot_black.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_flower_pot_green.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_flower_pot_terracotta.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_flowerpot_small_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_piano_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_piano_keys.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pole_brass_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pole_wrought_iron_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pool_table_baize.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pool_table_balls.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pool_table_cue.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pool_table_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_pool_table_pockets.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_rug_large.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_rug_persian.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_rug_small.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_skateboard.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_skateboard_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_sport_bench_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_tatami.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_tool_cabinet_drawers.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_tool_cabinet_inv.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_tool_cabinet_misc.png (100%) rename {homedecor => homedecor_misc}/textures/homedecor_trophy_inv.png (100%) rename {homedecor => homedecor_misc}/textures/top_chain_brass_inv.png (100%) rename {homedecor => homedecor_misc}/textures/top_chain_wrought_iron_inv.png (100%) create mode 100644 homedecor_office/depends.txt rename homedecor/office.lua => homedecor_office/init.lua (63%) rename {homedecor => homedecor_office}/models/homedecor_calendar.obj (100%) rename {homedecor => homedecor_office}/models/homedecor_desk.obj (100%) rename {homedecor => homedecor_office}/models/homedecor_desk_globe.obj (100%) rename {homedecor => homedecor_office}/models/homedecor_filing_cabinet.obj (100%) rename {homedecor => homedecor_office}/models/homedecor_office_chair_basic.obj (100%) rename {homedecor => homedecor_office}/models/homedecor_office_chair_upscale.obj (100%) rename {homedecor => homedecor_office}/textures/homedecor_calendar.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_calendar_inv.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_desk_drawers.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_desk_globe_inv.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_desk_inv.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_earth.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_filing_cabinet_bottom.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_filing_cabinet_front.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_office_chair_basic.png (100%) rename {homedecor => homedecor_office}/textures/homedecor_office_chair_upscale.png (100%) create mode 100644 homedecor_pictures_and_paintings/depends.txt create mode 100644 homedecor_pictures_and_paintings/init.lua rename {homedecor => homedecor_pictures_and_paintings}/models/homedecor_painting.obj (100%) rename {homedecor => homedecor_pictures_and_paintings}/models/homedecor_picture_frame.obj (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_blank_canvas.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting1.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting10.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting11.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting12.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting13.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting14.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting15.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting16.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting17.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting18.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting19.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting2.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting20.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting3.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting4.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting5.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting6.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting7.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting8.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting9.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_painting_back.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_picture_frame1_inv.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_picture_frame2_inv.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_picture_frame_back.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_picture_frame_image1.png (100%) rename {homedecor => homedecor_pictures_and_paintings}/textures/homedecor_picture_frame_image2.png (100%) create mode 100644 homedecor_roofing/depends.txt rename homedecor/roofing.lua => homedecor_roofing/init.lua (86%) rename {homedecor => homedecor_roofing}/textures/homedecor_shingles_asphalt_inv.png (100%) rename {homedecor => homedecor_roofing}/textures/homedecor_shingles_glass.png (100%) rename {homedecor => homedecor_roofing}/textures/homedecor_shingles_wood_inv.png (100%) rename {homedecor => homedecor_roofing}/textures/homedecor_skylight_frosted.png (100%) rename {homedecor => homedecor_roofing}/textures/homedecor_skylight_frosted_inv.png (100%) rename {homedecor => homedecor_roofing}/textures/homedecor_skylight_inv.png (100%) create mode 100644 homedecor_tables/depends.txt rename homedecor/tables.lua => homedecor_tables/init.lua (59%) rename {homedecor => homedecor_tables}/models/homedecor_table_small_round.obj (100%) rename {homedecor => homedecor_tables}/models/homedecor_table_small_square.obj (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_face_clean.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_large_edges.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_large_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_large_tb.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_small_round.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_small_round_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_small_square.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_glass_table_small_square_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_table_legs_brass.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_table_legs_wrought_iron.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_utility_table_edges.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_utility_table_legs.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_utility_table_legs_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_utility_table_tb.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_large_edges.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_large_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_large_tb.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_small_round.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_small_round_inv.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_small_square.png (100%) rename {homedecor => homedecor_tables}/textures/homedecor_wood_table_small_square_inv.png (100%) create mode 100644 homedecor_trash_cans/depends.txt rename homedecor/trash_cans.lua => homedecor_trash_cans/init.lua (70%) rename {homedecor => homedecor_trash_cans}/models/homedecor_trash_can.obj (100%) rename {homedecor => homedecor_trash_cans}/models/homedecor_trash_can_green.obj (100%) rename {homedecor => homedecor_trash_cans}/models/homedecor_trash_can_green_open.obj (100%) rename {homedecor => homedecor_trash_cans}/textures/homedecor_trash_can.png (100%) rename {homedecor => homedecor_trash_cans}/textures/homedecor_trash_can_green_inv.png (100%) rename {homedecor => homedecor_trash_cans}/textures/homedecor_trash_can_inv.png (100%) create mode 100644 homedecor_windows_and_treatments/depends.txt rename homedecor/window_treatments.lua => homedecor_windows_and_treatments/init.lua (52%) rename {homedecor => homedecor_windows_and_treatments}/models/homedecor_window_shutter.obj (100%) rename {homedecor => homedecor_windows_and_treatments}/models/homedecor_windowblind_thick.obj (100%) rename {homedecor => homedecor_windows_and_treatments}/models/homedecor_windowblind_thin.obj (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_curtain.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_curtain_open.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_curtainrod_brass_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_curtainrod_wood_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_curtainrod_wrought_iron_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_flowerbox_bottom.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_flowerbox_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_flowerbox_sides.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_flowerbox_top.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_stained_glass.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_window_frame.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_window_quartered.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_window_shutter.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_window_shutter_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_window_sides.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_windowblind_strings.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_windowblind_thick_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_windowblind_thin_inv.png (100%) rename {homedecor => homedecor_windows_and_treatments}/textures/homedecor_windowblinds.png (100%) rename homedecor/listnodes.sh => listnodes.sh (100%) diff --git a/homedecor/copyright.txt b/copyright.txt similarity index 82% rename from homedecor/copyright.txt rename to copyright.txt index 7dc11a36..cccfbe1e 100644 --- a/homedecor/copyright.txt +++ b/copyright.txt @@ -1,8 +1,11 @@ -Most code and all textures by Vanessa Ezekowitz. +Most code and textures by Vanessa Ezekowitz. Some code copied and modified from the game's default mods (especially doors) and ironzorg's flowers mod. +Whatever is stated here applies to all homedecor modpack components, as +appropriate. + Licenses: * Door open/close sound by Slanesh on freesound.org http://freesound.org/people/Slanesh/sounds/31768/ @@ -14,3 +17,4 @@ Licenses: http://www.freesfx.co.uk/sfx/book?p=3 * Phone ringing sound by andyt's on http://www.freesfx.co.uk/ http://www.freesfx.co.uk/sfx/phone?p=5 + diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua deleted file mode 100644 index 146ad69c..00000000 --- a/homedecor/bathroom_furniture.lua +++ /dev/null @@ -1,166 +0,0 @@ - -local S = homedecor_i18n.gettext - -minetest.register_node("homedecor:bathroom_tiles_dark", { - description = S("Bathroom/kitchen tiles (dark)"), - tiles = { - "homedecor_bathroom_tiles_bg.png" - }, - overlay_tiles = { - { name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 }, - }, - paramtype = "light", - paramtype2 = "color", - palette = "unifieddyes_palette_extended.png", - groups = {cracky=3, ud_param2_colorable = 1}, - sounds = default.node_sound_stone_defaults(), - on_construct = unifieddyes.on_construct, -}) - -minetest.register_node("homedecor:bathroom_tiles_medium", { - description = S("Bathroom/kitchen tiles (medium)"), - tiles = { - "homedecor_bathroom_tiles_bg.png" - }, - overlay_tiles = { - { name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 }, - }, - paramtype = "light", - paramtype2 = "color", - palette = "unifieddyes_palette_extended.png", - groups = {cracky=3, ud_param2_colorable = 1}, - sounds = default.node_sound_stone_defaults(), - on_construct = unifieddyes.on_construct, -}) - -minetest.register_node("homedecor:bathroom_tiles_light", { - description = S("Bathroom/kitchen tiles (light)"), - tiles = { - "homedecor_bathroom_tiles_bg.png" - }, - overlay_tiles = { - { name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff }, - }, - paramtype = "light", - paramtype2 = "color", - palette = "unifieddyes_palette_extended.png", - groups = {cracky=3, ud_param2_colorable = 1}, - sounds = default.node_sound_stone_defaults(), - on_construct = unifieddyes.on_construct, -}) - -local tr_cbox = { - type = "fixed", - fixed = { -0.375, -0.3125, 0.25, 0.375, 0.375, 0.5 } -} - -homedecor.register("towel_rod", { - description = S("Towel rod with towel"), - mesh = "homedecor_towel_rod.obj", - tiles = { - "homedecor_generic_terrycloth.png", - "default_wood.png", - }, - inventory_image = "homedecor_towel_rod_inv.png", - selection_box = tr_cbox, - walkable = false, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3}, - sounds = default.node_sound_defaults(), -}) - -homedecor.register("medicine_cabinet", { - description = S("Medicine cabinet"), - mesh = "homedecor_medicine_cabinet.obj", - tiles = { - 'default_wood.png', - 'homedecor_medicine_cabinet_mirror.png' - }, - inventory_image = "homedecor_medicine_cabinet_inv.png", - selection_box = { - type = "fixed", - fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} - }, - walkable = false, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - on_punch = function(pos, node, puncher, pointed_thing) - node.name = "homedecor:medicine_cabinet_open" - minetest.swap_node(pos, node) - end, - infotext=S("Medicine cabinet"), - inventory = { - size=6, - }, -}) - -homedecor.register("medicine_cabinet_open", { - mesh = "homedecor_medicine_cabinet_open.obj", - tiles = { - 'default_wood.png', - 'homedecor_medicine_cabinet_mirror.png', - 'homedecor_medicine_cabinet_inside.png' - }, - selection_box = { - type = "fixed", - fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5} - }, - walkable = false, - groups = { snappy = 3, not_in_creative_inventory=1 }, - drop = "homedecor:medicine_cabinet", - on_punch = function(pos, node, puncher, pointed_thing) - node.name = "homedecor:medicine_cabinet" - minetest.swap_node(pos, node) - end, -}) - --- convert old static nodes - -homedecor.old_static_bathroom_tiles = { - "homedecor:tiles_1", - "homedecor:tiles_2", - "homedecor:tiles_3", - "homedecor:tiles_4", - "homedecor:tiles_red", - "homedecor:tiles_tan", - "homedecor:tiles_yellow", - "homedecor:tiles_green", - "homedecor:tiles_blue" -} - -local old_to_color = { - "light_grey", - "grey", - "black", - "black" -} - -minetest.register_lbm({ - name = "homedecor:convert_bathroom_tiles", - label = "Convert bathroom tiles to use param2 color", - run_at_every_load = false, - nodenames = homedecor.old_static_bathroom_tiles, - action = function(pos, node) - local name = node.name - local newname = "homedecor:bathroom_tiles_light" - local a = string.find(name, "_") - local color = string.sub(name, a + 1) - - if color == "tan" then - color = "yellow_s50" - elseif color == "1" or color == "2" or color == "3" or color == "4" then - if color == "4" then - newname = "homedecor:bathroom_tiles_medium" - end - color = old_to_color[tonumber(color)] - elseif color ~= "yellow" then - color = color.."_s50" - end - - local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") - - minetest.set_node(pos, { name = newname, param2 = paletteidx }) - local meta = minetest.get_meta(pos) - meta:set_string("dye", "unifieddyes:"..color) - meta:set_string("palette", "ext") - end -}) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua deleted file mode 100644 index 73753185..00000000 --- a/homedecor/crafts.lua +++ /dev/null @@ -1,3024 +0,0 @@ --- Crafting for homedecor mod (includes folding) by Vanessa Ezekowitz --- --- Mostly my own code; overall template borrowed from game default - -local S = homedecor_i18n.gettext - --- misc craftitems - -minetest.register_craftitem("homedecor:roof_tile_terracotta", { - description = S("Terracotta Roof Tile"), - inventory_image = "homedecor_roof_tile_terracotta.png", -}) - -minetest.register_craftitem("homedecor:drawer_small", { - description = S("Small Wooden Drawer"), - inventory_image = "homedecor_drawer_small.png", -}) - -minetest.register_craftitem("homedecor:blank_canvas", { - description = S("Blank Canvas"), - inventory_image = "homedecor_blank_canvas.png" -}) - -minetest.register_craftitem("homedecor:vcr", { - description = S("VCR"), - inventory_image = "homedecor_vcr.png" -}) - -minetest.register_craftitem("homedecor:dvd_player", { - description = S("DVD Player"), - inventory_image = "homedecor_dvd_player.png" -}) - -minetest.register_craftitem("homedecor:speaker_driver", { - description = S("Speaker driver"), - inventory_image = "homedecor_speaker_driver_inv.png" -}) - -minetest.register_craftitem("homedecor:fan_blades", { - description = S("Fan blades"), - inventory_image = "homedecor_fan_blades.png" -}) - -minetest.register_craftitem("homedecor:soda_can", { - description = S("Soda Can"), - inventory_image = "homedecor_soda_can.png", - on_use = minetest.item_eat(2), -}) - --- the actual crafts - -minetest.register_craft( { - output = "homedecor:fan_blades 2", - recipe = { - { "", "basic_materials:plastic_sheet", "" }, - { "", "default:steel_ingot", "" }, - { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" } - }, -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:roof_tile_terracotta", - recipe = "basic_materials:terracotta_base", -}) - -minetest.register_craft( { - output = "homedecor:shingles_terracotta", - recipe = { - { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"}, - { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"}, - }, -}) - -minetest.register_craft( { - output = "homedecor:roof_tile_terracotta 8", - recipe = { - { "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" } - } -}) - -minetest.register_craft( { - output = "homedecor:flower_pot_terracotta", - recipe = { - { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" }, - { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta" }, - }, -}) - --- - -minetest.register_craft( { - output = "homedecor:flower_pot_green", - recipe = { - { "", "dye:dark_green", "" }, - { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:flower_pot_black", - recipe = { - { "dye:black", "dye:black", "dye:black" }, - { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - }, -}) - --- - -minetest.register_craft( { - output = "homedecor:projection_screen 3", - recipe = { - { "", "default:glass", "" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:projection_screen", - burntime = 30, -}) - --- - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:ceiling_paint 20", - recipe = { - "dye:white", - "dye:white", - "default:sand", - "bucket:bucket_water", - }, - replacements = { { "bucket:bucket_water","bucket:bucket_empty" } } -}) - -minetest.register_craft( { - output = "homedecor:ceiling_tile 10", - recipe = { - { "", "dye:white", "" }, - { "default:steel_ingot", "default:stone", "default:steel_ingot" }, - - }, -}) - -minetest.register_craft( { - output = "homedecor:glass_table_small_round_b 15", - recipe = { - { "", "default:glass", "" }, - { "default:glass", "default:glass", "default:glass" }, - { "", "default:glass", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:glass_table_small_square_b 2", - recipe = { - {"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" }, - } -}) - -minetest.register_craft( { - output = "homedecor:glass_table_large_b 2", - recipe = { - { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, - } -}) - --- - -minetest.register_craft( { - output = "homedecor:wood_table_small_round_b 15", - recipe = { - { "", "group:wood", "" }, - { "group:wood", "group:wood", "group:wood" }, - { "", "group:wood", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:wood_table_small_square_b 2", - recipe = { - { "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }, - } -}) - -minetest.register_craft( { - output = "homedecor:wood_table_large_b 2", - recipe = { - { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, - } -}) - --- - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_small_round_b", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_small_square_b", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_large_b", - burntime = 30, -}) - --- - -minetest.register_craft( { - output = "homedecor:shingles_asphalt 6", - recipe = { - { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" }, - { "group:sand", "dye:black", "group:sand" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - }, -}) - --- - -minetest.register_craft( { - output = "homedecor:shingles_wood 12", - recipe = { - { "group:stick", "group:wood"}, - { "group:wood", "group:stick"}, - }, -}) - -minetest.register_craft( { - output = "homedecor:shingles_wood 12", - recipe = { - { "group:wood", "group:stick"}, - { "group:stick", "group:wood"}, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:shingles_wood", - burntime = 30, -}) - --- - -minetest.register_craft( { - output = "homedecor:skylight 4", - recipe = { - { "homedecor:glass_table_large", "homedecor:glass_table_large" }, - { "homedecor:glass_table_large", "homedecor:glass_table_large" }, - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:skylight_frosted", - recipe = { - "dye:white", - "homedecor:skylight" - }, -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:skylight", - recipe = "homedecor:skylight_frosted", -}) - -minetest.register_craft( { - output = "homedecor:shutter 2", - recipe = { - { "group:stick", "group:stick" }, - { "group:stick", "group:stick" }, - { "group:stick", "group:stick" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:shutter_colored", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:shutter", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:shutter_oak", - burntime = 30, -}) - -minetest.register_craft( { - output = "homedecor:drawer_small", - recipe = { - { "group:wood", "default:steel_ingot", "group:wood" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:drawer_small", - burntime = 30, -}) - --- - -minetest.register_craft( { - output = "homedecor:nightstand_oak_one_drawer", - recipe = { - { "homedecor:drawer_small" }, - { "group:wood" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:nightstand_oak_one_drawer", - burntime = 30, -}) - -minetest.register_craft( { - output = "homedecor:nightstand_oak_two_drawers", - recipe = { - { "homedecor:drawer_small" }, - { "homedecor:drawer_small" }, - { "group:wood" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:nightstand_oak_two_drawers", - recipe = { - { "homedecor:nightstand_oak_one_drawer" }, - { "homedecor:drawer_small" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:nightstand_oak_two_drawers", - burntime = 30, -}) - --- - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:nightstand_mahogany_one_drawer", - recipe = { - "homedecor:nightstand_oak_one_drawer", - "dye:brown", - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:nightstand_mahogany_one_drawer", - burntime = 30, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:nightstand_mahogany_two_drawers", - recipe = { - "homedecor:nightstand_oak_two_drawers", - "dye:brown", - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:nightstand_mahogany_two_drawers", - burntime = 30, -}) - --- Table legs - -minetest.register_craft( { - output = "homedecor:table_legs_wrought_iron 3", - recipe = { - { "", "default:iron_lump", "" }, - { "", "default:iron_lump", "" }, - { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:table_legs_brass 3", - recipe = { - { "", "basic_materials:brass_ingot", "" }, - { "", "basic_materials:brass_ingot", "" }, - { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:utility_table_legs", - recipe = { - { "group:stick", "group:stick", "group:stick" }, - { "group:stick", "", "group:stick" }, - { "group:stick", "", "group:stick" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:utility_table_legs", - burntime = 30, -}) - --- vertical poles/lampposts - -minetest.register_craft( { - output = "homedecor:pole_brass 4", - recipe = { - { "", "basic_materials:brass_ingot", "" }, - { "", "basic_materials:brass_ingot", "" }, - { "", "basic_materials:brass_ingot", "" } - }, -}) - -minetest.register_craft( { - output = "homedecor:pole_wrought_iron 4", - recipe = { - { "default:iron_lump", }, - { "default:iron_lump", }, - { "default:iron_lump", }, - }, -}) - --- Home electronics - -minetest.register_craft( { - output = "basic_materials:ic 4", - recipe = { - { "basic_materials:silicon", "basic_materials:silicon" }, - { "basic_materials:silicon", "default:copper_ingot" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:television", - recipe = { - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" }, - { "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:television", - recipe = { - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, - { "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:stereo", - recipe = { - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, - { "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" }, - }, -}) - --- =========================================================== --- Recipes that require materials from wool (cotton alternate) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:rug_small 8", - recipe = { - "wool:red", - "wool:yellow", - "wool:blue", - "wool:black" - }, -}) - -minetest.register_craft( { - output = "homedecor:rug_persian 8", - recipe = { - { "", "wool:yellow", "" }, - { "wool:red", "wool:blue", "wool:red" }, - { "", "wool:yellow", "" } - }, -}) - --- cotton versions: - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:rug_small 8", - recipe = { - "cotton:red", - "cotton:yellow", - "cotton:blue", - "cotton:black" - }, -}) - -minetest.register_craft( { - output = "homedecor:rug_persian 8", - recipe = { - { "", "cotton:yellow", "" }, - { "cotton:red", "cotton:blue", "cotton:red" }, - { "", "cotton:yellow", "" } - }, -}) - --- fuel recipes for same - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:rug_small", - burntime = 30, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:rug_large 2", - recipe = { - "homedecor:rug_small", - "homedecor:rug_small", - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:rug_large", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:rug_persian", - burntime = 30, -}) - --- Speakers - -minetest.register_craft( { - output = "homedecor:speaker_driver 2", - recipe = { - { "", "default:steel_ingot", "" }, - { "default:paper", "basic_materials:copper_wire", "default:iron_lump" }, - { "", "default:steel_ingot", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:speaker_small", - recipe = { - { "wool:black", "homedecor:speaker_driver", "group:wood" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:speaker", - recipe = { - { "wool:black", "homedecor:speaker_driver", "group:wood" }, - { "wool:black", "homedecor:speaker_driver", "group:wood" }, - { "wool:black", "group:wood", "group:wood" }, - }, -}) - --- cotton version - -minetest.register_craft( { - output = "homedecor:speaker_small", - recipe = { - { "cotton:black", "homedecor:speaker_driver", "group:wood" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:speaker", - recipe = { - { "cotton:black", "homedecor:speaker_driver", "group:wood" }, - { "cotton:black", "homedecor:speaker_driver", "group:wood" }, - { "cotton:black", "group:wood", "group:wood" }, - }, -}) - --- Curtains - -minetest.register_craft( { - output = "homedecor:curtain_closed 4", - recipe = { - { "wool:white", "", ""}, - { "wool:white", "", ""}, - { "wool:white", "", ""}, - }, -}) - -minetest.register_craft( { - output = "homedecor:curtain_closed 4", - recipe = { - { "cottages:wool", "", ""}, - { "cottages:wool", "", ""}, - { "cottages:wool", "", ""}, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:curtain_closed", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:curtain_closed", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -unifieddyes.register_color_craft({ - output = "homedecor:curtain_open", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:curtain_open", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -local mats = { - { "brass", "homedecor:pole_brass" }, - { "wrought_iron", "homedecor:pole_wrought_iron" }, - { "wood", "group:stick" } -} - -for i in ipairs(mats) do - local material = mats[i][1] - local ingredient = mats[i][2] - minetest.register_craft( { - output = "homedecor:curtainrod_"..material.." 3", - recipe = { - { ingredient, ingredient, ingredient }, - }, - }) -end - --- Recycling recipes - --- Some glass objects recycle via the glass fragments item/recipe in the Vessels mod. - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_small_round", - "homedecor:glass_table_small_round", - "homedecor:glass_table_small_round" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_small_square", - "homedecor:glass_table_small_square", - "homedecor:glass_table_small_square" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_large", - "homedecor:glass_table_large", - "homedecor:glass_table_large" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments 2", - recipe = { - "homedecor:skylight", - "homedecor:skylight", - "homedecor:skylight", - "homedecor:skylight", - "homedecor:skylight", - "homedecor:skylight" - } -}) - --- Wooden tabletops can turn into sticks - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_small_round", - "homedecor:wood_table_small_round", - "homedecor:wood_table_small_round" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_small_square", - "homedecor:wood_table_small_square", - "homedecor:wood_table_small_square" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_large", - "homedecor:wood_table_large", - "homedecor:wood_table_large" - } -}) - --- Kitchen stuff - -minetest.register_craft({ - output = "homedecor:oven_steel", - recipe = { - {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, - {"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", }, - {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, - } -}) - -minetest.register_craft({ - output = "homedecor:oven_steel", - recipe = { - {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, - {"default:steel_ingot", "default:glass", "default:steel_ingot", }, - {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:oven", - recipe = { - "homedecor:oven_steel", - "dye:white", - "dye:white", - } -}) - -minetest.register_craft({ - output = "homedecor:microwave_oven 2", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", }, - {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, - } -}) - -minetest.register_craft({ - output = "homedecor:microwave_oven 2", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "default:glass", "basic_materials:ic", }, - {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, - } -}) - -minetest.register_craft({ - output = "homedecor:refrigerator_steel", - recipe = { - {"default:steel_ingot", "homedecor:glowlight_small_cube", "default:steel_ingot", }, - {"default:steel_ingot", "default:copperblock", "default:steel_ingot", }, - {"default:steel_ingot", "default:clay", "default:steel_ingot", }, - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:refrigerator_white", - recipe = { - "homedecor:refrigerator_steel", - "dye:white", - "dye:white", - "dye:white", - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet", - recipe = { - {"group:wood", "group:stick", "group:wood", }, - {"group:wood", "group:stick", "group:wood", }, - {"group:wood", "group:stick", "group:wood", }, - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_steel", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"", "homedecor:kitchen_cabinet", ""}, - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_steel", - recipe = { - {"moreblocks:slab_steelblock_1"}, - { "homedecor:kitchen_cabinet" }, - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_marble", - recipe = { - {"building_blocks:slab_marble"}, - {"homedecor:kitchen_cabinet"}, - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_marble", - recipe = { - {"technic:slab_marble_1"}, - {"homedecor:kitchen_cabinet"}, - } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_granite", - recipe = { - {"technic:slab_granite_1"}, - {"homedecor:kitchen_cabinet"}, - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:kitchen_cabinet_half 2", - recipe = { "homedecor:kitchen_cabinet" } -}) - -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_with_sink", - recipe = { - {"group:wood", "default:steel_ingot", "group:wood", }, - {"group:wood", "default:steel_ingot", "group:wood", }, - {"group:wood", "group:stick", "group:wood", }, - } -}) - -------- Lighting - --- candles - -minetest.register_craft({ - output = "homedecor:candle_thin 4", - recipe = { - {"farming:string" }, - {"basic_materials:paraffin" } - } -}) - -minetest.register_craft({ - output = "homedecor:candle 2", - recipe = { - {"farming:string" }, - {"basic_materials:paraffin" }, - {"basic_materials:paraffin" } - } -}) - -minetest.register_craft({ - output = "homedecor:wall_sconce 2", - recipe = { - {"default:iron_lump", "", ""}, - {"default:iron_lump", "homedecor:candle", ""}, - {"default:iron_lump", "", ""}, - } -}) - -minetest.register_craft({ - output = "homedecor:candlestick_wrought_iron", - recipe = { - {""}, - {"homedecor:candle_thin"}, - {"default:iron_lump"}, - } -}) - -minetest.register_craft({ - output = "homedecor:candlestick_brass", - recipe = { - {""}, - {"homedecor:candle_thin"}, - {"basic_materials:brass_ingot"}, - } -}) - -minetest.register_craft({ - output = "homedecor:oil_lamp", - recipe = { - { "", "vessels:glass_bottle", "" }, - { "", "farming:string", "" }, - { "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" } - } -}) - -minetest.register_craft({ - output = "homedecor:oil_lamp_tabletop", - recipe = { - { "", "vessels:glass_bottle", "" }, - { "", "farming:string", "" }, - { "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" } - } -}) - --- Wrought-iron wall latern - -minetest.register_craft({ - output = "homedecor:ground_lantern", - recipe = { - { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - { "default:iron_lump", "default:torch", "default:iron_lump" }, - { "", "default:iron_lump", "" } - } -}) - --- wood-lattice lamps - -if minetest.get_modpath("darkage") then - minetest.register_craft( { - output = "homedecor:lattice_lantern_small 8", - recipe = { - { "darkage:lamp" }, - }, - }) - - minetest.register_craft( { - output = "darkage:lamp", - type = "shapeless", - recipe = { - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - }, - }) -else - minetest.register_craft( { - output = "homedecor:lattice_lantern_large 2", - recipe = { - { "dye:black", "dye:yellow", "dye:black" }, - { "group:stick", "building_blocks:woodglass", "group:stick" }, - { "group:stick", "basic_materials:energy_crystal_simple", "group:stick" } - }, - }) - - minetest.register_craft( { - output = "homedecor:lattice_lantern_small 8", - recipe = { - { "homedecor:lattice_lantern_large" }, - }, - }) - - minetest.register_craft( { - output = "homedecor:lattice_lantern_large", - type = "shapeless", - recipe = { - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - "homedecor:lattice_lantern_small", - }, - }) -end - --- glowlights - -minetest.register_craft({ - output = "homedecor:glowlight_half 6", - recipe = { - { "default:glass", "basic_materials:energy_crystal_simple", "default:glass", }, - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_half 6", - recipe = { - {"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", }, - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_half", - recipe = { - {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}, - {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"} - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_half", - type = "shapeless", - recipe = { - "homedecor:glowlight_quarter", - "homedecor:glowlight_quarter" - } -}) - -unifieddyes.register_color_craft({ - output = "homedecor:glowlight_half", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:glowlight_half", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_quarter 6", - recipe = { - {"homedecor:glowlight_half", "homedecor:glowlight_half", "homedecor:glowlight_half", }, - } -}) - -unifieddyes.register_color_craft({ - output = "homedecor:glowlight_quarter", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:glowlight_quarter", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_small_cube 8", - recipe = { - { "dye:white" }, - { "default:glass" }, - { "basic_materials:energy_crystal_simple" }, - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_small_cube 8", - recipe = { - {"dye:white" }, - {"moreblocks:super_glow_glass" }, - } -}) - -minetest.register_craft({ - output = "homedecor:glowlight_small_cube 4", - recipe = { - {"homedecor:glowlight_half" }, - } -}) - -unifieddyes.register_color_craft({ - output = "homedecor:glowlight_small_cube", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:glowlight_small_cube", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - ----- - -minetest.register_craft({ - output = "homedecor:plasma_lamp", - recipe = { - {"", "default:glass", ""}, - {"default:glass", "basic_materials:energy_crystal_simple", "default:glass"}, - {"", "default:glass", ""} - } -}) - -minetest.register_craft({ - output = "homedecor:plasma_ball 2", - recipe = { - {"", "default:glass", ""}, - {"default:glass", "default:copper_ingot", "default:glass"}, - {"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"} - } -}) - --- Brass/wrought iron fences - - -minetest.register_craft( { - output = "homedecor:fence_brass 6", - recipe = { - { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, - { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:fence_wrought_iron 6", - recipe = { - { "default:iron_lump","default:iron_lump","default:iron_lump" }, - { "default:iron_lump","default:iron_lump","default:iron_lump" }, - }, -}) - --- other types of fences - -minetest.register_craft( { - output = "homedecor:fence_wrought_iron_2 4", - recipe = { - { "homedecor:pole_wrought_iron", "default:iron_lump" }, - { "homedecor:pole_wrought_iron", "default:iron_lump" }, - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_wrought_iron_2_corner", - recipe = { - "homedecor:fence_wrought_iron_2", - "homedecor:fence_wrought_iron_2" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_wrought_iron_2 2", - recipe = { - "homedecor:fence_wrought_iron_2_corner", - }, -}) - --- - -minetest.register_craft( { - output = "homedecor:fence_picket 6", - recipe = { - { "group:stick", "group:stick", "group:stick" }, - { "group:stick", "", "group:stick" }, - { "group:stick", "group:stick", "group:stick" } - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket_corner", - recipe = { - "homedecor:fence_picket", - "homedecor:fence_picket" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket 2", - recipe = { - "homedecor:fence_picket_corner" - }, -}) - --- - - -minetest.register_craft( { - output = "homedecor:fence_picket_white 6", - recipe = { - { "group:stick", "group:stick", "group:stick" }, - { "group:stick", "dye:white", "group:stick" }, - { "group:stick", "group:stick", "group:stick" } - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket_corner_white", - recipe = { - "homedecor:fence_picket_white", - "homedecor:fence_picket_white" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket_white 2", - recipe = { - "homedecor:fence_picket_corner_white" - }, -}) - --- - - -minetest.register_craft( { - output = "homedecor:fence_privacy 6", - recipe = { - { "group:wood", "group:stick", "group:wood" }, - { "group:wood", "", "group:wood" }, - { "group:wood", "group:stick", "group:wood" } - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_privacy_corner", - recipe = { - "homedecor:fence_privacy", - "homedecor:fence_privacy" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_privacy 2", - recipe = { - "homedecor:fence_privacy_corner" - }, -}) - --- - - -minetest.register_craft( { - output = "homedecor:fence_barbed_wire 6", - recipe = { - { "group:stick", "basic_materials:steel_wire", "group:stick" }, - { "group:stick", "", "group:stick" }, - { "group:stick", "basic_materials:steel_wire", "group:stick" } - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_barbed_wire_corner", - recipe = { "homedecor:fence_barbed_wire", "homedecor:fence_barbed_wire" }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_barbed_wire 2", - recipe = { "homedecor:fence_barbed_wire_corner" }, -}) - --- - - -minetest.register_craft( { - output = "homedecor:fence_chainlink 9", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }, - { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_chainlink_corner", - recipe = { "homedecor:fence_chainlink", "homedecor:fence_chainlink" }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_chainlink 2", - recipe = { "homedecor:fence_chainlink_corner" }, -}) - - --- Gates - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:gate_picket_white_closed", - recipe = { - "homedecor:fence_picket_white" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket_white", - recipe = { - "homedecor:gate_picket_white_closed" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:gate_picket_closed", - recipe = { - "homedecor:fence_picket" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_picket", - recipe = { - "homedecor:gate_picket_closed" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:gate_barbed_wire_closed", - recipe = { - "homedecor:fence_barbed_wire" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_barbed_wire", - recipe = { - "homedecor:gate_barbed_wire_closed" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:gate_chainlink_closed", - recipe = { - "homedecor:fence_chainlink" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:fence_chainlink", - recipe = { - "homedecor:gate_chainlink_closed" - }, -}) - ------- Doors - --- plain wood, non-windowed - -minetest.register_craft( { - output = "homedecor:door_wood_plain_left 2", - recipe = { - { "group:wood", "group:wood", "" }, - { "group:wood", "group:wood", "default:steel_ingot" }, - { "group:wood", "group:wood", "" }, - }, -}) - --- fancy exterior - -minetest.register_craft( { - output = "homedecor:door_exterior_fancy_left 2", - recipe = { - { "group:wood", "default:glass" }, - { "group:wood", "group:wood" }, - { "group:wood", "group:wood" }, - }, -}) - --- wood and glass (grid style) - --- bare - -minetest.register_craft( { - output = "homedecor:door_wood_glass_oak_left 2", - recipe = { - { "default:glass", "group:wood" }, - { "group:wood", "default:glass" }, - { "default:glass", "group:wood" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:door_wood_glass_oak_left 2", - recipe = { - { "group:wood", "default:glass" }, - { "default:glass", "group:wood" }, - { "group:wood", "default:glass" }, - }, -}) - --- mahogany - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:door_wood_glass_mahogany_left 2", - recipe = { - "default:dirt", - "default:coal_lump", - "homedecor:door_wood_glass_oak_left", - "homedecor:door_wood_glass_oak_left" - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:door_wood_glass_mahogany_left 2", - recipe = { - "dye:brown", - "homedecor:door_wood_glass_oak_left", - "homedecor:door_wood_glass_oak_left" - }, -}) - --- white - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:door_wood_glass_white_left 2", - recipe = { - "dye:white", - "homedecor:door_wood_glass_oak_left", - "homedecor:door_wood_glass_oak_left" - }, -}) - --- Closet doors - --- oak - -minetest.register_craft( { - output = "homedecor:door_closet_oak_left 2", - recipe = { - { "", "group:stick", "group:stick" }, - { "default:steel_ingot", "group:stick", "group:stick" }, - { "", "group:stick", "group:stick" }, - }, -}) - --- mahogany - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:door_closet_mahogany_left 2", - recipe = { - "homedecor:door_closet_oak_left", - "homedecor:door_closet_oak_left", - "default:dirt", - "default:coal_lump", - }, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:door_closet_mahogany_left 2", - recipe = { - "homedecor:door_closet_oak_left", - "homedecor:door_closet_oak_left", - "dye:brown" - }, -}) - --- wrought fence-like door - -minetest.register_craft( { - output = "homedecor:door_wrought_iron_left 2", - recipe = { - { "homedecor:pole_wrought_iron", "default:iron_lump" }, - { "homedecor:pole_wrought_iron", "default:iron_lump" }, - { "homedecor:pole_wrought_iron", "default:iron_lump" } - }, -}) - --- bedroom door - -minetest.register_craft( { - output = "homedecor:door_bedroom_left", - recipe = { - { "dye:white", "dye:white", "" }, - { "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" }, - { "", "", "" }, - }, -}) - --- woodglass door - -minetest.register_craft( { - output = "homedecor:door_woodglass_left", - recipe = { - { "group:wood", "default:glass", "" }, - { "group:wood", "default:glass", "basic_materials:brass_ingot" }, - { "group:wood", "group:wood", "" }, - }, -}) - --- woodglass door type 2 - -minetest.register_craft( { - output = "homedecor:door_woodglass2_left", - recipe = { - { "default:glass", "default:glass", "" }, - { "group:wood", "group:wood", "default:iron_lump" }, - { "group:wood", "group:wood", "" }, - }, -}) - --- laundry stuff - -minetest.register_craft( { - output = "homedecor:washing_machine", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, - { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, - { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:washing_machine", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, - { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, - { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:dryer", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, - { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:dryer", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, - { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:ironing_board", - recipe = { - { "wool:grey", "wool:grey", "wool:grey"}, - { "", "default:steel_ingot", "" }, - { "default:steel_ingot", "", "default:steel_ingot" } - }, -}) - --- dishwashers - -minetest.register_craft( { - output = "homedecor:dishwasher", - recipe = { - { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher", - recipe = { - { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_wood", - recipe = { - { "stairs:slab_wood" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_wood", - recipe = { - { "moreblocks:slab_wood" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_wood", - recipe = { - { "moreblocks:slab_wood_1" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_steel", - recipe = { - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "", "homedecor:dishwasher", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_steel", - recipe = { - { "moreblocks:slab_steelblock_1" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_marble", - recipe = { - { "building_blocks:slab_marble" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_marble", - recipe = { - { "technic:slab_marble_1" }, - { "homedecor:dishwasher" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:dishwasher_granite", - recipe = { - { "technic:slab_granite_1" }, - { "homedecor:dishwasher" }, - }, -}) - --- paintings - -minetest.register_craft({ - output = "homedecor:blank_canvas", - recipe = { - { "", "group:stick", "" }, - { "group:stick", "wool:white", "group:stick" }, - { "", "group:stick", "" }, - } -}) - -local painting_patterns = { - [1] = { { "brown", "red", "brown" }, - { "dark_green", "red", "green" } }, - - [2] = { { "green", "yellow", "green" }, - { "green", "yellow", "green" } }, - - [3] = { { "green", "pink", "green" }, - { "brown", "pink", "brown" } }, - - [4] = { { "black", "orange", "grey" }, - { "dark_green", "orange", "orange" } }, - - [5] = { { "blue", "orange", "yellow" }, - { "green", "red", "brown" } }, - - [6] = { { "green", "red", "orange" }, - { "orange", "yellow", "green" } }, - - [7] = { { "blue", "dark_green", "dark_green" }, - { "green", "grey", "green" } }, - - [8] = { { "blue", "blue", "blue" }, - { "green", "green", "green" } }, - - [9] = { { "blue", "blue", "dark_green" }, - { "green", "grey", "dark_green" } }, - - [10] = { { "green", "white", "green" }, - { "dark_green", "white", "dark_green" } }, - - [11] = { { "blue", "white", "blue" }, - { "blue", "grey", "dark_green" } }, - - [12] = { { "green", "green", "green" }, - { "grey", "grey", "green" } }, - - [13] = { { "blue", "blue", "grey" }, - { "dark_green", "white", "white" } }, - - [14] = { { "red", "yellow", "blue" }, - { "blue", "green", "violet" } }, - - [15] = { { "blue", "yellow", "blue" }, - { "black", "black", "black" } }, - - [16] = { { "red", "orange", "blue" }, - { "black", "dark_grey", "grey" } }, - - [17] = { { "orange", "yellow", "orange" }, - { "black", "black", "black" } }, - - [18] = { { "grey", "dark_green", "grey" }, - { "white", "white", "white" } }, - - [19] = { { "white", "brown", "green" }, - { "green", "brown", "brown" } }, - - [20] = { { "blue", "blue", "blue" }, - { "red", "brown", "grey" } } -} - -for i,recipe in pairs(painting_patterns) do - - local item1 = "dye:"..recipe[1][1] - local item2 = "dye:"..recipe[1][2] - local item3 = "dye:"..recipe[1][3] - local item4 = "dye:"..recipe[2][1] - local item5 = "dye:"..recipe[2][2] - local item6 = "dye:"..recipe[2][3] - - minetest.register_craft({ - output = "homedecor:painting_"..i, - recipe = { - { item1, item2, item3 }, - { item4, item5, item6 }, - {"", "homedecor:blank_canvas", "" } - } - }) -end - --- more misc stuff here - -minetest.register_craft({ - output = "homedecor:chimney 2", - recipe = { - { "default:clay_brick", "", "default:clay_brick" }, - { "default:clay_brick", "", "default:clay_brick" }, - { "default:clay_brick", "", "default:clay_brick" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:fishtank", - recipe = { - { "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" }, - { "default:glass", "bucket:bucket_water", "default:glass" }, - { "default:glass", "building_blocks:gravel_spread", "default:glass" }, - }, - replacements = { {"bucket:bucket_water", "bucket:bucket_empty"} } -}) - -minetest.register_craft({ - output = "homedecor:towel_rod", - recipe = { - { "group:wood", "group:stick", "group:wood" }, - { "", "building_blocks:terrycloth_towel", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:toilet_paper", - recipe = { - { "", "default:paper", "default:paper" }, - { "group:wood", "group:stick", "default:paper" }, - { "", "default:paper", "default:paper" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:medicine_cabinet", - recipe = { - { "group:stick", "default:glass", "group:stick" }, - { "group:stick", "default:glass", "group:stick" }, - { "group:stick", "default:glass", "group:stick" } - }, -}) - -minetest.register_craft({ - output = "homedecor:cardboard_box 2", - recipe = { - { "default:paper", "", "default:paper" }, - { "default:paper", "default:paper", "default:paper" }, - }, -}) - -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 = { - { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, - { "homedecor:drawer_small", "default:wood", "default:wood" }, - { "homedecor:drawer_small", "", "default:wood" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:desk", - recipe = { - { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, - { "homedecor:drawer_small", "default:wood", "default:wood" }, - { "homedecor:drawer_small", "", "default:wood" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:filing_cabinet", - recipe = { - { "", "default:wood", "" }, - { "default:wood", "homedecor:drawer_small", "default:wood" }, - { "", "default:wood", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:analog_clock_plastic 2", - recipe = { - { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:analog_clock_wood 2", - recipe = { - { "group:stick", "dye:black", "group:stick" }, - { "group:stick", "basic_materials:ic", "group:stick" }, - { "group:stick", "dye:black", "group:stick" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:digital_clock 2", - recipe = { - { "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:alarm_clock", - recipe = { - { "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:air_conditioner", - recipe = { - { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:air_conditioner", - recipe = { - { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, - { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, - { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:ceiling_fan", - recipe = { - { "basic_materials:motor" }, - { "homedecor:fan_blades" }, - { "homedecor:glowlight_small_cube" } - } -}) - -minetest.register_craft({ - output = "homedecor:ceiling_fan", - recipe = { - { "basic_materials:motor" }, - { "homedecor:fan_blades" }, - { "homedecor:glowlight_small_cube" } - } -}) - -minetest.register_craft({ - output = "homedecor:welcome_mat_grey 2", - recipe = { - { "", "dye:black", "" }, - { "wool:grey", "wool:grey", "wool:grey" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:welcome_mat_brown 2", - recipe = { - { "", "dye:black", "" }, - { "wool:brown", "wool:brown", "wool:brown" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:welcome_mat_green 2", - recipe = { - { "", "dye:white", "" }, - { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:welcome_mat_green 2", - recipe = { - { "", "dye:white", "" }, - { "dye:black", "dye:black", "dye:black" }, - { "wool:green", "wool:green", "wool:green" }, - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:window_plain 8", - recipe = { - "dye:white", - "dye:white", - "dye:white", - "dye:white", - "building_blocks:woodglass" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:window_quartered", - recipe = { - "dye:white", - "group:stick", - "group:stick", - "homedecor:window_plain" - } -}) - -minetest.register_craft({ - output = "homedecor:vcr 2", - recipe = { - { "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" }, - { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:dvd_player 2", - recipe = { - { "", "basic_materials:plastic_sheet", "" }, - { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, - { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:dvd_player 2", - recipe = { - { "", "basic_materials:plastic_sheet", "" }, - { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, - { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:dvd_vcr", - recipe = { - "homedecor:vcr", - "homedecor:dvd_player" - }, -}) - -minetest.register_craft({ - output = "homedecor:blinds_thin", - recipe = { - { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, - { "farming:string", "basic_materials:plastic_strip", "" }, - { "", "basic_materials:plastic_strip", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:blinds_thick", - recipe = { - { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, - { "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, - { "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:openframe_bookshelf", - recipe = { - {"group:wood", "", "group:wood"}, - {"default:book", "default:book", "default:book"}, - {"group:wood", "", "group:wood"}, - }, -}) - -minetest.register_craft( { - output = "homedecor:desk_fan", - recipe = { - {"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"}, - {"", "default:steel_ingot", ""} - }, -}) - -minetest.register_craft( { - output = "homedecor:space_heater", - recipe = { - {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}, - {"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"}, - {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} - }, -}) - -minetest.register_craft( { - output = "homedecor:radiator", - recipe = { - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, - { "basic_materials:ic", "basic_materials:heating_element", "" }, - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } - }, -}) - --- bathroom/kitchen tiles - -minetest.register_craft( { - output = "homedecor:bathroom_tiles_light 4", - recipe = { - { "group:marble", "group:marble", "" }, - { "group:marble", "group:marble", "dye:white" } - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bathroom_tiles_light", - palette = "extended", - type = "shapeless", - neutral_node = "homedecor:bathroom_tiles_light", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft( { - output = "homedecor:bathroom_tiles_medium 4", - recipe = { - { "group:marble", "group:marble", "" }, - { "group:marble", "group:marble", "dye:grey" } - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bathroom_tiles_medium", - palette = "extended", - type = "shapeless", - neutral_node = "homedecor:bathroom_tiles_medium", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft( { - output = "homedecor:bathroom_tiles_dark 4", - recipe = { - { "group:marble", "group:marble", "" }, - { "group:marble", "group:marble", "dye:dark_grey" } - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bathroom_tiles_dark", - palette = "extended", - type = "shapeless", - neutral_node = "homedecor:bathroom_tiles_dark", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - --- misc electrical - -minetest.register_craft( { - output = "homedecor:power_outlet", - recipe = { - {"basic_materials:plastic_sheet", "basic_materials:copper_strip"}, - {"basic_materials:plastic_sheet", ""}, - {"basic_materials:plastic_sheet", "basic_materials:copper_strip"} - }, -}) - -minetest.register_craft( { - output = "homedecor:light_switch", - recipe = { - {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, - {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, - {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"} - }, -}) - --- doghouse - -minetest.register_craft( { - output = "homedecor:doghouse", - recipe = { - {"homedecor:shingles_terracotta", "homedecor:shingles_terracotta", "homedecor:shingles_terracotta"}, - {"group:wood", "", "group:wood"}, - {"group:wood", "building_blocks:terrycloth_towel", "group:wood"} - }, -}) - --- japanese walls and mat - -minetest.register_craft( { - output = "homedecor:japanese_wall_top", - recipe = { - {"group:stick", "default:paper"}, - {"default:paper", "group:stick"}, - {"group:stick", "default:paper"} - }, -}) - -minetest.register_craft( { - output = "homedecor:japanese_wall_top", - recipe = { - {"default:paper", "group:stick"}, - {"group:stick", "default:paper"}, - {"default:paper", "group:stick"} - }, -}) - -minetest.register_craft( { - output = "homedecor:japanese_wall_middle", - recipe = { - {"homedecor:japanese_wall_top"} - }, -}) - -minetest.register_craft( { - output = "homedecor:japanese_wall_bottom", - recipe = { - {"homedecor:japanese_wall_middle"} - }, -}) - -minetest.register_craft( { - output = "homedecor:japanese_wall_top", - recipe = { - {"homedecor:japanese_wall_bottom"} - }, -}) - -minetest.register_craft( { - output = "homedecor:tatami_mat", - recipe = { - {"farming:wheat", "farming:wheat", "farming:wheat"} - }, -}) - -minetest.register_craft( { - output = "homedecor:pool_table", - recipe = { - { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, - { "building_blocks:hardwood", "building_blocks:hardwood", "building_blocks:hardwood" }, - { "building_blocks:slab_hardwood", "", "building_blocks:slab_hardwood" } - }, -}) - -minetest.register_craft( { - output = "homedecor:trash_can 3", - recipe = { - { "basic_materials:steel_wire", "", "basic_materials:steel_wire" }, - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:telephone", - recipe = { - { "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" }, - { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:cobweb_corner 5", - recipe = { - { "farming:string", "", "farming:string" }, - { "", "farming:string", "" }, - { "farming:string", "", "farming:string" } - }, -}) - -minetest.register_craft( { - output = "homedecor:well", - recipe = { - { "homedecor:shingles_wood", "homedecor:shingles_wood", "homedecor:shingles_wood" }, - { "group:wood", "group:stick", "group:wood" }, - { "group:stone", "", "group:stone" } - }, -}) - -minetest.register_craft( { - output = "homedecor:coat_tree", - recipe = { - { "group:stick", "group:stick", "group:stick" }, - { "", "group:stick", "" }, - { "", "group:wood", "" } - }, -}) - -minetest.register_craft( { - output = "homedecor:coatrack_wallmount", - recipe = { - { "group:stick", "homedecor:curtainrod_wood", "group:stick" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:doorbell", - recipe = { - { "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" } - }, -}) - - -minetest.register_craft( { - output = "homedecor:bench_large_1", - recipe = { - { "group:wood", "group:wood", "group:wood" }, - { "group:wood", "group:wood", "group:wood" }, - { "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" } - }, -}) - -minetest.register_craft( { - output = "homedecor:bench_large_2_left", - recipe = { - { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, - { "group:wood", "group:wood", "group:wood" }, - { "stairs:slab_wood", "", "stairs:slab_wood" } - }, -}) - -minetest.register_craft( { - output = "homedecor:bench_large_2_left", - recipe = { - { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, - { "group:wood", "group:wood", "group:wood" }, - { "moreblocks:slab_wood", "", "moreblocks:slab_wood" } - }, -}) - -minetest.register_craft( { - output = "homedecor:kitchen_faucet", - recipe = { - { "", "default:steel_ingot" }, - { "default:steel_ingot", "" }, - { "homedecor:taps", "" } - }, -}) - -minetest.register_craft( { - output = "homedecor:cutlery_set", - recipe = { - { "", "vessels:drinking_glass", "" }, - { "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:cutlery_set", - recipe = { - { "", "vessels:drinking_glass", "" }, - { "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:simple_bench", - recipe = { - { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, - { "stairs:slab_wood", "", "stairs:slab_wood" } - }, -}) - -minetest.register_craft( { - output = "homedecor:simple_bench", - recipe = { - { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, - { "moreblocks:slab_wood", "", "moreblocks:slab_wood" } - }, -}) - -minetest.register_craft( { - output = "homedecor:bed_regular", - recipe = { - { "group:stick", "", "group:stick" }, - { "wool:white", "wool:white", "wool:white" }, - { "group:wood", "", "group:wood" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bed_regular", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:bed_regular", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft( { - output = "homedecor:bed_kingsize", - recipe = { - { "homedecor:bed_regular", "homedecor:bed_regular" } - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bed_kingsize", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:bed_kingsize", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -unifieddyes.register_color_craft({ - output = "homedecor:bed_kingsize", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:bed_regular", - recipe = { - "NEUTRAL_NODE", - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft( { - output = "homedecor:bottle_green", - recipe = { - { "vessels:glass_bottle", "dye:green" } - }, -}) - -minetest.register_craft( { - output = "homedecor:bottle_brown", - recipe = { - { "vessels:glass_bottle", "dye:brown" } - }, -}) - -minetest.register_craft({ - output = "homedecor:coffee_maker", - recipe = { - {"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"}, - {"basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet"}, - {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} - }, -}) - -minetest.register_craft({ - output = "homedecor:dartboard", - recipe = { - {"dye:black", "basic_materials:plastic_sheet", "dye:white"}, - {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, - {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"} - }, -}) - -minetest.register_craft({ - output = "homedecor:piano", - recipe = { - { "", "basic_materials:steel_wire", "building_blocks:hardwood" }, - { "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" }, - { "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" } - }, -}) - -minetest.register_craft({ - output = "homedecor:toaster", - recipe = { - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, - { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } - }, -}) - -minetest.register_craft({ - output = "homedecor:deckchair", - recipe = { - { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, - { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, - { "group:stick", "building_blocks:terrycloth_towel", "group:stick" } - }, -}) - -minetest.register_craft({ - output = "homedecor:deckchair_striped_blue", - type = "shapeless", - recipe = { - "homedecor:deckchair", - "dye:blue" - } -}) - -minetest.register_craft({ - output = "homedecor:office_chair_basic", - recipe = { - { "", "", "wool:black" }, - { "", "wool:black", "default:steel_ingot" }, - { "group:stick", "homedecor:pole_wrought_iron", "group:stick" } - }, -}) - -minetest.register_craft({ - output = "homedecor:office_chair_upscale", - recipe = { - { "dye:black", "building_blocks:sticks", "group:wool" }, - { "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" }, - { "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" } - }, -}) - -minetest.register_craft({ - output = "homedecor:wall_shelf 2", - recipe = { - { "homedecor:wood_table_small_square", "homedecor:curtainrod_wood", "homedecor:curtainrod_wood" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:trophy 3", - recipe = { - { "default:gold_ingot","","default:gold_ingot" }, - { "","default:gold_ingot","" }, - { "group:wood","default:gold_ingot","group:wood" } - }, -}) - -minetest.register_craft({ - output = "homedecor:grandfather_clock", - recipe = { - { "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" } - }, -}) - -minetest.register_craft({ - output = "homedecor:sportbench", - recipe = { - { "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" }, - { "default:steel_ingot","wool:black","default:steel_ingot" }, - { "default:steel_ingot","wool:black","default:steel_ingot" } - }, -}) - -minetest.register_craft({ - output = "homedecor:skateboard", - recipe = { - { "dye:yellow","dye:green","dye:blue" }, - { "homedecor:wood_table_small_square","homedecor:wood_table_small_square","homedecor:wood_table_small_square" }, - { "default:steel_ingot","","default:steel_ingot" } - }, -}) - -minetest.register_craft({ - output = "homedecor:copper_pans", - recipe = { - { "basic_materials:copper_strip","","basic_materials:copper_strip" }, - { "default:copper_ingot","","default:copper_ingot" }, - { "default:copper_ingot","","default:copper_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:window_flowerbox", - recipe = { - { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" }, - { "", "homedecor:roof_tile_terracotta", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:paper_towel", - recipe = { - { "homedecor:toilet_paper", "homedecor:toilet_paper" } - }, -}) - -minetest.register_craft({ - output = "homedecor:stonepath 16", - recipe = { - { "stairs:slab_stone","","stairs:slab_stone" }, - { "","stairs:slab_stone","" }, - { "stairs:slab_stone","","stairs:slab_stone" } - }, -}) - -minetest.register_craft({ - output = "homedecor:stonepath 16", - recipe = { - { "moreblocks:slab_stone","","moreblocks:slab_stone" }, - { "","moreblocks:slab_stone","" }, - { "moreblocks:slab_stone","","moreblocks:slab_stone" } - }, -}) - -minetest.register_craft({ - output = "homedecor:stonepath 3", - recipe = { - { "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" }, - { "","moreblocks:micro_stone_1","" }, - { "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" } - }, -}) - -minetest.register_craft({ - output = "homedecor:barbecue", - recipe = { - { "","homedecor:fence_chainlink","" }, - { "default:steel_ingot","fake_fire:embers","default:steel_ingot" }, - { "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" } - }, -}) - -minetest.register_craft({ - output = "homedecor:beer_tap", - recipe = { - { "group:stick","default:steel_ingot","group:stick" }, - { "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" }, - { "default:steel_ingot","default:steel_ingot","default:steel_ingot" } - }, -}) - -minetest.register_craft({ - output = "homedecor:swing", - recipe = { - { "farming:string","","farming:string" }, - { "farming:string","","farming:string" }, - { "farming:string","stairs:slab_wood","farming:string" } - }, -}) - -minetest.register_craft({ - output = "homedecor:swing", - recipe = { - { "farming:string","","farming:string" }, - { "farming:string","","farming:string" }, - { "farming:string","moreblocks:slab_wood","farming:string" } - }, -}) - -minetest.register_craft({ - output = "homedecor:swing", - recipe = { - { "farming:string","","farming:string" }, - { "farming:string","","farming:string" }, - { "farming:string","moreblocks:panel_wood_1","farming:string" } - }, -}) - -local bookcolors = { - "red", - "green", - "blue", - "violet", - "grey", - "brown" -} - -for _, color in ipairs(bookcolors) do - minetest.register_craft({ - type = "shapeless", - output = "homedecor:book_"..color, - recipe = { - "dye:"..color, - "default:book" - }, - }) -end - -minetest.register_craft({ - output = "homedecor:door_japanese_closed", - recipe = { - { "homedecor:japanese_wall_top" }, - { "homedecor:japanese_wall_bottom" } - }, -}) - -minetest.register_craft({ - output = "homedecor:calendar", - recipe = { - { "","dye:red","" }, - { "","dye:black","" }, - { "","default:paper","" } - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:4_bottles_brown", - recipe = { - "homedecor:bottle_brown", - "homedecor:bottle_brown", - "homedecor:bottle_brown", - "homedecor:bottle_brown" - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:4_bottles_green", - recipe = { - "homedecor:bottle_green", - "homedecor:bottle_green", - "homedecor:bottle_green", - "homedecor:bottle_green" - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:4_bottles_multi", - recipe = { - "homedecor:bottle_brown", - "homedecor:bottle_brown", - "homedecor:bottle_green", - "homedecor:bottle_green", - }, -}) - -minetest.register_craft({ - output = "homedecor:wine_rack", - recipe = { - { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, - { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, - { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, - }, -}) - -local picture_dyes = { - {"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick - {"dye:green", "dye:blue"} -- the "family photo" -} - -for i in ipairs(picture_dyes) do - minetest.register_craft({ - output = "homedecor:picture_frame"..i, - recipe = { - { picture_dyes[i][1], picture_dyes[i][2] }, - { "homedecor:blank_canvas", "group:stick" }, - }, - }) -end - -minetest.register_craft({ - output = "homedecor:desk_lamp 2", - recipe = { - { "", "default:steel_ingot", "homedecor:glowlight_small_cube" }, - { "", "basic_materials:steel_strip", "" }, - { "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:desk_lamp", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:desk_lamp", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - output = "homedecor:hanging_lantern 2", - recipe = { - { "default:iron_lump", "default:iron_lump", "" }, - { "default:iron_lump", "homedecor:lattice_lantern_large", "" }, - { "default:iron_lump", "", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:ceiling_lantern 2", - recipe = { - { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - { "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" }, - { "", "default:iron_lump", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:wall_lamp 2", - recipe = { - { "", "homedecor:lattice_lantern_large", "" }, - { "default:iron_lump", "group:stick", "" }, - { "default:iron_lump", "group:stick", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:desk_globe", - recipe = { - { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, - { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "group:stick", "stairs:slab_wood", "dye:blue" } - }, -}) - -minetest.register_craft({ - output = "homedecor:desk_globe", - recipe = { - { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, - { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, - { "group:stick", "moreblocks:slab_wood", "dye:blue" } - }, -}) - -minetest.register_craft({ - output = "homedecor:tool_cabinet", - recipe = { - { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, - { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } - }, -}) - -minetest.register_craft({ - output = "homedecor:bathroom_set", - recipe = { - { "", "homedecor:glass_table_small_round", "" }, - { "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" }, - { "group:stick", "basic_materials:plastic_sheet", "group:stick" } - }, -}) - -minetest.register_craft({ - output = "homedecor:trash_can_green", - recipe = { - { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" }, - { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } - }, -}) - -minetest.register_craft({ - output = "homedecor:ceiling_lamp", - recipe = { - { "", "basic_materials:brass_ingot", ""}, - { "", "basic_materials:chainlink_brass", ""}, - { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} - }, -}) - -minetest.register_craft({ - output = "homedecor:ceiling_lamp", - recipe = { - { "", "basic_materials:chain_steel_top_brass", ""}, - { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} - }, -}) - -minetest.register_craft({ - output = "homedecor:spiral_staircase", - recipe = { - { "default:steelblock", "homedecor:pole_wrought_iron", "" }, - { "", "homedecor:pole_wrought_iron", "default:steelblock" }, - { "default:steelblock", "homedecor:pole_wrought_iron", "" } - }, -}) - -minetest.register_craft({ - output = "homedecor:soda_machine", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "dye:red", "default:steel_ingot"}, - {"default:steel_ingot", "default:copperblock", "default:steel_ingot"}, - }, -}) - -if minetest.settings:get_bool("homedecor.disable_coin_crafting") == false then - minetest.register_craft({ - type = "shapeless", - output = "homedecor:coin 5", - recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"} - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:coin 15", - recipe = {"default:gold_ingot", "default:sword_steel"} - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:coin 50", - recipe = {"default:goldblock", "default:sword_mese"} - }) -else - if minetest.settings:get("log_mods") then - minetest.log("[HomeDecor] " .. S("coin crafting is disabled!")) - end -end - -minetest.register_craft({ - output = "homedecor:lattice_wood 8", - recipe = { - {"group:stick", "group:wood", "group:stick"}, - {"group:wood", "", "group:wood"}, - {"group:stick", "group:wood", "group:stick"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:lattice_white_wood 8", - recipe = { - {"group:stick", "group:wood", "group:stick"}, - {"group:wood", "dye:white", "group:wood"}, - {"group:stick", "group:wood", "group:stick"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:lattice_wood_vegetal 8", - recipe = { - {"group:stick", "group:wood", "group:stick"}, - {"group:wood", "group:leaves", "group:wood"}, - {"group:stick", "group:wood", "group:stick"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:lattice_white_wood_vegetal 8", - recipe = { - {"group:stick", "group:wood", "group:stick"}, - {"group:wood", "group:leaves", "group:wood"}, - {"group:stick", "dye:white", "group:stick"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:stained_glass 8", - recipe = { - {"", "dye:blue", ""}, - {"dye:red", "default:glass", "dye:green"}, - {"", "dye:yellow", ""}, - }, -}) - -minetest.register_craft({ - output = "homedecor:stained_glass 3", - recipe = { - {"", "dye:blue", ""}, - {"dye:red", "xpanes:pane_flat", "dye:green"}, - {"", "dye:yellow", ""}, - }, -}) - -minetest.register_craft({ - output = "homedecor:stained_glass 2", - recipe = { - {"", "dye:blue", ""}, - {"dye:red", "cottages:glass_pane_side", "dye:green"}, - {"", "dye:yellow", ""}, - }, -}) - -minetest.register_craft({ - output = "homedecor:stained_glass 2", - recipe = { - {"", "dye:blue", ""}, - {"dye:red", "cottages:glass_pane", "dye:green"}, - {"", "dye:yellow", ""}, - }, -}) - -minetest.register_craftitem("homedecor:flower_pot_small", { - description = S("Small Flower Pot"), - inventory_image = "homedecor_flowerpot_small_inv.png" -}) - -minetest.register_craft( { - output = "homedecor:flower_pot_small", - recipe = { - { "default:clay_brick", "", "default:clay_brick" }, - { "", "default:clay_brick", "" } - } -}) - -minetest.register_craft( { - output = "homedecor:flower_pot_small 3", - recipe = { { "homedecor:flower_pot_terracotta" } } -}) - -minetest.register_craft({ - output = "homedecor:shrubbery_green 3", - recipe = { - { "group:leaves", "group:leaves", "group:leaves" }, - { "group:leaves", "group:leaves", "group:leaves" }, - { "group:stick", "group:stick", "group:stick" } - } -}) - -for _, color in ipairs(homedecor.shrub_colors) do - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery_large_"..color, - recipe = { - "homedecor:shrubbery_"..color - } - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery_"..color, - recipe = { - "homedecor:shrubbery_large_"..color - } - }) - - if color ~= "green" then - minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery_large_"..color, - recipe = { - "homedecor:shrubbery_large_green", - "dye:"..color - } - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery_"..color, - recipe = { - "homedecor:shrubbery_green", - "dye:"..color - } - }) - - end -end - -for i in ipairs(homedecor.banister_materials) do - - local name = homedecor.banister_materials[i][1] - local topmat = homedecor.banister_materials[i][5] - local vertmat = homedecor.banister_materials[i][6] - local dye1 = homedecor.banister_materials[i][7] - local dye2 = homedecor.banister_materials[i][8] - - minetest.register_craft({ - output = "homedecor:banister_"..name.."_horizontal 2", - recipe = { - { topmat, "", dye1 }, - { vertmat, topmat, "" }, - { dye2, vertmat, topmat } - }, - }) -end - -unifieddyes.register_color_craft({ - output = "", - palette = "split", - neutral_node = "homedecor:banister_wood_horizontal", - type = "shapeless", - output_prefix = "homedecor:banister_wood_horizontal_", - output_suffix = "", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE", - } -}) - -if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then - technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"basic_materials:oil_extract 2","dye:yellow 1"} }) -end diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua deleted file mode 100644 index cfcc6fc3..00000000 --- a/homedecor/electronics.lua +++ /dev/null @@ -1,143 +0,0 @@ --- Various home electronics - -local S = homedecor_i18n.gettext - -homedecor.register("speaker", { - description = S("Large Stereo Speaker"), - mesh="homedecor_speaker_large.obj", - tiles = { - "homedecor_speaker_sides.png", - "homedecor_speaker_front.png" - }, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) - end -}) - -homedecor.register("speaker_open", { - description = S("Large Stereo Speaker, open front"), - mesh="homedecor_speaker_large_open.obj", - tiles = { - "homedecor_speaker_sides.png", - "homedecor_speaker_driver.png", - "homedecor_speaker_open_front.png", - { name = "homedecor_generic_metal.png", color = homedecor.color_black } - }, - groups = { snappy = 3, not_in_creative_inventory=1 }, - sounds = default.node_sound_wood_defaults(), - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) - end -}) - -local spk_cbox = { - type = "fixed", - fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 } -} - -homedecor.register("speaker_small", { - description = S("Small Surround Speaker"), - mesh="homedecor_speaker_small.obj", - tiles = { - "homedecor_speaker_sides.png", - "homedecor_speaker_front.png" - }, - selection_box = spk_cbox, - walkable = false, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), -}) - -homedecor.register("stereo", { - description = S("Stereo Receiver"), - tiles = { 'homedecor_stereo_top.png', - 'homedecor_stereo_bottom.png', - 'homedecor_stereo_left.png^[transformFX', - 'homedecor_stereo_left.png', - 'homedecor_stereo_back.png', - 'homedecor_stereo_front.png'}, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), -}) - -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', - walkable = false, - groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), - paramtype2 = 'wallmounted', - selection_box = { - type = "wallmounted", - --wall_side = = - }, -}) - -homedecor.register("television", { - description = S("Small CRT Television"), - tiles = { 'homedecor_television_top.png', - 'homedecor_television_bottom.png', - 'homedecor_television_left.png^[transformFX', - 'homedecor_television_left.png', - 'homedecor_television_back.png', - { name="homedecor_television_front_animated.png", - animation={ - type="vertical_frames", - aspect_w=16, - aspect_h=16, - length=80.0 - } - } - }, - light_source = default.LIGHT_MAX - 1, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), -}) - -homedecor.register("dvd_vcr", { - description = S("DVD and VCR"), - tiles = { - "homedecor_dvdvcr_top.png", - "homedecor_dvdvcr_bottom.png", - "homedecor_dvdvcr_sides.png", - "homedecor_dvdvcr_sides.png^[transformFX", - "homedecor_dvdvcr_back.png", - "homedecor_dvdvcr_front.png", - }, - inventory_image = "homedecor_dvdvcr_inv.png", - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, -0.25, 0.3125, -0.375, 0.1875}, - {-0.25, -0.5, -0.25, 0.25, -0.1875, 0.125}, - } - }, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), -}) - -local tel_cbox = { - type = "fixed", - fixed = { -0.25, -0.5, -0.1875, 0.25, -0.21, 0.15 } -} - -homedecor.register("telephone", { - mesh = "homedecor_telephone.obj", - tiles = { - "homedecor_telephone_dial.png", - "homedecor_telephone_base.png", - "homedecor_telephone_handset.png", - "homedecor_telephone_cord.png", - }, - inventory_image = "homedecor_telephone_inv.png", - description = S("Telephone"), - groups = {snappy=3}, - selection_box = tel_cbox, - walkable = false, - sounds = default.node_sound_wood_defaults(), -}) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua deleted file mode 100644 index aeceeef3..00000000 --- a/homedecor/furniture_recipes.lua +++ /dev/null @@ -1,280 +0,0 @@ - -minetest.register_craft({ - output = "homedecor:table", - recipe = { - { "default:wood","default:wood", "default:wood" }, - { "group:stick", "", "group:stick" }, - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:table_mahogany", - recipe = { - "homedecor:table", - "dye:brown", - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:table_mahogany", - recipe = { - "homedecor:table", - "unifieddyes:dark_orange", - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:table_white", - recipe = { - "homedecor:table", - "dye:white", - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_mahogany", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_white", - burntime = 30, -}) - -minetest.register_craft({ - output = "homedecor:kitchen_chair_wood 2", - recipe = { - { "group:stick",""}, - { "group:wood","group:wood" }, - { "group:stick","group:stick" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:armchair 2", - recipe = { - { "wool:white",""}, - { "group:wood","group:wood" }, - { "wool:white","wool:white" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:armchair", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:armchair", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:kitchen_chair_padded", - recipe = { - "homedecor:kitchen_chair_wood", - "wool:white", - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:kitchen_chair_padded", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:kitchen_chair_padded", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:kitchen_chair_wood", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:kitchen_chair_padded", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:armchair", - burntime = 30, -}) - -minetest.register_craft({ - output = "homedecor:standing_lamp_off", - recipe = { - {"homedecor:table_lamp_off"}, - {"group:stick"}, - {"group:stick"}, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:standing_lamp_off", - palette = "extended", - type = "shapeless", - neutral_node = "homedecor:standing_lamp_off", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:table_lamp_off", - burntime = 10, -}) - -minetest.register_craft({ - output = "homedecor:table_lamp_off", - recipe = { - { "wool:white", "default:torch", "wool:white"}, - { "", "group:stick", ""}, - { "", "stairs:slab_wood", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:table_lamp_off", - recipe = { - { "cottages:wool", "default:torch", "cottages:wool"}, - { "", "group:stick", ""}, - { "", "stairs:slab_wood", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:table_lamp_off", - recipe = { - { "wool:white", "default:torch", "wool:white"}, - { "", "group:stick", ""}, - { "", "moreblocks:slab_wood", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:table_lamp_off", - recipe = { - { "cottages:wool", "default:torch", "cottages:wool"}, - { "", "group:stick", ""}, - { "", "moreblocks:slab_wood", "" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:table_lamp_off", - palette = "extended", - type = "shapeless", - neutral_node = "homedecor:table_lamp_off", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - output = "homedecor:toilet", - recipe = { - { "","","bucket:bucket_water"}, - { "group:marble","group:marble", "group:marble" }, - { "", "bucket:bucket_empty", "" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:sink", - recipe = { - { "group:marble","bucket:bucket_empty", "group:marble" }, - { "", "group:marble", "" } - }, -}) - -minetest.register_craft({ - output = "homedecor:taps", - recipe = { - { "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:taps_brass", - recipe = { - { "technic:brass_ingot","bucket:bucket_water", "technic:brass_ingot" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:shower_tray", - recipe = { - { "group:marble","bucket:bucket_empty", "group:marble" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:shower_head", - recipe = { - {"default:steel_ingot", "bucket:bucket_water"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:bathtub_clawfoot_brass_taps", - recipe = { - { "homedecor:taps_brass", "", "" }, - { "group:marble", "", "group:marble" }, - {"default:steel_ingot", "group:marble", "default:steel_ingot"}, - }, -}) - -minetest.register_craft({ - output = "homedecor:bathtub_clawfoot_chrome_taps", - recipe = { - { "homedecor:taps", "", "" }, - { "group:marble", "", "group:marble" }, - {"default:steel_ingot", "group:marble", "default:steel_ingot"}, - }, -}) - -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" }, - }, -}) - -minetest.register_craft({ - 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" }, - }, -}) diff --git a/homedecor/handlers/init.lua b/homedecor/handlers/init.lua deleted file mode 100644 index 05c27f46..00000000 --- a/homedecor/handlers/init.lua +++ /dev/null @@ -1,24 +0,0 @@ -local handlerpath = homedecor.modpath .. "/handlers/" - --- nodebox arithmetics and helpers --- (please keep non-generic nodeboxes with their node definition) -dofile(handlerpath.."nodeboxes.lua") - --- expand and unexpand decor -dofile(handlerpath.."expansion.lua") - --- register nodes that cook stuff -dofile(handlerpath.."furnaces.lua") - --- inventory related functionality, like initialization, ownership and spawning locked versions -dofile(handlerpath.."inventory.lua") - --- glue it all together into a registration function -dofile(handlerpath.."registration.lua") - --- some nodes have particle spawners -dofile(handlerpath.."water_particles.lua") - - -dofile(handlerpath.."mt_game_beds_functions.lua") -dofile(handlerpath.."sit.lua") diff --git a/homedecor/kitchen_appliances.lua b/homedecor/kitchen_appliances.lua deleted file mode 100644 index 1caa1ec9..00000000 --- a/homedecor/kitchen_appliances.lua +++ /dev/null @@ -1,256 +0,0 @@ --- This file supplies refrigerators - -local S = homedecor_i18n.gettext - -local function N_(x) return x end - --- steel-textured fridge -homedecor.register("refrigerator_steel", { - mesh = "homedecor_refrigerator.obj", - tiles = { "homedecor_refrigerator_steel.png" }, - inventory_image = "homedecor_refrigerator_steel_inv.png", - description = S("Refrigerator (stainless steel)"), - groups = {snappy=3}, - sounds = default.node_sound_stone_defaults(), - selection_box = homedecor.nodebox.slab_y(2), - collision_box = homedecor.nodebox.slab_y(2), - expand = { top="placeholder" }, - infotext=S("Refrigerator"), - inventory = { - size=50, - lockable=true, - }, - on_rotate = screwdriver.rotate_simple -}) - --- white, enameled fridge -homedecor.register("refrigerator_white", { - mesh = "homedecor_refrigerator.obj", - tiles = { "homedecor_refrigerator_white.png" }, - inventory_image = "homedecor_refrigerator_white_inv.png", - description = S("Refrigerator"), - groups = {snappy=3}, - selection_box = homedecor.nodebox.slab_y(2), - collision_box = homedecor.nodebox.slab_y(2), - sounds = default.node_sound_stone_defaults(), - expand = { top="placeholder" }, - infotext=S("Refrigerator"), - inventory = { - size=50, - lockable=true, - }, - on_rotate = screwdriver.rotate_simple -}) - -minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") -minetest.register_alias("homedecor:refrigerator_white_top", "air") - -minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel") -minetest.register_alias("homedecor:refrigerator_steel_top", "air") - -minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked") -minetest.register_alias("homedecor:refrigerator_white_top_locked", "air") -minetest.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked") - -minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked") -minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air") - --- kitchen "furnaces" -homedecor.register_furnace("oven", { - description = S("Oven"), - tile_format = "homedecor_oven_%s%s.png", - output_slots = 4, - output_width = 2, - cook_speed = 1.25, -}) - -homedecor.register_furnace("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("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 = { - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 }, - }, - }, -}) - --- coffee! --- coffee! --- coffee! - -local cm_cbox = { - type = "fixed", - fixed = { - { 0, -8/16, 0, 7/16, 3/16, 8/16 }, - { -4/16, -8/16, -6/16, -1/16, -5/16, -3/16 } - } -} - -homedecor.register("coffee_maker", { - mesh = "homedecor_coffeemaker.obj", - tiles = { - "homedecor_coffeemaker_decanter.png", - "homedecor_coffeemaker_cup.png", - "homedecor_coffeemaker_case.png", - }, - description = S("Coffee Maker"), - inventory_image = "homedecor_coffeemaker_inv.png", - walkable = false, - groups = {snappy=3}, - selection_box = cm_cbox, - node_box = cm_cbox, - on_rotate = screwdriver.disallow -}) - -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", - label = "sfx", - 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 = S("Toaster"), - tiles = { "homedecor_toaster_sides.png" }, - inventory_image = "homedecor_toaster_inv.png", - walkable = false, - 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, itemstack, pointed_thing) - 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 - }) - return itemstack - 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" - }, - walkable = false, - 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, itemstack, pointed_thing) - local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) - return itemstack - end, - drop = "homedecor:toaster" -}) - - -homedecor.register("dishwasher", { - description = S("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" - }, - 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" }, - sounds = default.node_sound_stone_defaults(), - groups = { snappy = 3 }, -}) - -local materials = { N_("granite"), N_("marble"), N_("steel"), N_("wood") } - -for _, m in ipairs(materials) do -homedecor.register("dishwasher_"..m, { - description = S("Dishwasher (@1)", S(m)), - tiles = { - "homedecor_kitchen_cabinet_top_"..m..".png", - "homedecor_dishwasher_bottom.png", - "homedecor_dishwasher_sides.png", - "homedecor_dishwasher_sides.png^[transformFX", - "homedecor_dishwasher_back.png", - "homedecor_dishwasher_front.png" - }, - groups = { snappy = 3 }, - sounds = default.node_sound_stone_defaults(), -}) -end diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua deleted file mode 100644 index 2ecb7bf5..00000000 --- a/homedecor/kitchen_furniture.lua +++ /dev/null @@ -1,157 +0,0 @@ --- This file supplies Kitchen cabinets and kitchen sink - -local S = homedecor_i18n.gettext - -local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" -local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" - -local function N_(x) return x end - -local counter_materials = { "", N_("granite"), N_("marble"), N_("steel") } - -for _, mat in ipairs(counter_materials) do - - local desc = S("Kitchen Cabinet") - local material = "" - - if mat ~= "" then - desc = S("Kitchen Cabinet (@1 top)", S(mat)) - material = "_"..mat - end - - homedecor.register("kitchen_cabinet"..material, { - description = desc, - tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png', - cabinet_bottom, - cabinet_sides, - cabinet_sides, - cabinet_sides, - 'homedecor_kitchen_cabinet_front.png'}, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - infotext=S("Kitchen Cabinet"), - inventory = { - size=24, - lockable=true, - }, - }) -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 = { - cabinet_sides, - cabinet_bottom, - cabinet_sides, - cabinet_sides, - cabinet_sides, - '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, - lockable=true, - }, -}) - -homedecor.register("kitchen_cabinet_with_sink", { - description = S("Kitchen Cabinet with sink"), - mesh = "homedecor_kitchen_sink.obj", - tiles = { - "homedecor_kitchen_sink_top.png", - "homedecor_kitchen_cabinet_front.png", - cabinet_sides, - cabinet_bottom - }, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - infotext=S("Under-sink cabinet"), - inventory = { - size=16, - lockable=true, - }, - node_box = { - type = "fixed", - fixed = { - { -8/16, -8/16, -8/16, 8/16, 6/16, 8/16 }, - { -8/16, 6/16, -8/16, -6/16, 8/16, 8/16 }, - { 6/16, 6/16, -8/16, 8/16, 8/16, 8/16 }, - { -8/16, 6/16, -8/16, 8/16, 8/16, -6/16 }, - { -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, - } - }, - on_destruct = function(pos) - homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) - end -}) - -local cp_cbox = { - type = "fixed", - fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 } -} - -homedecor.register("copper_pans", { - description = S("Copper pans"), - mesh = "homedecor_copper_pans.obj", - tiles = { "homedecor_polished_copper.png" }, - inventory_image = "homedecor_copper_pans_inv.png", - groups = { snappy=3 }, - selection_box = cp_cbox, - walkable = false, - on_place = minetest.rotate_node -}) - -local kf_cbox = { - type = "fixed", - fixed = { -2/16, -8/16, 1/16, 2/16, -1/16, 8/16 } -} - -homedecor.register("kitchen_faucet", { - mesh = "homedecor_kitchen_faucet.obj", - tiles = { "homedecor_generic_metal_bright.png" }, - inventory_image = "homedecor_kitchen_faucet_inv.png", - description = S("Kitchen Faucet"), - groups = {snappy=3}, - selection_box = kf_cbox, - walkable = false, - on_rotate = screwdriver.disallow, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) - if below and - below.name == "homedecor:sink" or - below.name == "homedecor:kitchen_cabinet_with_sink" or - below.name == "homedecor:kitchen_cabinet_with_sink_locked" then - local particledef = { - outlet = { x = 0, y = -0.19, z = 0.13 }, - velocity_x = { min = -0.05, max = 0.05 }, - velocity_y = -0.3, - velocity_z = { min = -0.1, max = 0 }, - spread = 0 - } - homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") - end - return itemstack - end, - on_destruct = homedecor.stop_particle_spawner -}) - -homedecor.register("paper_towel", { - mesh = "homedecor_paper_towel.obj", - tiles = { - "homedecor_generic_quilted_paper.png", - "default_wood.png" - }, - inventory_image = "homedecor_paper_towel_inv.png", - description = S("Paper towels"), - groups = { snappy=3 }, - walkable = false, - selection_box = { - type = "fixed", - fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } - }, -}) diff --git a/homedecor/laundry.lua b/homedecor/laundry.lua deleted file mode 100644 index 5ee9ec68..00000000 --- a/homedecor/laundry.lua +++ /dev/null @@ -1,61 +0,0 @@ --- laundry devices - -homedecor.register("washing_machine", { - description = "Washing Machine", - tiles = { - "homedecor_washing_machine_top.png", - "homedecor_washing_machine_bottom.png", - "homedecor_washing_machine_sides.png", - "homedecor_washing_machine_sides.png^[transformFX", - "homedecor_washing_machine_back.png", - "homedecor_washing_machine_front.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.375, 0.375}, - {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, - } - }, - selection_box = { type = "regular" }, - groups = { snappy = 3 }, -}) - -homedecor.register("dryer", { - description = "Tumble dryer", - tiles = { - "homedecor_dryer_top.png", - "homedecor_dryer_bottom.png", - "homedecor_dryer_sides.png", - "homedecor_dryer_sides.png^[transformFX", - "homedecor_dryer_back.png", - "homedecor_dryer_front.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.375, 0.375}, - {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, - } - }, - selection_box = { type = "regular" }, - groups = { snappy = 3 }, -}) - -local ib_cbox = { - type = "fixed", - fixed = { -6/16, -8/16, -4/16, 17/16, 4/16, 4/16 } -} - -homedecor.register("ironing_board", { - description = "Ironing board", - mesh = "homedecor_ironing_board.obj", - tiles = { - "wool_grey.png", - { name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }, - }, - expand = {right = "placeholder"}, - groups = { snappy = 3 }, - selection_box = ib_cbox, - collision_box = ib_cbox -}) diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua deleted file mode 100644 index 0e7b0f26..00000000 --- a/homedecor/shutters.lua +++ /dev/null @@ -1,101 +0,0 @@ --- Various kinds of window shutters - -local S = homedecor_i18n.gettext - -local shutters = { - "mahogany", - "red", - "yellow", - "forest_green", - "light_blue", - "violet", - "black", - "dark_grey", - "grey", - "white", -} - -local shutter_cbox = { - type = "wallmounted", - wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, - wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 } -} - -local inv = "homedecor_window_shutter_inv.png^[colorize:#a87034:150" - -homedecor.register("shutter", { - mesh = "homedecor_window_shutter.obj", - tiles = { - { name = "homedecor_window_shutter.png", color = 0xffa87034 } - }, - description = S("Wooden Shutter"), - inventory_image = inv, - wield_image = inv, - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - airbrush_replacement_node = "homedecor:shutter_colored", - groups = { snappy = 3, ud_param2_colorable = 1 }, - sounds = default.node_sound_wood_defaults(), - selection_box = shutter_cbox, - node_box = shutter_cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - end, -}) - -homedecor.register("shutter_colored", { - mesh = "homedecor_window_shutter.obj", - tiles = { "homedecor_window_shutter.png" }, - description = S("Wooden Shutter"), - inventory_image = "homedecor_window_shutter_inv.png", - wield_image = "homedecor_window_shutter_inv.png", - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - groups = { snappy = 3 , not_in_creative_inventory = 1, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), - selection_box = shutter_cbox, - node_box = shutter_cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) - end, -}) - -minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") -minetest.register_alias("homedecor:shutter_oak", "homedecor:shutter") - --- convert to param2 coloring - -homedecor.old_shutter_nodes = {} - -for _, color in ipairs(shutters) do - table.insert(homedecor.old_shutter_nodes, "homedecor:shutter_"..color) -end - -minetest.register_lbm({ - name = "homedecor:convert_shutters", - label = "Convert shutter static nodes to use param2 color", - run_at_every_load = false, - nodenames = homedecor.old_shutter_nodes, - action = function(pos, node) - local name = node.name - local color = string.sub(name, string.find(name, "_") + 1) - - if color == "mahogany" then - color = "dark_red" - elseif color == "forest_green" then - color = "dark_green" - elseif color == "light_blue" then - color = "medium_cyan" - elseif color == "red" then - color = "medium_red" - end - - local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") - local param2 = paletteidx + node.param2 - - minetest.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 }) - local meta = minetest.get_meta(pos) - meta:set_string("dye", "unifieddyes:"..color) - end -}) diff --git a/homedecor/textures/homedecor_coin.png b/homedecor/textures/homedecor_coin.png deleted file mode 100644 index 84b0932b2a943374f8c3fcee3c02f9782d2cdef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}X@F0NE06{PcPqBn`=nnllYTW{ zYV$OaO}!$U%7ix-2v5!tn4H2tDU!cAiKjV?r`eCEGLg5!o7-KR%|(Ol^;YRuYow>N z2~24fXf5MwE#dpIUi$lT>7Q3*er%WdaX|XhHkt2Bq<>zN{drF2=TVs-n`D0Mmj1X( z=9=L1pFmrsN`m}?890Of{rmSA2#y{-I(P2ef`TBR0Eo#@viK-aRko*#V~E7%x#zYs zH7M}71|Gdv?X8mV_rL!X#)9X0?{zw#&#*U1y~(rhZmbxiOJ@3#^G7z$KR^4M)T@GU z!IrIUP4drO&F}4O?Uv)4B)vk7uS4Uw7qd6Z0vAE!;%&Z6ixl$yyWiM$MmzZSO8$r1 V><;EhwR=Ee;_2$=vd$@?2>=lhhAjX9 diff --git a/homedecor/textures/homedecor_fan_blades.png b/homedecor/textures/homedecor_fan_blades.png deleted file mode 100644 index efb9f7c79df65a0651a8aee75191a46254fffdac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 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 bkJ0}CQ#hWB4az~q00000NkvXXu0mjf$L1jV diff --git a/homedecor_3d_extras/depends.txt b/homedecor_3d_extras/depends.txt index e6de01ae..a3c19015 100644 --- a/homedecor_3d_extras/depends.txt +++ b/homedecor_3d_extras/depends.txt @@ -1,3 +1,4 @@ +homedecor_common default -moreblocks? vessels? +moreblocks? diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt new file mode 100644 index 00000000..949c189c --- /dev/null +++ b/homedecor_bathroom/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +basic_materials +unifieddyes +homedecor_i18n +building_blocks diff --git a/homedecor/bathroom_sanitation.lua b/homedecor_bathroom/init.lua similarity index 56% rename from homedecor/bathroom_sanitation.lua rename to homedecor_bathroom/init.lua index eb4a58d1..51f341bb 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor_bathroom/init.lua @@ -1,4 +1,121 @@ +local S = homedecor_i18n.gettext + +minetest.register_node(":homedecor:bathroom_tiles_dark", { + description = S("Bathroom/kitchen tiles (dark)"), + tiles = { + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 }, + }, + paramtype = "light", + paramtype2 = "color", + palette = "unifieddyes_palette_extended.png", + groups = {cracky=3, ud_param2_colorable = 1}, + sounds = default.node_sound_stone_defaults(), + on_construct = unifieddyes.on_construct, +}) + +minetest.register_node(":homedecor:bathroom_tiles_medium", { + description = S("Bathroom/kitchen tiles (medium)"), + tiles = { + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 }, + }, + paramtype = "light", + paramtype2 = "color", + palette = "unifieddyes_palette_extended.png", + groups = {cracky=3, ud_param2_colorable = 1}, + sounds = default.node_sound_stone_defaults(), + on_construct = unifieddyes.on_construct, +}) + +minetest.register_node(":homedecor:bathroom_tiles_light", { + description = S("Bathroom/kitchen tiles (light)"), + tiles = { + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff }, + }, + paramtype = "light", + paramtype2 = "color", + palette = "unifieddyes_palette_extended.png", + groups = {cracky=3, ud_param2_colorable = 1}, + sounds = default.node_sound_stone_defaults(), + on_construct = unifieddyes.on_construct, +}) + +local tr_cbox = { + type = "fixed", + fixed = { -0.375, -0.3125, 0.25, 0.375, 0.375, 0.5 } +} + +homedecor.register("towel_rod", { + description = S("Towel rod with towel"), + mesh = "homedecor_towel_rod.obj", + tiles = { + "homedecor_generic_terrycloth.png", + "default_wood.png", + }, + inventory_image = "homedecor_towel_rod_inv.png", + selection_box = tr_cbox, + walkable = false, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3}, + sounds = default.node_sound_defaults(), +}) + +homedecor.register("medicine_cabinet", { + description = S("Medicine cabinet"), + mesh = "homedecor_medicine_cabinet.obj", + tiles = { + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png' + }, + inventory_image = "homedecor_medicine_cabinet_inv.png", + selection_box = { + type = "fixed", + fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} + }, + walkable = false, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + on_punch = function(pos, node, puncher, pointed_thing) + node.name = "homedecor:medicine_cabinet_open" + minetest.swap_node(pos, node) + end, + infotext=S("Medicine cabinet"), + inventory = { + size=6, + }, +}) + +homedecor.register("medicine_cabinet_open", { + mesh = "homedecor_medicine_cabinet_open.obj", + tiles = { + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png', + 'homedecor_medicine_cabinet_inside.png' + }, + selection_box = { + type = "fixed", + fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5} + }, + walkable = false, + groups = { snappy = 3, not_in_creative_inventory=1 }, + drop = "homedecor:medicine_cabinet", + on_punch = function(pos, node, puncher, pointed_thing) + node.name = "homedecor:medicine_cabinet" + minetest.swap_node(pos, node) + end, +}) + +-- "Sanitation" related + + local S = homedecor_i18n.gettext local toilet_sbox = { @@ -18,9 +135,9 @@ homedecor.register("toilet", { description = S("Toilet"), mesh = "homedecor_toilet_closed.obj", tiles = { - "homedecor_marble.png", - "homedecor_marble.png", - "homedecor_marble.png", + "building_blocks_marble.png", + "building_blocks_marble.png", + "building_blocks_marble.png", { name = "homedecor_generic_metal.png", color = homedecor.color_med_grey } }, selection_box = toilet_sbox, @@ -36,9 +153,9 @@ homedecor.register("toilet", { homedecor.register("toilet_open", { mesh = "homedecor_toilet_open.obj", tiles = { - "homedecor_marble.png", - "homedecor_marble.png", - "homedecor_marble.png", + "building_blocks_marble.png", + "building_blocks_marble.png", + "building_blocks_marble.png", "default_water.png", { name = "homedecor_generic_metal.png", color = homedecor.color_med_grey } }, @@ -101,8 +218,8 @@ homedecor.register("sink", { description = S("Bathroom Sink"), mesh = "homedecor_bathroom_sink.obj", tiles = { - "homedecor_marble.png", - "homedecor_marble.png", + "building_blocks_marble.png", + "building_blocks_marble.png", "default_water.png" }, inventory_image="homedecor_bathroom_sink_inv.png", @@ -189,7 +306,7 @@ homedecor.register("shower_tray", { description = S("Shower Tray"), tiles = { "forniture_marble_base_ducha_top.png", - "homedecor_marble.png" + "building_blocks_marble.png" }, node_box = { type = "fixed", @@ -258,7 +375,7 @@ homedecor.register("bathtub_clawfoot_brass_taps", { "homedecor_generic_metal_bright.png", "homedecor_generic_metal_bright.png", "homedecor_generic_metal_brass.png", - "homedecor_marble.png", + "building_blocks_marble.png", "homedecor_bathtub_clawfoot_bottom_inside.png", }, description = S("Bathtub, clawfoot, with brass taps"), @@ -278,7 +395,7 @@ homedecor.register("bathtub_clawfoot_chrome_taps", { "homedecor_generic_metal_bright.png", "homedecor_generic_metal_bright.png", "homedecor_generic_metal_bright.png", - "homedecor_marble.png", + "building_blocks_marble.png", "homedecor_bathtub_clawfoot_bottom_inside.png", }, description = S("Bathtub, clawfoot, with chrome taps"), @@ -313,6 +430,8 @@ homedecor.register("bathroom_set", { sounds = default.node_sound_glass_defaults(), }) +-- aliases + minetest.register_alias("3dforniture:toilet", "homedecor:toilet") minetest.register_alias("3dforniture:toilet_open", "homedecor:toilet_open") minetest.register_alias("3dforniture:sink", "homedecor:sink") @@ -327,3 +446,153 @@ 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") + +-- convert old static nodes + +homedecor.old_static_bathroom_tiles = { + "homedecor:tiles_1", + "homedecor:tiles_2", + "homedecor:tiles_3", + "homedecor:tiles_4", + "homedecor:tiles_red", + "homedecor:tiles_tan", + "homedecor:tiles_yellow", + "homedecor:tiles_green", + "homedecor:tiles_blue" +} + +local old_to_color = { + "light_grey", + "grey", + "black", + "black" +} + +minetest.register_lbm({ + name = ":homedecor:convert_bathroom_tiles", + label = "Convert bathroom tiles to use param2 color", + run_at_every_load = false, + nodenames = homedecor.old_static_bathroom_tiles, + action = function(pos, node) + local name = node.name + local newname = "homedecor:bathroom_tiles_light" + local a = string.find(name, "_") + local color = string.sub(name, a + 1) + + if color == "tan" then + color = "yellow_s50" + elseif color == "1" or color == "2" or color == "3" or color == "4" then + if color == "4" then + newname = "homedecor:bathroom_tiles_medium" + end + color = old_to_color[tonumber(color)] + elseif color ~= "yellow" then + color = color.."_s50" + end + + local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") + + minetest.set_node(pos, { name = newname, param2 = paletteidx }) + local meta = minetest.get_meta(pos) + meta:set_string("dye", "unifieddyes:"..color) + meta:set_string("palette", "ext") + end +}) + +-- crafting + + +minetest.register_craft({ + output = "homedecor:towel_rod", + recipe = { + { "group:wood", "group:stick", "group:wood" }, + { "", "building_blocks:terrycloth_towel", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:toilet_paper", + recipe = { + { "", "default:paper", "default:paper" }, + { "group:wood", "group:stick", "default:paper" }, + { "", "default:paper", "default:paper" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:medicine_cabinet", + recipe = { + { "group:stick", "default:glass", "group:stick" }, + { "group:stick", "default:glass", "group:stick" }, + { "group:stick", "default:glass", "group:stick" } + }, +}) + + +-- bathroom/kitchen tiles + +minetest.register_craft( { + output = "homedecor:bathroom_tiles_light 4", + recipe = { + { "group:marble", "group:marble", "" }, + { "group:marble", "group:marble", "dye:white" } + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_light", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_light", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft( { + output = "homedecor:bathroom_tiles_medium 4", + recipe = { + { "group:marble", "group:marble", "" }, + { "group:marble", "group:marble", "dye:grey" } + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_medium", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_medium", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft( { + output = "homedecor:bathroom_tiles_dark 4", + recipe = { + { "group:marble", "group:marble", "" }, + { "group:marble", "group:marble", "dye:dark_grey" } + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bathroom_tiles_dark", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:bathroom_tiles_dark", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + output = "homedecor:bathroom_set", + recipe = { + { "", "homedecor:glass_table_small_round", "" }, + { "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" } + }, +}) diff --git a/homedecor/models/homedecor_bathroom_faucet.obj b/homedecor_bathroom/models/homedecor_bathroom_faucet.obj similarity index 100% rename from homedecor/models/homedecor_bathroom_faucet.obj rename to homedecor_bathroom/models/homedecor_bathroom_faucet.obj diff --git a/homedecor/models/homedecor_bathroom_set.obj b/homedecor_bathroom/models/homedecor_bathroom_set.obj similarity index 100% rename from homedecor/models/homedecor_bathroom_set.obj rename to homedecor_bathroom/models/homedecor_bathroom_set.obj diff --git a/homedecor/models/homedecor_bathroom_sink.obj b/homedecor_bathroom/models/homedecor_bathroom_sink.obj similarity index 100% rename from homedecor/models/homedecor_bathroom_sink.obj rename to homedecor_bathroom/models/homedecor_bathroom_sink.obj diff --git a/homedecor/models/homedecor_bathtub_clawfoot.obj b/homedecor_bathroom/models/homedecor_bathtub_clawfoot.obj similarity index 100% rename from homedecor/models/homedecor_bathtub_clawfoot.obj rename to homedecor_bathroom/models/homedecor_bathtub_clawfoot.obj diff --git a/homedecor/models/homedecor_medicine_cabinet.obj b/homedecor_bathroom/models/homedecor_medicine_cabinet.obj similarity index 100% rename from homedecor/models/homedecor_medicine_cabinet.obj rename to homedecor_bathroom/models/homedecor_medicine_cabinet.obj diff --git a/homedecor/models/homedecor_medicine_cabinet_open.obj b/homedecor_bathroom/models/homedecor_medicine_cabinet_open.obj similarity index 100% rename from homedecor/models/homedecor_medicine_cabinet_open.obj rename to homedecor_bathroom/models/homedecor_medicine_cabinet_open.obj diff --git a/homedecor/models/homedecor_shower_head.obj b/homedecor_bathroom/models/homedecor_shower_head.obj similarity index 100% rename from homedecor/models/homedecor_shower_head.obj rename to homedecor_bathroom/models/homedecor_shower_head.obj diff --git a/homedecor/models/homedecor_toilet_closed.obj b/homedecor_bathroom/models/homedecor_toilet_closed.obj similarity index 100% rename from homedecor/models/homedecor_toilet_closed.obj rename to homedecor_bathroom/models/homedecor_toilet_closed.obj diff --git a/homedecor/models/homedecor_toilet_open.obj b/homedecor_bathroom/models/homedecor_toilet_open.obj similarity index 100% rename from homedecor/models/homedecor_toilet_open.obj rename to homedecor_bathroom/models/homedecor_toilet_open.obj diff --git a/homedecor/models/homedecor_toilet_paper.obj b/homedecor_bathroom/models/homedecor_toilet_paper.obj similarity index 100% rename from homedecor/models/homedecor_toilet_paper.obj rename to homedecor_bathroom/models/homedecor_toilet_paper.obj diff --git a/homedecor/models/homedecor_towel_rod.obj b/homedecor_bathroom/models/homedecor_towel_rod.obj similarity index 100% rename from homedecor/models/homedecor_towel_rod.obj rename to homedecor_bathroom/models/homedecor_towel_rod.obj diff --git a/homedecor/textures/3dforniture_taps_brass_inv.png b/homedecor_bathroom/textures/3dforniture_taps_brass_inv.png similarity index 100% rename from homedecor/textures/3dforniture_taps_brass_inv.png rename to homedecor_bathroom/textures/3dforniture_taps_brass_inv.png diff --git a/homedecor/textures/3dforniture_taps_inv.png b/homedecor_bathroom/textures/3dforniture_taps_inv.png similarity index 100% rename from homedecor/textures/3dforniture_taps_inv.png rename to homedecor_bathroom/textures/3dforniture_taps_inv.png diff --git a/homedecor/textures/forniture_marble_base_ducha_top.png b/homedecor_bathroom/textures/forniture_marble_base_ducha_top.png similarity index 100% rename from homedecor/textures/forniture_marble_base_ducha_top.png rename to homedecor_bathroom/textures/forniture_marble_base_ducha_top.png diff --git a/homedecor/textures/homedecor_bathroom_set_cup.png b/homedecor_bathroom/textures/homedecor_bathroom_set_cup.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_cup.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_cup.png diff --git a/homedecor/textures/homedecor_bathroom_set_inv.png b/homedecor_bathroom/textures/homedecor_bathroom_set_inv.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_inv.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_inv.png diff --git a/homedecor/textures/homedecor_bathroom_set_mirror.png b/homedecor_bathroom/textures/homedecor_bathroom_set_mirror.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_mirror.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_mirror.png diff --git a/homedecor/textures/homedecor_bathroom_set_toothbrush.png b/homedecor_bathroom/textures/homedecor_bathroom_set_toothbrush.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_toothbrush.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_toothbrush.png diff --git a/homedecor/textures/homedecor_bathroom_set_toothpaste.png b/homedecor_bathroom/textures/homedecor_bathroom_set_toothpaste.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_toothpaste.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_toothpaste.png diff --git a/homedecor/textures/homedecor_bathroom_set_tray.png b/homedecor_bathroom/textures/homedecor_bathroom_set_tray.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_set_tray.png rename to homedecor_bathroom/textures/homedecor_bathroom_set_tray.png diff --git a/homedecor/textures/homedecor_bathroom_sink_inv.png b/homedecor_bathroom/textures/homedecor_bathroom_sink_inv.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_sink_inv.png rename to homedecor_bathroom/textures/homedecor_bathroom_sink_inv.png diff --git a/homedecor/textures/homedecor_bathroom_tiles_bg.png b/homedecor_bathroom/textures/homedecor_bathroom_tiles_bg.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_tiles_bg.png rename to homedecor_bathroom/textures/homedecor_bathroom_tiles_bg.png diff --git a/homedecor/textures/homedecor_bathroom_tiles_fg.png b/homedecor_bathroom/textures/homedecor_bathroom_tiles_fg.png similarity index 100% rename from homedecor/textures/homedecor_bathroom_tiles_fg.png rename to homedecor_bathroom/textures/homedecor_bathroom_tiles_fg.png diff --git a/homedecor/textures/homedecor_bathtub_clawfoot_bottom_inside.png b/homedecor_bathroom/textures/homedecor_bathtub_clawfoot_bottom_inside.png similarity index 100% rename from homedecor/textures/homedecor_bathtub_clawfoot_bottom_inside.png rename to homedecor_bathroom/textures/homedecor_bathtub_clawfoot_bottom_inside.png diff --git a/homedecor/textures/homedecor_medicine_cabinet_inside.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inside.png similarity index 100% rename from homedecor/textures/homedecor_medicine_cabinet_inside.png rename to homedecor_bathroom/textures/homedecor_medicine_cabinet_inside.png diff --git a/homedecor/textures/homedecor_medicine_cabinet_inv.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inv.png similarity index 100% rename from homedecor/textures/homedecor_medicine_cabinet_inv.png rename to homedecor_bathroom/textures/homedecor_medicine_cabinet_inv.png diff --git a/homedecor/textures/homedecor_medicine_cabinet_mirror.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_mirror.png similarity index 100% rename from homedecor/textures/homedecor_medicine_cabinet_mirror.png rename to homedecor_bathroom/textures/homedecor_medicine_cabinet_mirror.png diff --git a/homedecor/textures/homedecor_shower_head.png b/homedecor_bathroom/textures/homedecor_shower_head.png similarity index 100% rename from homedecor/textures/homedecor_shower_head.png rename to homedecor_bathroom/textures/homedecor_shower_head.png diff --git a/homedecor/textures/homedecor_shower_head_inv.png b/homedecor_bathroom/textures/homedecor_shower_head_inv.png similarity index 100% rename from homedecor/textures/homedecor_shower_head_inv.png rename to homedecor_bathroom/textures/homedecor_shower_head_inv.png diff --git a/homedecor/textures/homedecor_toilet_paper_inv.png b/homedecor_bathroom/textures/homedecor_toilet_paper_inv.png similarity index 100% rename from homedecor/textures/homedecor_toilet_paper_inv.png rename to homedecor_bathroom/textures/homedecor_toilet_paper_inv.png diff --git a/homedecor/textures/homedecor_towel_rod_inv.png b/homedecor_bathroom/textures/homedecor_towel_rod_inv.png similarity index 100% rename from homedecor/textures/homedecor_towel_rod_inv.png rename to homedecor_bathroom/textures/homedecor_towel_rod_inv.png diff --git a/homedecor_bedroom/depends.txt b/homedecor_bedroom/depends.txt new file mode 100644 index 00000000..9242a25b --- /dev/null +++ b/homedecor_bedroom/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +basic_materials +unifieddyes +homedecor_i18n +creative diff --git a/homedecor/bedroom.lua b/homedecor_bedroom/init.lua similarity index 74% rename from homedecor/bedroom.lua rename to homedecor_bedroom/init.lua index 7059809e..86b00fe5 100644 --- a/homedecor/bedroom.lua +++ b/homedecor_bedroom/init.lua @@ -220,7 +220,7 @@ for _, color in ipairs(bedcolors) do end minetest.register_lbm({ - name = "homedecor:convert_beds", + name = ":homedecor:convert_beds", label = "Convert homedecor static bed nodes to use param2 color", run_at_every_load = false, nodenames = homedecor.old_bed_nodes, @@ -265,3 +265,126 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..color) end }) + +-- crafting + + +minetest.register_craft( { + output = "homedecor:nightstand_oak_one_drawer", + recipe = { + { "homedecor:drawer_small" }, + { "group:wood" }, + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:nightstand_oak_one_drawer", + burntime = 30, +}) + +minetest.register_craft( { + output = "homedecor:nightstand_oak_two_drawers", + recipe = { + { "homedecor:drawer_small" }, + { "homedecor:drawer_small" }, + { "group:wood" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:nightstand_oak_two_drawers", + recipe = { + { "homedecor:nightstand_oak_one_drawer" }, + { "homedecor:drawer_small" }, + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:nightstand_oak_two_drawers", + burntime = 30, +}) + +-- + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:nightstand_mahogany_one_drawer", + recipe = { + "homedecor:nightstand_oak_one_drawer", + "dye:brown", + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:nightstand_mahogany_one_drawer", + burntime = 30, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:nightstand_mahogany_two_drawers", + recipe = { + "homedecor:nightstand_oak_two_drawers", + "dye:brown", + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:nightstand_mahogany_two_drawers", + burntime = 30, +}) + + +minetest.register_craft( { + output = "homedecor:bed_regular", + recipe = { + { "group:stick", "", "group:stick" }, + { "wool:white", "wool:white", "wool:white" }, + { "group:wood", "", "group:wood" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bed_regular", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_regular", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft( { + output = "homedecor:bed_kingsize", + recipe = { + { "homedecor:bed_regular", "homedecor:bed_regular" } + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bed_kingsize", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_kingsize", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:bed_kingsize", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:bed_regular", + recipe = { + "NEUTRAL_NODE", + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) diff --git a/homedecor/models/homedecor_bed_extended.obj b/homedecor_bedroom/models/homedecor_bed_extended.obj similarity index 100% rename from homedecor/models/homedecor_bed_extended.obj rename to homedecor_bedroom/models/homedecor_bed_extended.obj diff --git a/homedecor/models/homedecor_bed_kingsize.obj b/homedecor_bedroom/models/homedecor_bed_kingsize.obj similarity index 100% rename from homedecor/models/homedecor_bed_kingsize.obj rename to homedecor_bedroom/models/homedecor_bed_kingsize.obj diff --git a/homedecor/models/homedecor_bed_regular.obj b/homedecor_bedroom/models/homedecor_bed_regular.obj similarity index 100% rename from homedecor/models/homedecor_bed_regular.obj rename to homedecor_bedroom/models/homedecor_bed_regular.obj diff --git a/homedecor/textures/homedecor_bed_bottom.png b/homedecor_bedroom/textures/homedecor_bed_bottom.png similarity index 100% rename from homedecor/textures/homedecor_bed_bottom.png rename to homedecor_bedroom/textures/homedecor_bed_bottom.png diff --git a/homedecor/textures/homedecor_bed_frame.png b/homedecor_bedroom/textures/homedecor_bed_frame.png similarity index 100% rename from homedecor/textures/homedecor_bed_frame.png rename to homedecor_bedroom/textures/homedecor_bed_frame.png diff --git a/homedecor/textures/homedecor_bed_inv.png b/homedecor_bedroom/textures/homedecor_bed_inv.png similarity index 100% rename from homedecor/textures/homedecor_bed_inv.png rename to homedecor_bedroom/textures/homedecor_bed_inv.png diff --git a/homedecor/textures/homedecor_bed_kingsize_inv.png b/homedecor_bedroom/textures/homedecor_bed_kingsize_inv.png similarity index 100% rename from homedecor/textures/homedecor_bed_kingsize_inv.png rename to homedecor_bedroom/textures/homedecor_bed_kingsize_inv.png diff --git a/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_1_drawer_front.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png rename to homedecor_bedroom/textures/homedecor_nightstand_mahogany_1_drawer_front.png diff --git a/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_2_drawer_front.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png rename to homedecor_bedroom/textures/homedecor_nightstand_mahogany_2_drawer_front.png diff --git a/homedecor/textures/homedecor_nightstand_mahogany_back.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_back.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_mahogany_back.png rename to homedecor_bedroom/textures/homedecor_nightstand_mahogany_back.png diff --git a/homedecor/textures/homedecor_nightstand_mahogany_lr.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_lr.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_mahogany_lr.png rename to homedecor_bedroom/textures/homedecor_nightstand_mahogany_lr.png diff --git a/homedecor/textures/homedecor_nightstand_mahogany_tb.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_tb.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_mahogany_tb.png rename to homedecor_bedroom/textures/homedecor_nightstand_mahogany_tb.png diff --git a/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_1_drawer_front.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png rename to homedecor_bedroom/textures/homedecor_nightstand_oak_1_drawer_front.png diff --git a/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_2_drawer_front.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png rename to homedecor_bedroom/textures/homedecor_nightstand_oak_2_drawer_front.png diff --git a/homedecor/textures/homedecor_nightstand_oak_back.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_back.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_oak_back.png rename to homedecor_bedroom/textures/homedecor_nightstand_oak_back.png diff --git a/homedecor/textures/homedecor_nightstand_oak_lr.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_lr.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_oak_lr.png rename to homedecor_bedroom/textures/homedecor_nightstand_oak_lr.png diff --git a/homedecor/textures/homedecor_nightstand_oak_tb.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_tb.png similarity index 100% rename from homedecor/textures/homedecor_nightstand_oak_tb.png rename to homedecor_bedroom/textures/homedecor_nightstand_oak_tb.png diff --git a/homedecor_books/depends.txt b/homedecor_books/depends.txt new file mode 100644 index 00000000..ed0ab327 --- /dev/null +++ b/homedecor_books/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +unifieddyes +homedecor_i18n +creative + diff --git a/homedecor/books.lua b/homedecor_books/init.lua similarity index 95% rename from homedecor/books.lua rename to homedecor_books/init.lua index 20b1e39b..fb272c0b 100644 --- a/homedecor/books.lua +++ b/homedecor_books/init.lua @@ -183,5 +183,30 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields) return true end) +-- crafting + + +local bookcolors = { + "red", + "green", + "blue", + "violet", + "grey", + "brown" +} + +for _, color in ipairs(bookcolors) do + minetest.register_craft({ + type = "shapeless", + output = "homedecor:book_"..color, + recipe = { + "dye:"..color, + "default:book" + }, + }) +end + +-- aliases + minetest.register_alias("homedecor:book", "homedecor:book_grey") minetest.register_alias("homedecor:book_open", "homedecor:book_open_grey") diff --git a/homedecor/models/homedecor_book.obj b/homedecor_books/models/homedecor_book.obj similarity index 100% rename from homedecor/models/homedecor_book.obj rename to homedecor_books/models/homedecor_book.obj diff --git a/homedecor/models/homedecor_book_open.obj b/homedecor_books/models/homedecor_book_open.obj similarity index 100% rename from homedecor/models/homedecor_book_open.obj rename to homedecor_books/models/homedecor_book_open.obj diff --git a/homedecor/textures/homedecor_book_cover.png b/homedecor_books/textures/homedecor_book_cover.png similarity index 100% rename from homedecor/textures/homedecor_book_cover.png rename to homedecor_books/textures/homedecor_book_cover.png diff --git a/homedecor/textures/homedecor_book_cover_trim.png b/homedecor_books/textures/homedecor_book_cover_trim.png similarity index 100% rename from homedecor/textures/homedecor_book_cover_trim.png rename to homedecor_books/textures/homedecor_book_cover_trim.png diff --git a/homedecor/textures/homedecor_book_edges.png b/homedecor_books/textures/homedecor_book_edges.png similarity index 100% rename from homedecor/textures/homedecor_book_edges.png rename to homedecor_books/textures/homedecor_book_edges.png diff --git a/homedecor/textures/homedecor_book_inv.png b/homedecor_books/textures/homedecor_book_inv.png similarity index 100% rename from homedecor/textures/homedecor_book_inv.png rename to homedecor_books/textures/homedecor_book_inv.png diff --git a/homedecor/textures/homedecor_book_pages.png b/homedecor_books/textures/homedecor_book_pages.png similarity index 100% rename from homedecor/textures/homedecor_book_pages.png rename to homedecor_books/textures/homedecor_book_pages.png diff --git a/homedecor/textures/homedecor_book_trim_inv.png b/homedecor_books/textures/homedecor_book_trim_inv.png similarity index 100% rename from homedecor/textures/homedecor_book_trim_inv.png rename to homedecor_books/textures/homedecor_book_trim_inv.png diff --git a/homedecor_climate_control/depends.txt b/homedecor_climate_control/depends.txt new file mode 100644 index 00000000..aae5ef28 --- /dev/null +++ b/homedecor_climate_control/depends.txt @@ -0,0 +1,5 @@ +homedecor_common +default +basic_materials +homedecor_i18n +building_blocks? diff --git a/homedecor/climate-control.lua b/homedecor_climate_control/init.lua similarity index 65% rename from homedecor/climate-control.lua rename to homedecor_climate_control/init.lua index 412fedf7..75fe7aa9 100644 --- a/homedecor/climate-control.lua +++ b/homedecor_climate_control/init.lua @@ -16,7 +16,7 @@ homedecor.register("air_conditioner", { -- fans -minetest.register_entity("homedecor:mesh_desk_fan", { +minetest.register_entity(":homedecor:mesh_desk_fan", { collisionbox = homedecor.nodebox.null, visual = "mesh", mesh = "homedecor_desk_fan.b3d", @@ -141,3 +141,69 @@ homedecor.register("radiator", { collision_box = r_cbox, sounds = default.node_sound_wood_defaults(), }) + +-- crafting + + +minetest.register_craft({ + output = "homedecor:air_conditioner", + recipe = { + { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, + { "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:air_conditioner", + recipe = { + { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:ceiling_fan", + recipe = { + { "basic_materials:motor" }, + { "homedecor:fan_blades" }, + { "homedecor:glowlight_small_cube" } + } +}) + +minetest.register_craft({ + output = "homedecor:ceiling_fan", + recipe = { + { "basic_materials:motor" }, + { "homedecor:fan_blades" }, + { "homedecor:glowlight_small_cube" } + } +}) + + +minetest.register_craft( { + output = "homedecor:desk_fan", + recipe = { + {"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"}, + {"", "default:steel_ingot", ""} + }, +}) + +minetest.register_craft( { + output = "homedecor:space_heater", + recipe = { + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} + }, +}) + +minetest.register_craft( { + output = "homedecor:radiator", + recipe = { + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "basic_materials:ic", "basic_materials:heating_element", "" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } + }, +}) diff --git a/homedecor/models/homedecor_ac.obj b/homedecor_climate_control/models/homedecor_ac.obj similarity index 100% rename from homedecor/models/homedecor_ac.obj rename to homedecor_climate_control/models/homedecor_ac.obj diff --git a/homedecor/models/homedecor_desk_fan.b3d b/homedecor_climate_control/models/homedecor_desk_fan.b3d similarity index 100% rename from homedecor/models/homedecor_desk_fan.b3d rename to homedecor_climate_control/models/homedecor_desk_fan.b3d diff --git a/homedecor/models/homedecor_radiator.obj b/homedecor_climate_control/models/homedecor_radiator.obj similarity index 100% rename from homedecor/models/homedecor_radiator.obj rename to homedecor_climate_control/models/homedecor_radiator.obj diff --git a/homedecor/textures/homedecor_ac.png b/homedecor_climate_control/textures/homedecor_ac.png similarity index 100% rename from homedecor/textures/homedecor_ac.png rename to homedecor_climate_control/textures/homedecor_ac.png diff --git a/homedecor/textures/homedecor_ceiling_fan_bottom.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_bottom.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_fan_bottom.png rename to homedecor_climate_control/textures/homedecor_ceiling_fan_bottom.png diff --git a/homedecor/textures/homedecor_ceiling_fan_inv.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_inv.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_fan_inv.png rename to homedecor_climate_control/textures/homedecor_ceiling_fan_inv.png diff --git a/homedecor/textures/homedecor_ceiling_fan_sides.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_sides.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_fan_sides.png rename to homedecor_climate_control/textures/homedecor_ceiling_fan_sides.png diff --git a/homedecor/textures/homedecor_ceiling_fan_top.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_top.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_fan_top.png rename to homedecor_climate_control/textures/homedecor_ceiling_fan_top.png diff --git a/homedecor/textures/homedecor_desk_fan_body.png b/homedecor_climate_control/textures/homedecor_desk_fan_body.png similarity index 100% rename from homedecor/textures/homedecor_desk_fan_body.png rename to homedecor_climate_control/textures/homedecor_desk_fan_body.png diff --git a/homedecor/textures/homedecor_desk_fan_inv.png b/homedecor_climate_control/textures/homedecor_desk_fan_inv.png similarity index 100% rename from homedecor/textures/homedecor_desk_fan_inv.png rename to homedecor_climate_control/textures/homedecor_desk_fan_inv.png diff --git a/homedecor/models/homedecor_desk_fan_uv.png b/homedecor_climate_control/textures/homedecor_desk_fan_uv.png similarity index 100% rename from homedecor/models/homedecor_desk_fan_uv.png rename to homedecor_climate_control/textures/homedecor_desk_fan_uv.png diff --git a/homedecor/textures/homedecor_heater_back.png b/homedecor_climate_control/textures/homedecor_heater_back.png similarity index 100% rename from homedecor/textures/homedecor_heater_back.png rename to homedecor_climate_control/textures/homedecor_heater_back.png diff --git a/homedecor/textures/homedecor_heater_front.png b/homedecor_climate_control/textures/homedecor_heater_front.png similarity index 100% rename from homedecor/textures/homedecor_heater_front.png rename to homedecor_climate_control/textures/homedecor_heater_front.png diff --git a/homedecor/textures/homedecor_heater_inv.png b/homedecor_climate_control/textures/homedecor_heater_inv.png similarity index 100% rename from homedecor/textures/homedecor_heater_inv.png rename to homedecor_climate_control/textures/homedecor_heater_inv.png diff --git a/homedecor/textures/homedecor_heater_sides.png b/homedecor_climate_control/textures/homedecor_heater_sides.png similarity index 100% rename from homedecor/textures/homedecor_heater_sides.png rename to homedecor_climate_control/textures/homedecor_heater_sides.png diff --git a/homedecor/textures/homedecor_heater_tb.png b/homedecor_climate_control/textures/homedecor_heater_tb.png similarity index 100% rename from homedecor/textures/homedecor_heater_tb.png rename to homedecor_climate_control/textures/homedecor_heater_tb.png diff --git a/homedecor/textures/homedecor_radiator_controls.png b/homedecor_climate_control/textures/homedecor_radiator_controls.png similarity index 100% rename from homedecor/textures/homedecor_radiator_controls.png rename to homedecor_climate_control/textures/homedecor_radiator_controls.png diff --git a/homedecor/textures/homedecor_radiator_inv.png b/homedecor_climate_control/textures/homedecor_radiator_inv.png similarity index 100% rename from homedecor/textures/homedecor_radiator_inv.png rename to homedecor_climate_control/textures/homedecor_radiator_inv.png diff --git a/homedecor_clocks/depends.txt b/homedecor_clocks/depends.txt new file mode 100644 index 00000000..d581ebf7 --- /dev/null +++ b/homedecor_clocks/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +building_blocks? diff --git a/homedecor/clocks.lua b/homedecor_clocks/init.lua similarity index 59% rename from homedecor/clocks.lua rename to homedecor_clocks/init.lua index 71d7ecde..6bb610d7 100644 --- a/homedecor/clocks.lua +++ b/homedecor_clocks/init.lua @@ -97,5 +97,55 @@ homedecor.register("grandfather_clock", { on_rotate = screwdriver.rotate_simple }) +-- crafting + + +minetest.register_craft({ + output = "homedecor:analog_clock_plastic 2", + recipe = { + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:analog_clock_wood 2", + recipe = { + { "group:stick", "dye:black", "group:stick" }, + { "group:stick", "basic_materials:ic", "group:stick" }, + { "group:stick", "dye:black", "group:stick" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:digital_clock 2", + recipe = { + { "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:alarm_clock", + recipe = { + { "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:grandfather_clock", + recipe = { + { "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" }, + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }, + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" } + }, +}) + +-- aliases + minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock") minetest.register_alias("homedecor:grandfather_clock_top", "air") diff --git a/homedecor/models/homedecor_analog_clock.obj b/homedecor_clocks/models/homedecor_analog_clock.obj similarity index 100% rename from homedecor/models/homedecor_analog_clock.obj rename to homedecor_clocks/models/homedecor_analog_clock.obj diff --git a/homedecor/models/homedecor_grandfather_clock.obj b/homedecor_clocks/models/homedecor_grandfather_clock.obj similarity index 100% rename from homedecor/models/homedecor_grandfather_clock.obj rename to homedecor_clocks/models/homedecor_grandfather_clock.obj diff --git a/homedecor/textures/homedecor_alarm_clock_back.png b/homedecor_clocks/textures/homedecor_alarm_clock_back.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_back.png rename to homedecor_clocks/textures/homedecor_alarm_clock_back.png diff --git a/homedecor/textures/homedecor_alarm_clock_bottom.png b/homedecor_clocks/textures/homedecor_alarm_clock_bottom.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_bottom.png rename to homedecor_clocks/textures/homedecor_alarm_clock_bottom.png diff --git a/homedecor/textures/homedecor_alarm_clock_front.png b/homedecor_clocks/textures/homedecor_alarm_clock_front.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_front.png rename to homedecor_clocks/textures/homedecor_alarm_clock_front.png diff --git a/homedecor/textures/homedecor_alarm_clock_inv.png b/homedecor_clocks/textures/homedecor_alarm_clock_inv.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_inv.png rename to homedecor_clocks/textures/homedecor_alarm_clock_inv.png diff --git a/homedecor/textures/homedecor_alarm_clock_sides.png b/homedecor_clocks/textures/homedecor_alarm_clock_sides.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_sides.png rename to homedecor_clocks/textures/homedecor_alarm_clock_sides.png diff --git a/homedecor/textures/homedecor_alarm_clock_top.png b/homedecor_clocks/textures/homedecor_alarm_clock_top.png similarity index 100% rename from homedecor/textures/homedecor_alarm_clock_top.png rename to homedecor_clocks/textures/homedecor_alarm_clock_top.png diff --git a/homedecor/textures/homedecor_analog_clock_back.png b/homedecor_clocks/textures/homedecor_analog_clock_back.png similarity index 100% rename from homedecor/textures/homedecor_analog_clock_back.png rename to homedecor_clocks/textures/homedecor_analog_clock_back.png diff --git a/homedecor/textures/homedecor_analog_clock_face.png b/homedecor_clocks/textures/homedecor_analog_clock_face.png similarity index 100% rename from homedecor/textures/homedecor_analog_clock_face.png rename to homedecor_clocks/textures/homedecor_analog_clock_face.png diff --git a/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/homedecor_clocks/textures/homedecor_analog_clock_plastic_inv.png similarity index 100% rename from homedecor/textures/homedecor_analog_clock_plastic_inv.png rename to homedecor_clocks/textures/homedecor_analog_clock_plastic_inv.png diff --git a/homedecor/textures/homedecor_analog_clock_wood_inv.png b/homedecor_clocks/textures/homedecor_analog_clock_wood_inv.png similarity index 100% rename from homedecor/textures/homedecor_analog_clock_wood_inv.png rename to homedecor_clocks/textures/homedecor_analog_clock_wood_inv.png diff --git a/homedecor/textures/homedecor_digital_clock_back.png b/homedecor_clocks/textures/homedecor_digital_clock_back.png similarity index 100% rename from homedecor/textures/homedecor_digital_clock_back.png rename to homedecor_clocks/textures/homedecor_digital_clock_back.png diff --git a/homedecor/textures/homedecor_digital_clock_edges.png b/homedecor_clocks/textures/homedecor_digital_clock_edges.png similarity index 100% rename from homedecor/textures/homedecor_digital_clock_edges.png rename to homedecor_clocks/textures/homedecor_digital_clock_edges.png diff --git a/homedecor/textures/homedecor_digital_clock_front.png b/homedecor_clocks/textures/homedecor_digital_clock_front.png similarity index 100% rename from homedecor/textures/homedecor_digital_clock_front.png rename to homedecor_clocks/textures/homedecor_digital_clock_front.png diff --git a/homedecor/textures/homedecor_digital_clock_inv.png b/homedecor_clocks/textures/homedecor_digital_clock_inv.png similarity index 100% rename from homedecor/textures/homedecor_digital_clock_inv.png rename to homedecor_clocks/textures/homedecor_digital_clock_inv.png diff --git a/homedecor/textures/homedecor_grandfather_clock_face.png b/homedecor_clocks/textures/homedecor_grandfather_clock_face.png similarity index 100% rename from homedecor/textures/homedecor_grandfather_clock_face.png rename to homedecor_clocks/textures/homedecor_grandfather_clock_face.png diff --git a/homedecor/textures/homedecor_grandfather_clock_face_edge.png b/homedecor_clocks/textures/homedecor_grandfather_clock_face_edge.png similarity index 100% rename from homedecor/textures/homedecor_grandfather_clock_face_edge.png rename to homedecor_clocks/textures/homedecor_grandfather_clock_face_edge.png diff --git a/homedecor/textures/homedecor_grandfather_clock_inv.png b/homedecor_clocks/textures/homedecor_grandfather_clock_inv.png similarity index 100% rename from homedecor/textures/homedecor_grandfather_clock_inv.png rename to homedecor_clocks/textures/homedecor_grandfather_clock_inv.png diff --git a/homedecor_cobweb/depends.txt b/homedecor_cobweb/depends.txt new file mode 100644 index 00000000..b3703586 --- /dev/null +++ b/homedecor_cobweb/depends.txt @@ -0,0 +1,3 @@ +homedecor_common +default +homedecor_i18n diff --git a/homedecor/cobweb.lua b/homedecor_cobweb/init.lua similarity index 92% rename from homedecor/cobweb.lua rename to homedecor_cobweb/init.lua index 43b7794f..0e7e0d75 100644 --- a/homedecor/cobweb.lua +++ b/homedecor_cobweb/init.lua @@ -1,7 +1,7 @@ local S = homedecor_i18n.gettext -minetest.register_node("homedecor:cobweb_corner", { +minetest.register_node(":homedecor:cobweb_corner", { description = S("Cobweb"), drawtype = "torchlike", tiles = { "homedecor_cobweb_torchlike.png" }, @@ -25,7 +25,7 @@ minetest.register_node("homedecor:cobweb_corner", { end }) -minetest.register_node("homedecor:cobweb_centered", { +minetest.register_node(":Lhomedecor:cobweb_centered", { description = S("Cobweb"), drawtype = "nodebox", tiles = { "homedecor_cobweb.png" }, @@ -52,7 +52,7 @@ minetest.register_node("homedecor:cobweb_centered", { drop = "homedecor:cobweb_corner" }) -minetest.register_node("homedecor:cobweb_flat", { +minetest.register_node(":homedecor:cobweb_flat", { description = S("Cobweb"), drawtype = "nodebox", tiles = { "homedecor_cobweb.png" }, @@ -79,7 +79,7 @@ minetest.register_node("homedecor:cobweb_flat", { drop = "homedecor:cobweb_corner" }) -minetest.register_node("homedecor:cobweb_plantlike", { +minetest.register_node(":homedecor:cobweb_plantlike", { description = S("Cobweb"), drawtype = "plantlike", tiles = { "homedecor_cobweb_plantlike.png" }, @@ -158,13 +158,13 @@ function homedecor.rotate_cobweb(pos) end --- convert existing cobwebs +-- crafting -minetest.register_abm({ - nodenames = { "homedecor:cobweb" }, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - homedecor.rotate_cobweb(pos) - end +minetest.register_craft( { + output = "homedecor:cobweb_corner 5", + recipe = { + { "farming:string", "", "farming:string" }, + { "", "farming:string", "" }, + { "farming:string", "", "farming:string" } + }, }) diff --git a/homedecor/textures/homedecor_cobweb.png b/homedecor_cobweb/textures/homedecor_cobweb.png similarity index 100% rename from homedecor/textures/homedecor_cobweb.png rename to homedecor_cobweb/textures/homedecor_cobweb.png diff --git a/homedecor/textures/homedecor_cobweb_plantlike.png b/homedecor_cobweb/textures/homedecor_cobweb_plantlike.png similarity index 100% rename from homedecor/textures/homedecor_cobweb_plantlike.png rename to homedecor_cobweb/textures/homedecor_cobweb_plantlike.png diff --git a/homedecor/textures/homedecor_cobweb_torchlike.png b/homedecor_cobweb/textures/homedecor_cobweb_torchlike.png similarity index 100% rename from homedecor/textures/homedecor_cobweb_torchlike.png rename to homedecor_cobweb/textures/homedecor_cobweb_torchlike.png diff --git a/homedecor_common/crafts.lua b/homedecor_common/crafts.lua new file mode 100644 index 00000000..db76b7b9 --- /dev/null +++ b/homedecor_common/crafts.lua @@ -0,0 +1,73 @@ +-- crafts for common items that are used by more than one home decor component + +local S = homedecor_i18n.gettext + +-- items + +minetest.register_craftitem(":homedecor:roof_tile_terracotta", { + description = S("Terracotta Roof Tile"), + inventory_image = "homedecor_roof_tile_terracotta.png", +}) + +minetest.register_craftitem(":homedecor:drawer_small", { + description = S("Small Wooden Drawer"), + inventory_image = "homedecor_drawer_small.png", +}) + +-- cooking/fuel + +minetest.register_craft({ + type = "cooking", + output = "homedecor:roof_tile_terracotta", + recipe = "basic_materials:terracotta_base", +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:shingles_wood", + burntime = 30, +}) + + +-- crafing + +minetest.register_craft( { + output = "homedecor:shingles_terracotta", + recipe = { + { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"}, + { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"}, + }, +}) + +minetest.register_craft( { + output = "homedecor:roof_tile_terracotta 8", + recipe = { + { "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" } + } +}) + +minetest.register_craft( { + output = "homedecor:shingles_wood 12", + recipe = { + { "group:stick", "group:wood"}, + { "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft( { + output = "homedecor:shingles_wood 12", + recipe = { + { "group:wood", "group:stick"}, + { "group:stick", "group:wood"}, + }, +}) + +minetest.register_craft( { + output = "homedecor:shingles_asphalt 6", + recipe = { + { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" }, + { "group:sand", "dye:black", "group:sand" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + }, +}) + diff --git a/homedecor_common/depends.txt b/homedecor_common/depends.txt new file mode 100644 index 00000000..b01e59f1 --- /dev/null +++ b/homedecor_common/depends.txt @@ -0,0 +1,4 @@ +default +homedecor_i18n +creative +building_blocks? diff --git a/homedecor/handlers/expansion.lua b/homedecor_common/expansion.lua similarity index 100% rename from homedecor/handlers/expansion.lua rename to homedecor_common/expansion.lua diff --git a/homedecor/handlers/furnaces.lua b/homedecor_common/furnaces.lua similarity index 100% rename from homedecor/handlers/furnaces.lua rename to homedecor_common/furnaces.lua diff --git a/homedecor/init.lua b/homedecor_common/init.lua similarity index 54% rename from homedecor/init.lua rename to homedecor_common/init.lua index 7d93e98a..13392d8e 100644 --- a/homedecor/init.lua +++ b/homedecor_common/init.lua @@ -1,13 +1,7 @@ --- Home Decor mod by VanessaE --- --- Mostly my own code, with bits and pieces lifted from Minetest's default --- 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 --- copies of the code for chests and furnaces. +-- Home Decor API/functions, and common textures and models +-- by VanessaE -local modpath = minetest.get_modpath("homedecor") +local modpath = minetest.get_modpath("homedecor_common") local S = homedecor_i18n.gettext @@ -70,54 +64,16 @@ homedecor.color_dark_grey = 0xff606060 homedecor.color_med_grey = 0xffa0a0a0 -- load different handler subsystems -dofile(modpath.."/handlers/init.lua") - --- load various other components -dofile(modpath.."/misc-nodes.lua") -- the catch-all for all misc nodes -dofile(modpath.."/tables.lua") -dofile(modpath.."/electronics.lua") -dofile(modpath.."/shutters.lua") - -dofile(modpath.."/roofing.lua") - -dofile(modpath.."/foyer.lua") - -dofile(modpath.."/doors_and_gates.lua") - -dofile(modpath.."/fences.lua") - -dofile(modpath.."/lighting.lua") - -dofile(modpath.."/kitchen_appliances.lua") -dofile(modpath.."/kitchen_furniture.lua") -dofile(modpath.."/gastronomy.lua") - -dofile(modpath.."/bathroom_furniture.lua") -dofile(modpath.."/bathroom_sanitation.lua") - -dofile(modpath.."/bedroom.lua") - -dofile(modpath.."/laundry.lua") - -dofile(modpath.."/office.lua") - -dofile(modpath.."/clocks.lua") -dofile(modpath.."/electrics.lua") - -dofile(modpath.."/window_treatments.lua") - -dofile(modpath.."/furniture.lua") -dofile(modpath.."/furniture_medieval.lua") -dofile(modpath.."/furniture_recipes.lua") -dofile(modpath.."/climate-control.lua") - -dofile(modpath.."/cobweb.lua") -dofile(modpath.."/books.lua") -dofile(modpath.."/exterior.lua") -dofile(modpath.."/trash_cans.lua") - +dofile(modpath.."/nodeboxes.lua") +dofile(modpath.."/expansion.lua") +dofile(modpath.."/furnaces.lua") +dofile(modpath.."/inventory.lua") +dofile(modpath.."/registration.lua") +dofile(modpath.."/water_particles.lua") +dofile(modpath.."/mt_game_beds_functions.lua") +dofile(modpath.."/sit.lua") dofile(modpath.."/crafts.lua") if minetest.settings:get_bool("log_mod") then - minetest.log("action", "[HomeDecor] " .. S("Loaded!")) + minetest.log("action", "[HomeDecor API] " .. S("Loaded!")) end diff --git a/homedecor/handlers/inventory.lua b/homedecor_common/inventory.lua similarity index 100% rename from homedecor/handlers/inventory.lua rename to homedecor_common/inventory.lua diff --git a/homedecor/models/homedecor_cube.obj b/homedecor_common/models/homedecor_cube.obj similarity index 100% rename from homedecor/models/homedecor_cube.obj rename to homedecor_common/models/homedecor_cube.obj diff --git a/homedecor/models/homedecor_slope.obj b/homedecor_common/models/homedecor_slope.obj similarity index 100% rename from homedecor/models/homedecor_slope.obj rename to homedecor_common/models/homedecor_slope.obj diff --git a/homedecor/models/homedecor_slope_inner_corner.obj b/homedecor_common/models/homedecor_slope_inner_corner.obj similarity index 100% rename from homedecor/models/homedecor_slope_inner_corner.obj rename to homedecor_common/models/homedecor_slope_inner_corner.obj diff --git a/homedecor/models/homedecor_slope_outer_corner.obj b/homedecor_common/models/homedecor_slope_outer_corner.obj similarity index 100% rename from homedecor/models/homedecor_slope_outer_corner.obj rename to homedecor_common/models/homedecor_slope_outer_corner.obj diff --git a/homedecor/handlers/mt_game_beds_functions.lua b/homedecor_common/mt_game_beds_functions.lua similarity index 100% rename from homedecor/handlers/mt_game_beds_functions.lua rename to homedecor_common/mt_game_beds_functions.lua diff --git a/homedecor/handlers/nodeboxes.lua b/homedecor_common/nodeboxes.lua similarity index 100% rename from homedecor/handlers/nodeboxes.lua rename to homedecor_common/nodeboxes.lua diff --git a/homedecor/handlers/registration.lua b/homedecor_common/registration.lua similarity index 98% rename from homedecor/handlers/registration.lua rename to homedecor_common/registration.lua index 8c20558f..f2d9bff7 100644 --- a/homedecor/handlers/registration.lua +++ b/homedecor_common/registration.lua @@ -91,5 +91,5 @@ function homedecor.register(name, original_def) end -- register the actual minetest node - minetest.register_node("homedecor:" .. name, def) + minetest.register_node(":homedecor:" .. name, def) end diff --git a/homedecor/handlers/sit.lua b/homedecor_common/sit.lua similarity index 100% rename from homedecor/handlers/sit.lua rename to homedecor_common/sit.lua diff --git a/homedecor/textures/homedecor_blanktile.png b/homedecor_common/textures/homedecor_blanktile.png similarity index 100% rename from homedecor/textures/homedecor_blanktile.png rename to homedecor_common/textures/homedecor_blanktile.png diff --git a/homedecor/textures/homedecor_drawer_small.png b/homedecor_common/textures/homedecor_drawer_small.png similarity index 100% rename from homedecor/textures/homedecor_drawer_small.png rename to homedecor_common/textures/homedecor_drawer_small.png diff --git a/homedecor/textures/homedecor_generic_metal.png b/homedecor_common/textures/homedecor_generic_metal.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal.png rename to homedecor_common/textures/homedecor_generic_metal.png diff --git a/homedecor/textures/homedecor_generic_metal_brass.png b/homedecor_common/textures/homedecor_generic_metal_brass.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_brass.png rename to homedecor_common/textures/homedecor_generic_metal_brass.png diff --git a/homedecor/textures/homedecor_generic_metal_bright.png b/homedecor_common/textures/homedecor_generic_metal_bright.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_bright.png rename to homedecor_common/textures/homedecor_generic_metal_bright.png diff --git a/homedecor/textures/homedecor_generic_metal_gold.png b/homedecor_common/textures/homedecor_generic_metal_gold.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_gold.png rename to homedecor_common/textures/homedecor_generic_metal_gold.png diff --git a/homedecor/textures/homedecor_generic_metal_gold2.png b/homedecor_common/textures/homedecor_generic_metal_gold2.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_gold2.png rename to homedecor_common/textures/homedecor_generic_metal_gold2.png diff --git a/homedecor/textures/homedecor_generic_metal_lines_overlay.png b/homedecor_common/textures/homedecor_generic_metal_lines_overlay.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_lines_overlay.png rename to homedecor_common/textures/homedecor_generic_metal_lines_overlay.png diff --git a/homedecor/textures/homedecor_generic_metal_wrought_iron.png b/homedecor_common/textures/homedecor_generic_metal_wrought_iron.png similarity index 100% rename from homedecor/textures/homedecor_generic_metal_wrought_iron.png rename to homedecor_common/textures/homedecor_generic_metal_wrought_iron.png diff --git a/homedecor/textures/homedecor_generic_plastic.png b/homedecor_common/textures/homedecor_generic_plastic.png similarity index 100% rename from homedecor/textures/homedecor_generic_plastic.png rename to homedecor_common/textures/homedecor_generic_plastic.png diff --git a/homedecor/textures/homedecor_generic_quilted_paper.png b/homedecor_common/textures/homedecor_generic_quilted_paper.png similarity index 100% rename from homedecor/textures/homedecor_generic_quilted_paper.png rename to homedecor_common/textures/homedecor_generic_quilted_paper.png diff --git a/homedecor/textures/homedecor_generic_terrycloth.png b/homedecor_common/textures/homedecor_generic_terrycloth.png similarity index 100% rename from homedecor/textures/homedecor_generic_terrycloth.png rename to homedecor_common/textures/homedecor_generic_terrycloth.png diff --git a/homedecor/textures/homedecor_generic_wood_luxury.png b/homedecor_common/textures/homedecor_generic_wood_luxury.png similarity index 100% rename from homedecor/textures/homedecor_generic_wood_luxury.png rename to homedecor_common/textures/homedecor_generic_wood_luxury.png diff --git a/homedecor/textures/homedecor_generic_wood_old.png b/homedecor_common/textures/homedecor_generic_wood_old.png similarity index 100% rename from homedecor/textures/homedecor_generic_wood_old.png rename to homedecor_common/textures/homedecor_generic_wood_old.png diff --git a/homedecor/textures/homedecor_generic_wood_plain.png b/homedecor_common/textures/homedecor_generic_wood_plain.png similarity index 100% rename from homedecor/textures/homedecor_generic_wood_plain.png rename to homedecor_common/textures/homedecor_generic_wood_plain.png diff --git a/homedecor/textures/homedecor_generic_wood_red.png b/homedecor_common/textures/homedecor_generic_wood_red.png similarity index 100% rename from homedecor/textures/homedecor_generic_wood_red.png rename to homedecor_common/textures/homedecor_generic_wood_red.png diff --git a/homedecor/textures/homedecor_light.png b/homedecor_common/textures/homedecor_light.png similarity index 100% rename from homedecor/textures/homedecor_light.png rename to homedecor_common/textures/homedecor_light.png diff --git a/homedecor/textures/homedecor_polished_copper.png b/homedecor_common/textures/homedecor_polished_copper.png similarity index 100% rename from homedecor/textures/homedecor_polished_copper.png rename to homedecor_common/textures/homedecor_polished_copper.png diff --git a/homedecor/textures/homedecor_roof_tile_terracotta.png b/homedecor_common/textures/homedecor_roof_tile_terracotta.png similarity index 100% rename from homedecor/textures/homedecor_roof_tile_terracotta.png rename to homedecor_common/textures/homedecor_roof_tile_terracotta.png diff --git a/homedecor/textures/homedecor_shingles_asphalt.png b/homedecor_common/textures/homedecor_shingles_asphalt.png similarity index 100% rename from homedecor/textures/homedecor_shingles_asphalt.png rename to homedecor_common/textures/homedecor_shingles_asphalt.png diff --git a/homedecor/textures/homedecor_shingles_terracotta.png b/homedecor_common/textures/homedecor_shingles_terracotta.png similarity index 100% rename from homedecor/textures/homedecor_shingles_terracotta.png rename to homedecor_common/textures/homedecor_shingles_terracotta.png diff --git a/homedecor/textures/homedecor_shingles_terracotta_inv.png b/homedecor_common/textures/homedecor_shingles_terracotta_inv.png similarity index 100% rename from homedecor/textures/homedecor_shingles_terracotta_inv.png rename to homedecor_common/textures/homedecor_shingles_terracotta_inv.png diff --git a/homedecor/textures/homedecor_shingles_wood.png b/homedecor_common/textures/homedecor_shingles_wood.png similarity index 100% rename from homedecor/textures/homedecor_shingles_wood.png rename to homedecor_common/textures/homedecor_shingles_wood.png diff --git a/homedecor/textures/homedecor_water_particle.png b/homedecor_common/textures/homedecor_water_particle.png similarity index 100% rename from homedecor/textures/homedecor_water_particle.png rename to homedecor_common/textures/homedecor_water_particle.png diff --git a/homedecor/handlers/water_particles.lua b/homedecor_common/water_particles.lua similarity index 100% rename from homedecor/handlers/water_particles.lua rename to homedecor_common/water_particles.lua diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt new file mode 100644 index 00000000..f111618f --- /dev/null +++ b/homedecor_doors_and_gates/depends.txt @@ -0,0 +1,7 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +doors +mesecons? diff --git a/homedecor/doors_and_gates.lua b/homedecor_doors_and_gates/init.lua similarity index 78% rename from homedecor/doors_and_gates.lua rename to homedecor_doors_and_gates/init.lua index afcc7ffc..5a76bf99 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor_doors_and_gates/init.lua @@ -224,7 +224,7 @@ for i, side in ipairs(sides) do groups = {snappy = 3, not_in_creative_inventory = 1} end - minetest.register_node("homedecor:door_"..doorname.."_"..side, { + minetest.register_node(":homedecor:door_"..doorname.."_"..side, { description = S(door_model.description, S(side)), drawtype = "mesh", mesh = mesh, @@ -411,7 +411,7 @@ for i, g in ipairs(gate_list) do -- gates when placed default to closed, closed. - minetest.register_node("homedecor:gate_"..gate.."_closed", def) + minetest.register_node(":homedecor:gate_"..gate.."_closed", def) -- this is either a terrible idea or a great one def = table.copy(def) @@ -436,7 +436,7 @@ for i, g in ipairs(gate_list) do action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end } - minetest.register_node("homedecor:gate_"..gate.."_open", def) + minetest.register_node(":homedecor:gate_"..gate.."_open", def) end minetest.register_alias("homedecor:fence_barbed_wire_gate_open", "homedecor:gate_barbed_wire_open") @@ -533,7 +533,7 @@ local jp_cbox = { fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, } -minetest.register_node("homedecor:japanese_wall_top", { +minetest.register_node(":homedecor:japanese_wall_top", { description = S("Japanese wall (top)"), drawtype = "mesh", mesh = "homedecor_wall_japanese_top.obj", @@ -549,7 +549,7 @@ minetest.register_node("homedecor:japanese_wall_top", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("homedecor:japanese_wall_middle", { +minetest.register_node(":homedecor:japanese_wall_middle", { description = S("Japanese wall"), drawtype = "mesh", mesh = "homedecor_wall_japanese_middle.obj", @@ -565,7 +565,7 @@ minetest.register_node("homedecor:japanese_wall_middle", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("homedecor:japanese_wall_bottom", { +minetest.register_node(":homedecor:japanese_wall_bottom", { description = S("Japanese wall (bottom)"), drawtype = "mesh", mesh = "homedecor_wall_japanese_bottom.obj", @@ -581,27 +581,6 @@ minetest.register_node("homedecor:japanese_wall_bottom", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("homedecor:tatami_mat", { - tiles = { - "homedecor_tatami.png", - "homedecor_tatami.png", - "homedecor_tatami.png", - "homedecor_tatami.png", - "homedecor_tatami.png", - "homedecor_tatami.png" - }, - description = S("Japanese tatami"), - drawtype = "nodebox", - paramtype = "light", - groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}, - } - } -}) - homedecor.register("door_japanese_closed", { description = S("Japanese-style door"), inventory_image = "homedecor_door_japanese_inv.png", @@ -652,6 +631,246 @@ homedecor.register("door_japanese_open", { drop = "homedecor:door_japanese_closed", }) +-- crafting + +-- Gates + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_picket_white_closed", + recipe = { + "homedecor:fence_picket_white" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket_white", + recipe = { + "homedecor:gate_picket_white_closed" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_picket_closed", + recipe = { + "homedecor:fence_picket" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket", + recipe = { + "homedecor:gate_picket_closed" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_barbed_wire_closed", + recipe = { + "homedecor:fence_barbed_wire" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_barbed_wire", + recipe = { + "homedecor:gate_barbed_wire_closed" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_chainlink_closed", + recipe = { + "homedecor:fence_chainlink" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_chainlink", + recipe = { + "homedecor:gate_chainlink_closed" + }, +}) + +------ Doors + +-- plain wood, non-windowed + +minetest.register_craft( { + output = "homedecor:door_wood_plain_left 2", + recipe = { + { "group:wood", "group:wood", "" }, + { "group:wood", "group:wood", "default:steel_ingot" }, + { "group:wood", "group:wood", "" }, + }, +}) + +-- fancy exterior + +minetest.register_craft( { + output = "homedecor:door_exterior_fancy_left 2", + recipe = { + { "group:wood", "default:glass" }, + { "group:wood", "group:wood" }, + { "group:wood", "group:wood" }, + }, +}) + +-- wood and glass (grid style) + +-- bare + +minetest.register_craft( { + output = "homedecor:door_wood_glass_oak_left 2", + recipe = { + { "default:glass", "group:wood" }, + { "group:wood", "default:glass" }, + { "default:glass", "group:wood" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:door_wood_glass_oak_left 2", + recipe = { + { "group:wood", "default:glass" }, + { "default:glass", "group:wood" }, + { "group:wood", "default:glass" }, + }, +}) + +-- mahogany + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:door_wood_glass_mahogany_left 2", + recipe = { + "default:dirt", + "default:coal_lump", + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:door_wood_glass_mahogany_left 2", + recipe = { + "dye:brown", + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" + }, +}) + +-- white + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:door_wood_glass_white_left 2", + recipe = { + "dye:white", + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" + }, +}) + +-- Closet doors + +-- oak + +minetest.register_craft( { + output = "homedecor:door_closet_oak_left 2", + recipe = { + { "", "group:stick", "group:stick" }, + { "default:steel_ingot", "group:stick", "group:stick" }, + { "", "group:stick", "group:stick" }, + }, +}) + +-- mahogany + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:door_closet_mahogany_left 2", + recipe = { + "homedecor:door_closet_oak_left", + "homedecor:door_closet_oak_left", + "default:dirt", + "default:coal_lump", + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:door_closet_mahogany_left 2", + recipe = { + "homedecor:door_closet_oak_left", + "homedecor:door_closet_oak_left", + "dye:brown" + }, +}) + +-- wrought fence-like door + +minetest.register_craft( { + output = "homedecor:door_wrought_iron_left 2", + recipe = { + { "homedecor:pole_wrought_iron", "default:iron_lump" }, + { "homedecor:pole_wrought_iron", "default:iron_lump" }, + { "homedecor:pole_wrought_iron", "default:iron_lump" } + }, +}) + +-- bedroom door + +minetest.register_craft( { + output = "homedecor:door_bedroom_left", + recipe = { + { "dye:white", "dye:white", "" }, + { "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" }, + { "", "", "" }, + }, +}) + +-- woodglass door + +minetest.register_craft( { + output = "homedecor:door_woodglass_left", + recipe = { + { "group:wood", "default:glass", "" }, + { "group:wood", "default:glass", "basic_materials:brass_ingot" }, + { "group:wood", "group:wood", "" }, + }, +}) + +-- woodglass door type 2 + +minetest.register_craft( { + output = "homedecor:door_woodglass2_left", + recipe = { + { "default:glass", "default:glass", "" }, + { "group:wood", "group:wood", "default:iron_lump" }, + { "group:wood", "group:wood", "" }, + }, +}) + + +minetest.register_craft({ + output = "homedecor:door_japanese_closed", + recipe = { + { "homedecor:japanese_wall_top" }, + { "homedecor:japanese_wall_bottom" } + }, +}) + +-- aliases + minetest.register_alias("homedecor:jpn_door_top", "air") minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed") diff --git a/homedecor/models/homedecor_door_closet.obj b/homedecor_doors_and_gates/models/homedecor_door_closet.obj similarity index 100% rename from homedecor/models/homedecor_door_closet.obj rename to homedecor_doors_and_gates/models/homedecor_door_closet.obj diff --git a/homedecor/models/homedecor_door_closet_right.obj b/homedecor_doors_and_gates/models/homedecor_door_closet_right.obj similarity index 100% rename from homedecor/models/homedecor_door_closet_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_closet_right.obj diff --git a/homedecor/models/homedecor_door_fancy.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy.obj similarity index 100% rename from homedecor/models/homedecor_door_fancy.obj rename to homedecor_doors_and_gates/models/homedecor_door_fancy.obj diff --git a/homedecor/models/homedecor_door_fancy_right.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy_right.obj similarity index 100% rename from homedecor/models/homedecor_door_fancy_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_fancy_right.obj diff --git a/homedecor/models/homedecor_door_japanese_closed.obj b/homedecor_doors_and_gates/models/homedecor_door_japanese_closed.obj similarity index 100% rename from homedecor/models/homedecor_door_japanese_closed.obj rename to homedecor_doors_and_gates/models/homedecor_door_japanese_closed.obj diff --git a/homedecor/models/homedecor_door_japanese_open.obj b/homedecor_doors_and_gates/models/homedecor_door_japanese_open.obj similarity index 100% rename from homedecor/models/homedecor_door_japanese_open.obj rename to homedecor_doors_and_gates/models/homedecor_door_japanese_open.obj diff --git a/homedecor/models/homedecor_door_plain.obj b/homedecor_doors_and_gates/models/homedecor_door_plain.obj similarity index 100% rename from homedecor/models/homedecor_door_plain.obj rename to homedecor_doors_and_gates/models/homedecor_door_plain.obj diff --git a/homedecor/models/homedecor_door_plain_right.obj b/homedecor_doors_and_gates/models/homedecor_door_plain_right.obj similarity index 100% rename from homedecor/models/homedecor_door_plain_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_plain_right.obj diff --git a/homedecor/models/homedecor_door_wood_glass.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass.obj similarity index 100% rename from homedecor/models/homedecor_door_wood_glass.obj rename to homedecor_doors_and_gates/models/homedecor_door_wood_glass.obj diff --git a/homedecor/models/homedecor_door_wood_glass_right.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass_right.obj similarity index 100% rename from homedecor/models/homedecor_door_wood_glass_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_wood_glass_right.obj diff --git a/homedecor/models/homedecor_door_woodglass_typea.obj b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea.obj similarity index 100% rename from homedecor/models/homedecor_door_woodglass_typea.obj rename to homedecor_doors_and_gates/models/homedecor_door_woodglass_typea.obj diff --git a/homedecor/models/homedecor_door_woodglass_typea_right.obj b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea_right.obj similarity index 100% rename from homedecor/models/homedecor_door_woodglass_typea_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_woodglass_typea_right.obj diff --git a/homedecor/models/homedecor_door_wrought_iron.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron.obj similarity index 100% rename from homedecor/models/homedecor_door_wrought_iron.obj rename to homedecor_doors_and_gates/models/homedecor_door_wrought_iron.obj diff --git a/homedecor/models/homedecor_door_wrought_iron_right.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron_right.obj similarity index 100% rename from homedecor/models/homedecor_door_wrought_iron_right.obj rename to homedecor_doors_and_gates/models/homedecor_door_wrought_iron_right.obj diff --git a/homedecor/models/homedecor_wall_japanese_bottom.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj similarity index 100% rename from homedecor/models/homedecor_wall_japanese_bottom.obj rename to homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj diff --git a/homedecor/models/homedecor_wall_japanese_middle.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj similarity index 100% rename from homedecor/models/homedecor_wall_japanese_middle.obj rename to homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj diff --git a/homedecor/models/homedecor_wall_japanese_top.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj similarity index 100% rename from homedecor/models/homedecor_wall_japanese_top.obj rename to homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj diff --git a/homedecor/textures/homedecor_door_bedroom.png b/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png similarity index 100% rename from homedecor/textures/homedecor_door_bedroom.png rename to homedecor_doors_and_gates/textures/homedecor_door_bedroom.png diff --git a/homedecor/textures/homedecor_door_bedroom_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_bedroom_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png diff --git a/homedecor/textures/homedecor_door_closet_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png similarity index 100% rename from homedecor/textures/homedecor_door_closet_mahogany.png rename to homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png diff --git a/homedecor/textures/homedecor_door_closet_mahogany_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_closet_mahogany_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany_inv.png diff --git a/homedecor/textures/homedecor_door_closet_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png similarity index 100% rename from homedecor/textures/homedecor_door_closet_oak.png rename to homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png diff --git a/homedecor/textures/homedecor_door_closet_oak_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_closet_oak_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_closet_oak_inv.png diff --git a/homedecor/textures/homedecor_door_exterior_fancy.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png similarity index 100% rename from homedecor/textures/homedecor_door_exterior_fancy.png rename to homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png diff --git a/homedecor/textures/homedecor_door_exterior_fancy_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png similarity index 100% rename from homedecor/textures/homedecor_door_exterior_fancy_insert.png rename to homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png diff --git a/homedecor/textures/homedecor_door_exterior_fancy_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_exterior_fancy_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_inv.png diff --git a/homedecor/textures/homedecor_door_glass.png b/homedecor_doors_and_gates/textures/homedecor_door_glass.png similarity index 100% rename from homedecor/textures/homedecor_door_glass.png rename to homedecor_doors_and_gates/textures/homedecor_door_glass.png diff --git a/homedecor/textures/homedecor_door_glass_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_glass_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_glass_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_glass_inv.png diff --git a/homedecor/textures/homedecor_door_japanese_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_japanese_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_japanese_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_japanese_inv.png diff --git a/homedecor/textures/homedecor_door_wood_glass_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_insert.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png diff --git a/homedecor/textures/homedecor_door_wood_glass_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_mahogany.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png diff --git a/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png diff --git a/homedecor/textures/homedecor_door_wood_glass_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_oak.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png diff --git a/homedecor/textures/homedecor_door_wood_glass_oak_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_oak_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png diff --git a/homedecor/textures/homedecor_door_wood_glass_white.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_white.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png diff --git a/homedecor/textures/homedecor_door_wood_glass_white_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_glass_white_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png diff --git a/homedecor/textures/homedecor_door_wood_plain.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_plain.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png diff --git a/homedecor/textures/homedecor_door_wood_plain_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_wood_plain_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_wood_plain_inv.png diff --git a/homedecor/textures/homedecor_door_woodglass2.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png similarity index 100% rename from homedecor/textures/homedecor_door_woodglass2.png rename to homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png diff --git a/homedecor/textures/homedecor_door_woodglass2_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_woodglass2_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png diff --git a/homedecor/textures/homedecor_door_woodglass_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_woodglass_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_woodglass_inv.png diff --git a/homedecor/textures/homedecor_door_woodglass_typea.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png similarity index 100% rename from homedecor/textures/homedecor_door_woodglass_typea.png rename to homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png diff --git a/homedecor/textures/homedecor_door_woodglass_typea_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png similarity index 100% rename from homedecor/textures/homedecor_door_woodglass_typea_insert.png rename to homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png diff --git a/homedecor/textures/homedecor_door_wrought_iron.png b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png similarity index 100% rename from homedecor/textures/homedecor_door_wrought_iron.png rename to homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png diff --git a/homedecor/textures/homedecor_door_wrought_iron_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/homedecor_door_wrought_iron_inv.png rename to homedecor_doors_and_gates/textures/homedecor_door_wrought_iron_inv.png diff --git a/homedecor/textures/homedecor_gate_barbed_wire_edges.png b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_edges.png similarity index 100% rename from homedecor/textures/homedecor_gate_barbed_wire_edges.png rename to homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_edges.png diff --git a/homedecor/textures/homedecor_gate_barbed_wire_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_fb.png similarity index 100% rename from homedecor/textures/homedecor_gate_barbed_wire_fb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_fb.png diff --git a/homedecor/textures/homedecor_gate_chainlink_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_fb.png similarity index 100% rename from homedecor/textures/homedecor_gate_chainlink_fb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_chainlink_fb.png diff --git a/homedecor/textures/homedecor_gate_chainlink_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_lr.png similarity index 100% rename from homedecor/textures/homedecor_gate_chainlink_lr.png rename to homedecor_doors_and_gates/textures/homedecor_gate_chainlink_lr.png diff --git a/homedecor/textures/homedecor_gate_chainlink_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_tb.png similarity index 100% rename from homedecor/textures/homedecor_gate_chainlink_tb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_chainlink_tb.png diff --git a/homedecor/textures/homedecor_gate_half_door_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_fb.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_fb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_fb.png diff --git a/homedecor/textures/homedecor_gate_half_door_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_lr.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_lr.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_lr.png diff --git a/homedecor/textures/homedecor_gate_half_door_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_tb.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_tb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_tb.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_fb.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_white_fb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_fb.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_lr.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_white_lr.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_lr.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_tb.png similarity index 100% rename from homedecor/textures/homedecor_gate_half_door_white_tb.png rename to homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_tb.png diff --git a/homedecor/textures/homedecor_gate_picket_back.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_back.png similarity index 100% rename from homedecor/textures/homedecor_gate_picket_back.png rename to homedecor_doors_and_gates/textures/homedecor_gate_picket_back.png diff --git a/homedecor/textures/homedecor_gate_picket_front.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_front.png similarity index 100% rename from homedecor/textures/homedecor_gate_picket_front.png rename to homedecor_doors_and_gates/textures/homedecor_gate_picket_front.png diff --git a/homedecor/textures/homedecor_gate_picket_white_back.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_back.png similarity index 100% rename from homedecor/textures/homedecor_gate_picket_white_back.png rename to homedecor_doors_and_gates/textures/homedecor_gate_picket_white_back.png diff --git a/homedecor/textures/homedecor_gate_picket_white_front.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_front.png similarity index 100% rename from homedecor/textures/homedecor_gate_picket_white_front.png rename to homedecor_doors_and_gates/textures/homedecor_gate_picket_white_front.png diff --git a/homedecor/textures/homedecor_japanese_paper.png b/homedecor_doors_and_gates/textures/homedecor_japanese_paper.png similarity index 100% rename from homedecor/textures/homedecor_japanese_paper.png rename to homedecor_doors_and_gates/textures/homedecor_japanese_paper.png diff --git a/homedecor/textures/homedecor_jpn_door_inv.png b/homedecor_doors_and_gates/textures/homedecor_jpn_door_inv.png similarity index 100% rename from homedecor/textures/homedecor_jpn_door_inv.png rename to homedecor_doors_and_gates/textures/homedecor_jpn_door_inv.png diff --git a/homedecor_electrical/depends.txt b/homedecor_electrical/depends.txt new file mode 100644 index 00000000..be47402e --- /dev/null +++ b/homedecor_electrical/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +basic_materials +homedecor_i18n diff --git a/homedecor/electrics.lua b/homedecor_electrical/init.lua similarity index 68% rename from homedecor/electrics.lua rename to homedecor_electrical/init.lua index c5f27a65..ae4dd8c0 100644 --- a/homedecor/electrics.lua +++ b/homedecor_electrical/init.lua @@ -79,3 +79,30 @@ homedecor.register("doorbell", { }) end }) + +-- crafting + +minetest.register_craft( { + output = "homedecor:power_outlet", + recipe = { + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", ""}, + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"} + }, +}) + +minetest.register_craft( { + output = "homedecor:light_switch", + recipe = { + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"} + }, +}) + +minetest.register_craft( { + output = "homedecor:doorbell", + recipe = { + { "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" } + }, +}) diff --git a/homedecor/sounds/homedecor_doorbell.ogg b/homedecor_electrical/sounds/homedecor_doorbell.ogg similarity index 100% rename from homedecor/sounds/homedecor_doorbell.ogg rename to homedecor_electrical/sounds/homedecor_doorbell.ogg diff --git a/homedecor/textures/homedecor_doorbell.png b/homedecor_electrical/textures/homedecor_doorbell.png similarity index 100% rename from homedecor/textures/homedecor_doorbell.png rename to homedecor_electrical/textures/homedecor_doorbell.png diff --git a/homedecor/textures/homedecor_doorbell_inv.png b/homedecor_electrical/textures/homedecor_doorbell_inv.png similarity index 100% rename from homedecor/textures/homedecor_doorbell_inv.png rename to homedecor_electrical/textures/homedecor_doorbell_inv.png diff --git a/homedecor/textures/homedecor_light_switch_back.png b/homedecor_electrical/textures/homedecor_light_switch_back.png similarity index 100% rename from homedecor/textures/homedecor_light_switch_back.png rename to homedecor_electrical/textures/homedecor_light_switch_back.png diff --git a/homedecor/textures/homedecor_light_switch_edges.png b/homedecor_electrical/textures/homedecor_light_switch_edges.png similarity index 100% rename from homedecor/textures/homedecor_light_switch_edges.png rename to homedecor_electrical/textures/homedecor_light_switch_edges.png diff --git a/homedecor/textures/homedecor_light_switch_front.png b/homedecor_electrical/textures/homedecor_light_switch_front.png similarity index 100% rename from homedecor/textures/homedecor_light_switch_front.png rename to homedecor_electrical/textures/homedecor_light_switch_front.png diff --git a/homedecor/textures/homedecor_light_switch_inv.png b/homedecor_electrical/textures/homedecor_light_switch_inv.png similarity index 100% rename from homedecor/textures/homedecor_light_switch_inv.png rename to homedecor_electrical/textures/homedecor_light_switch_inv.png diff --git a/homedecor/textures/homedecor_outlet_back.png b/homedecor_electrical/textures/homedecor_outlet_back.png similarity index 100% rename from homedecor/textures/homedecor_outlet_back.png rename to homedecor_electrical/textures/homedecor_outlet_back.png diff --git a/homedecor/textures/homedecor_outlet_edges.png b/homedecor_electrical/textures/homedecor_outlet_edges.png similarity index 100% rename from homedecor/textures/homedecor_outlet_edges.png rename to homedecor_electrical/textures/homedecor_outlet_edges.png diff --git a/homedecor/textures/homedecor_outlet_inv.png b/homedecor_electrical/textures/homedecor_outlet_inv.png similarity index 100% rename from homedecor/textures/homedecor_outlet_inv.png rename to homedecor_electrical/textures/homedecor_outlet_inv.png diff --git a/homedecor_electronics/depends.txt b/homedecor_electronics/depends.txt new file mode 100644 index 00000000..54783361 --- /dev/null +++ b/homedecor_electronics/depends.txt @@ -0,0 +1,5 @@ +homedecor_common +default +basic_materials +homedecor_i18n +moreblocks? diff --git a/homedecor_electronics/init.lua b/homedecor_electronics/init.lua new file mode 100644 index 00000000..5843f034 --- /dev/null +++ b/homedecor_electronics/init.lua @@ -0,0 +1,301 @@ +-- Various home electronics + +local S = homedecor_i18n.gettext + +homedecor.register("speaker", { + description = S("Large Stereo Speaker"), + mesh="homedecor_speaker_large.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_front.png" + }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) + end +}) + +homedecor.register("speaker_open", { + description = S("Large Stereo Speaker, open front"), + mesh="homedecor_speaker_large_open.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_driver.png", + "homedecor_speaker_open_front.png", + { name = "homedecor_generic_metal.png", color = homedecor.color_black } + }, + groups = { snappy = 3, not_in_creative_inventory=1 }, + sounds = default.node_sound_wood_defaults(), + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) + end +}) + +local spk_cbox = { + type = "fixed", + fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 } +} + +homedecor.register("speaker_small", { + description = S("Small Surround Speaker"), + mesh="homedecor_speaker_small.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_front.png" + }, + selection_box = spk_cbox, + walkable = false, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), +}) + +homedecor.register("stereo", { + description = S("Stereo Receiver"), + tiles = { 'homedecor_stereo_top.png', + 'homedecor_stereo_bottom.png', + 'homedecor_stereo_left.png^[transformFX', + 'homedecor_stereo_left.png', + 'homedecor_stereo_back.png', + 'homedecor_stereo_front.png'}, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), +}) + +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', + walkable = false, + groups = { snappy = 3 }, + sounds = default.node_sound_leaves_defaults(), + paramtype2 = 'wallmounted', + selection_box = { + type = "wallmounted", + --wall_side = = + }, +}) + +homedecor.register("television", { + description = S("Small CRT Television"), + tiles = { 'homedecor_television_top.png', + 'homedecor_television_bottom.png', + 'homedecor_television_left.png^[transformFX', + 'homedecor_television_left.png', + 'homedecor_television_back.png', + { name="homedecor_television_front_animated.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=80.0 + } + } + }, + light_source = default.LIGHT_MAX - 1, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), +}) + +homedecor.register("dvd_vcr", { + description = S("DVD and VCR"), + tiles = { + "homedecor_dvdvcr_top.png", + "homedecor_dvdvcr_bottom.png", + "homedecor_dvdvcr_sides.png", + "homedecor_dvdvcr_sides.png^[transformFX", + "homedecor_dvdvcr_back.png", + "homedecor_dvdvcr_front.png", + }, + inventory_image = "homedecor_dvdvcr_inv.png", + node_box = { + type = "fixed", + fixed = { + {-0.3125, -0.5, -0.25, 0.3125, -0.375, 0.1875}, + {-0.25, -0.5, -0.25, 0.25, -0.1875, 0.125}, + } + }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), +}) + +local tel_cbox = { + type = "fixed", + fixed = { -0.25, -0.5, -0.1875, 0.25, -0.21, 0.15 } +} + +homedecor.register("telephone", { + mesh = "homedecor_telephone.obj", + tiles = { + "homedecor_telephone_dial.png", + "homedecor_telephone_base.png", + "homedecor_telephone_handset.png", + "homedecor_telephone_cord.png", + }, + inventory_image = "homedecor_telephone_inv.png", + description = S("Telephone"), + groups = {snappy=3}, + selection_box = tel_cbox, + walkable = false, + sounds = default.node_sound_wood_defaults(), +}) + +-- crafting + +minetest.register_craftitem(":homedecor:vcr", { + description = S("VCR"), + inventory_image = "homedecor_vcr.png" +}) + +minetest.register_craftitem(":homedecor:dvd_player", { + description = S("DVD Player"), + inventory_image = "homedecor_dvd_player.png" +}) + +minetest.register_craftitem(":homedecor:speaker_driver", { + description = S("Speaker driver"), + inventory_image = "homedecor_speaker_driver_inv.png" +}) + +minetest.register_craft( { + output = "homedecor:projection_screen 3", + recipe = { + { "", "default:glass", "" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:projection_screen", + burntime = 30, +}) + + +minetest.register_craft( { + output = "basic_materials:ic 4", + recipe = { + { "basic_materials:silicon", "basic_materials:silicon" }, + { "basic_materials:silicon", "default:copper_ingot" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:television", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:television", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:stereo", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" }, + }, +}) + + +minetest.register_craft( { + output = "homedecor:speaker_driver 2", + recipe = { + { "", "default:steel_ingot", "" }, + { "default:paper", "basic_materials:copper_wire", "default:iron_lump" }, + { "", "default:steel_ingot", "" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:speaker_small", + recipe = { + { "wool:black", "homedecor:speaker_driver", "group:wood" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:speaker", + recipe = { + { "wool:black", "homedecor:speaker_driver", "group:wood" }, + { "wool:black", "homedecor:speaker_driver", "group:wood" }, + { "wool:black", "group:wood", "group:wood" }, + }, +}) + +-- cotton version + +minetest.register_craft( { + output = "homedecor:speaker_small", + recipe = { + { "cotton:black", "homedecor:speaker_driver", "group:wood" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:speaker", + recipe = { + { "cotton:black", "homedecor:speaker_driver", "group:wood" }, + { "cotton:black", "homedecor:speaker_driver", "group:wood" }, + { "cotton:black", "group:wood", "group:wood" }, + }, +}) + + +minetest.register_craft({ + output = "homedecor:vcr 2", + recipe = { + { "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:dvd_player 2", + recipe = { + { "", "basic_materials:plastic_sheet", "" }, + { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:dvd_player 2", + recipe = { + { "", "basic_materials:plastic_sheet", "" }, + { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:dvd_vcr", + recipe = { + "homedecor:vcr", + "homedecor:dvd_player" + }, +}) + +minetest.register_craft( { + output = "homedecor:telephone", + recipe = { + { "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + }, +}) diff --git a/homedecor/models/homedecor_speaker_large.obj b/homedecor_electronics/models/homedecor_speaker_large.obj similarity index 100% rename from homedecor/models/homedecor_speaker_large.obj rename to homedecor_electronics/models/homedecor_speaker_large.obj diff --git a/homedecor/models/homedecor_speaker_large_open.obj b/homedecor_electronics/models/homedecor_speaker_large_open.obj similarity index 100% rename from homedecor/models/homedecor_speaker_large_open.obj rename to homedecor_electronics/models/homedecor_speaker_large_open.obj diff --git a/homedecor/models/homedecor_speaker_small.obj b/homedecor_electronics/models/homedecor_speaker_small.obj similarity index 100% rename from homedecor/models/homedecor_speaker_small.obj rename to homedecor_electronics/models/homedecor_speaker_small.obj diff --git a/homedecor/models/homedecor_telephone.obj b/homedecor_electronics/models/homedecor_telephone.obj similarity index 100% rename from homedecor/models/homedecor_telephone.obj rename to homedecor_electronics/models/homedecor_telephone.obj diff --git a/homedecor/textures/homedecor_dvd_player.png b/homedecor_electronics/textures/homedecor_dvd_player.png similarity index 100% rename from homedecor/textures/homedecor_dvd_player.png rename to homedecor_electronics/textures/homedecor_dvd_player.png diff --git a/homedecor/textures/homedecor_dvdvcr_back.png b/homedecor_electronics/textures/homedecor_dvdvcr_back.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_back.png rename to homedecor_electronics/textures/homedecor_dvdvcr_back.png diff --git a/homedecor/textures/homedecor_dvdvcr_bottom.png b/homedecor_electronics/textures/homedecor_dvdvcr_bottom.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_bottom.png rename to homedecor_electronics/textures/homedecor_dvdvcr_bottom.png diff --git a/homedecor/textures/homedecor_dvdvcr_front.png b/homedecor_electronics/textures/homedecor_dvdvcr_front.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_front.png rename to homedecor_electronics/textures/homedecor_dvdvcr_front.png diff --git a/homedecor/textures/homedecor_dvdvcr_inv.png b/homedecor_electronics/textures/homedecor_dvdvcr_inv.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_inv.png rename to homedecor_electronics/textures/homedecor_dvdvcr_inv.png diff --git a/homedecor/textures/homedecor_dvdvcr_sides.png b/homedecor_electronics/textures/homedecor_dvdvcr_sides.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_sides.png rename to homedecor_electronics/textures/homedecor_dvdvcr_sides.png diff --git a/homedecor/textures/homedecor_dvdvcr_top.png b/homedecor_electronics/textures/homedecor_dvdvcr_top.png similarity index 100% rename from homedecor/textures/homedecor_dvdvcr_top.png rename to homedecor_electronics/textures/homedecor_dvdvcr_top.png diff --git a/homedecor/textures/homedecor_projection_screen.png b/homedecor_electronics/textures/homedecor_projection_screen.png similarity index 100% rename from homedecor/textures/homedecor_projection_screen.png rename to homedecor_electronics/textures/homedecor_projection_screen.png diff --git a/homedecor/textures/homedecor_projection_screen_inv.png b/homedecor_electronics/textures/homedecor_projection_screen_inv.png similarity index 100% rename from homedecor/textures/homedecor_projection_screen_inv.png rename to homedecor_electronics/textures/homedecor_projection_screen_inv.png diff --git a/homedecor/textures/homedecor_speaker_driver.png b/homedecor_electronics/textures/homedecor_speaker_driver.png similarity index 100% rename from homedecor/textures/homedecor_speaker_driver.png rename to homedecor_electronics/textures/homedecor_speaker_driver.png diff --git a/homedecor/textures/homedecor_speaker_driver_inv.png b/homedecor_electronics/textures/homedecor_speaker_driver_inv.png similarity index 100% rename from homedecor/textures/homedecor_speaker_driver_inv.png rename to homedecor_electronics/textures/homedecor_speaker_driver_inv.png diff --git a/homedecor/textures/homedecor_speaker_front.png b/homedecor_electronics/textures/homedecor_speaker_front.png similarity index 100% rename from homedecor/textures/homedecor_speaker_front.png rename to homedecor_electronics/textures/homedecor_speaker_front.png diff --git a/homedecor/textures/homedecor_speaker_open_front.png b/homedecor_electronics/textures/homedecor_speaker_open_front.png similarity index 100% rename from homedecor/textures/homedecor_speaker_open_front.png rename to homedecor_electronics/textures/homedecor_speaker_open_front.png diff --git a/homedecor/textures/homedecor_speaker_sides.png b/homedecor_electronics/textures/homedecor_speaker_sides.png similarity index 100% rename from homedecor/textures/homedecor_speaker_sides.png rename to homedecor_electronics/textures/homedecor_speaker_sides.png diff --git a/homedecor/textures/homedecor_stereo_back.png b/homedecor_electronics/textures/homedecor_stereo_back.png similarity index 100% rename from homedecor/textures/homedecor_stereo_back.png rename to homedecor_electronics/textures/homedecor_stereo_back.png diff --git a/homedecor/textures/homedecor_stereo_bottom.png b/homedecor_electronics/textures/homedecor_stereo_bottom.png similarity index 100% rename from homedecor/textures/homedecor_stereo_bottom.png rename to homedecor_electronics/textures/homedecor_stereo_bottom.png diff --git a/homedecor/textures/homedecor_stereo_front.png b/homedecor_electronics/textures/homedecor_stereo_front.png similarity index 100% rename from homedecor/textures/homedecor_stereo_front.png rename to homedecor_electronics/textures/homedecor_stereo_front.png diff --git a/homedecor/textures/homedecor_stereo_left.png b/homedecor_electronics/textures/homedecor_stereo_left.png similarity index 100% rename from homedecor/textures/homedecor_stereo_left.png rename to homedecor_electronics/textures/homedecor_stereo_left.png diff --git a/homedecor/textures/homedecor_stereo_top.png b/homedecor_electronics/textures/homedecor_stereo_top.png similarity index 100% rename from homedecor/textures/homedecor_stereo_top.png rename to homedecor_electronics/textures/homedecor_stereo_top.png diff --git a/homedecor/textures/homedecor_telephone_base.png b/homedecor_electronics/textures/homedecor_telephone_base.png similarity index 100% rename from homedecor/textures/homedecor_telephone_base.png rename to homedecor_electronics/textures/homedecor_telephone_base.png diff --git a/homedecor/textures/homedecor_telephone_cord.png b/homedecor_electronics/textures/homedecor_telephone_cord.png similarity index 100% rename from homedecor/textures/homedecor_telephone_cord.png rename to homedecor_electronics/textures/homedecor_telephone_cord.png diff --git a/homedecor/textures/homedecor_telephone_dial.png b/homedecor_electronics/textures/homedecor_telephone_dial.png similarity index 100% rename from homedecor/textures/homedecor_telephone_dial.png rename to homedecor_electronics/textures/homedecor_telephone_dial.png diff --git a/homedecor/textures/homedecor_telephone_handset.png b/homedecor_electronics/textures/homedecor_telephone_handset.png similarity index 100% rename from homedecor/textures/homedecor_telephone_handset.png rename to homedecor_electronics/textures/homedecor_telephone_handset.png diff --git a/homedecor/textures/homedecor_telephone_inv.png b/homedecor_electronics/textures/homedecor_telephone_inv.png similarity index 100% rename from homedecor/textures/homedecor_telephone_inv.png rename to homedecor_electronics/textures/homedecor_telephone_inv.png diff --git a/homedecor/textures/homedecor_television_back.png b/homedecor_electronics/textures/homedecor_television_back.png similarity index 100% rename from homedecor/textures/homedecor_television_back.png rename to homedecor_electronics/textures/homedecor_television_back.png diff --git a/homedecor/textures/homedecor_television_bottom.png b/homedecor_electronics/textures/homedecor_television_bottom.png similarity index 100% rename from homedecor/textures/homedecor_television_bottom.png rename to homedecor_electronics/textures/homedecor_television_bottom.png diff --git a/homedecor/textures/homedecor_television_front.png b/homedecor_electronics/textures/homedecor_television_front.png similarity index 100% rename from homedecor/textures/homedecor_television_front.png rename to homedecor_electronics/textures/homedecor_television_front.png diff --git a/homedecor/textures/homedecor_television_front_animated.png b/homedecor_electronics/textures/homedecor_television_front_animated.png similarity index 100% rename from homedecor/textures/homedecor_television_front_animated.png rename to homedecor_electronics/textures/homedecor_television_front_animated.png diff --git a/homedecor/textures/homedecor_television_left.png b/homedecor_electronics/textures/homedecor_television_left.png similarity index 100% rename from homedecor/textures/homedecor_television_left.png rename to homedecor_electronics/textures/homedecor_television_left.png diff --git a/homedecor/textures/homedecor_television_top.png b/homedecor_electronics/textures/homedecor_television_top.png similarity index 100% rename from homedecor/textures/homedecor_television_top.png rename to homedecor_electronics/textures/homedecor_television_top.png diff --git a/homedecor/textures/homedecor_vcr.png b/homedecor_electronics/textures/homedecor_vcr.png similarity index 100% rename from homedecor/textures/homedecor_vcr.png rename to homedecor_electronics/textures/homedecor_vcr.png diff --git a/homedecor_exterior/depends.txt b/homedecor_exterior/depends.txt new file mode 100644 index 00000000..98c73413 --- /dev/null +++ b/homedecor_exterior/depends.txt @@ -0,0 +1,8 @@ +homedecor_common +default +dye +homedecor_i18n +creative +moreblocks? +building_blocks? +bucket? diff --git a/homedecor/exterior.lua b/homedecor_exterior/init.lua similarity index 64% rename from homedecor/exterior.lua rename to homedecor_exterior/init.lua index a4e0fda6..a4bcb04f 100644 --- a/homedecor/exterior.lua +++ b/homedecor_exterior/init.lua @@ -367,7 +367,7 @@ homedecor.shrub_colors = { local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } for _, color in ipairs(homedecor.shrub_colors) do - minetest.register_node("homedecor:shrubbery_large_"..color, { + minetest.register_node(":homedecor:shrubbery_large_"..color, { description = S("Shrubbery (large, @1)", S(color)), drawtype = "mesh", mesh = "homedecor_cube.obj", @@ -378,7 +378,7 @@ for _, color in ipairs(homedecor.shrub_colors) do sounds = default.node_sound_leaves_defaults(), }) - minetest.register_node("homedecor:shrubbery_"..color, { + minetest.register_node(":homedecor:shrubbery_"..color, { description = S("Shrubbery (@1)", S(color)), drawtype = "mesh", mesh = "homedecor_shrubbery.obj", @@ -396,6 +396,252 @@ for _, color in ipairs(homedecor.shrub_colors) do }) end +-- crafting + +minetest.register_craft({ + output = "homedecor:chimney 2", + recipe = { + { "default:clay_brick", "", "default:clay_brick" }, + { "default:clay_brick", "", "default:clay_brick" }, + { "default:clay_brick", "", "default:clay_brick" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:doghouse", + recipe = { + {"homedecor:shingles_terracotta", "homedecor:shingles_terracotta", "homedecor:shingles_terracotta"}, + {"group:wood", "", "group:wood"}, + {"group:wood", "building_blocks:terrycloth_towel", "group:wood"} + }, +}) + +minetest.register_craft( { + output = "homedecor:well", + recipe = { + { "homedecor:shingles_wood", "homedecor:shingles_wood", "homedecor:shingles_wood" }, + { "group:wood", "group:stick", "group:wood" }, + { "group:stone", "", "group:stone" } + }, +}) + + + +minetest.register_craft( { + output = "homedecor:bench_large_1", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "group:wood", "group:wood" }, + { "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" } + }, +}) + +minetest.register_craft( { + output = "homedecor:bench_large_2_left", + recipe = { + { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, + { "group:wood", "group:wood", "group:wood" }, + { "stairs:slab_wood", "", "stairs:slab_wood" } + }, +}) + +minetest.register_craft( { + output = "homedecor:bench_large_2_left", + recipe = { + { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, + { "group:wood", "group:wood", "group:wood" }, + { "moreblocks:slab_wood", "", "moreblocks:slab_wood" } + }, +}) + + +minetest.register_craft( { + output = "homedecor:simple_bench", + recipe = { + { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, + { "stairs:slab_wood", "", "stairs:slab_wood" } + }, +}) + +minetest.register_craft( { + output = "homedecor:simple_bench", + recipe = { + { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, + { "moreblocks:slab_wood", "", "moreblocks:slab_wood" } + }, +}) + + +minetest.register_craft({ + output = "homedecor:deckchair", + recipe = { + { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, + { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, + { "group:stick", "building_blocks:terrycloth_towel", "group:stick" } + }, +}) + +minetest.register_craft({ + output = "homedecor:deckchair_striped_blue", + type = "shapeless", + recipe = { + "homedecor:deckchair", + "dye:blue" + } +}) + + +minetest.register_craft({ + output = "homedecor:stonepath 16", + recipe = { + { "stairs:slab_stone","","stairs:slab_stone" }, + { "","stairs:slab_stone","" }, + { "stairs:slab_stone","","stairs:slab_stone" } + }, +}) + +minetest.register_craft({ + output = "homedecor:stonepath 16", + recipe = { + { "moreblocks:slab_stone","","moreblocks:slab_stone" }, + { "","moreblocks:slab_stone","" }, + { "moreblocks:slab_stone","","moreblocks:slab_stone" } + }, +}) + +minetest.register_craft({ + output = "homedecor:stonepath 3", + recipe = { + { "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" }, + { "","moreblocks:micro_stone_1","" }, + { "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" } + }, +}) + +minetest.register_craft({ + output = "homedecor:barbecue", + recipe = { + { "","homedecor:fence_chainlink","" }, + { "default:steel_ingot","fake_fire:embers","default:steel_ingot" }, + { "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" } + }, +}) + +minetest.register_craft({ + output = "homedecor:swing", + recipe = { + { "farming:string","","farming:string" }, + { "farming:string","","farming:string" }, + { "farming:string","stairs:slab_wood","farming:string" } + }, +}) + +minetest.register_craft({ + output = "homedecor:swing", + recipe = { + { "farming:string","","farming:string" }, + { "farming:string","","farming:string" }, + { "farming:string","moreblocks:slab_wood","farming:string" } + }, +}) + +minetest.register_craft({ + output = "homedecor:swing", + recipe = { + { "farming:string","","farming:string" }, + { "farming:string","","farming:string" }, + { "farming:string","moreblocks:panel_wood_1","farming:string" } + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_wood 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_white_wood 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "dye:white", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_wood_vegetal 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "group:leaves", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_white_wood_vegetal 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "group:leaves", "group:wood"}, + {"group:stick", "dye:white", "group:stick"}, + }, +}) + + +minetest.register_craft({ + output = "homedecor:shrubbery_green 3", + recipe = { + { "group:leaves", "group:leaves", "group:leaves" }, + { "group:leaves", "group:leaves", "group:leaves" }, + { "group:stick", "group:stick", "group:stick" } + } +}) + +for _, color in ipairs(homedecor.shrub_colors) do + + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_large_"..color, + recipe = { + "homedecor:shrubbery_"..color + } + }) + + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_"..color, + recipe = { + "homedecor:shrubbery_large_"..color + } + }) + + if color ~= "green" then + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_large_"..color, + recipe = { + "homedecor:shrubbery_large_green", + "dye:"..color + } + }) + + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_"..color, + recipe = { + "homedecor:shrubbery_green", + "dye:"..color + } + }) + + end +end + +-- aliases + minetest.register_alias("homedecor:well_top", "air") minetest.register_alias("homedecor:well_base", "homedecor:well") diff --git a/homedecor/models/homedecor_barbecue.obj b/homedecor_exterior/models/homedecor_barbecue.obj similarity index 100% rename from homedecor/models/homedecor_barbecue.obj rename to homedecor_exterior/models/homedecor_barbecue.obj diff --git a/homedecor/models/homedecor_bench_large_1.obj b/homedecor_exterior/models/homedecor_bench_large_1.obj similarity index 100% rename from homedecor/models/homedecor_bench_large_1.obj rename to homedecor_exterior/models/homedecor_bench_large_1.obj diff --git a/homedecor/models/homedecor_bench_large_2.obj b/homedecor_exterior/models/homedecor_bench_large_2.obj similarity index 100% rename from homedecor/models/homedecor_bench_large_2.obj rename to homedecor_exterior/models/homedecor_bench_large_2.obj diff --git a/homedecor/models/homedecor_chimney.obj b/homedecor_exterior/models/homedecor_chimney.obj similarity index 100% rename from homedecor/models/homedecor_chimney.obj rename to homedecor_exterior/models/homedecor_chimney.obj diff --git a/homedecor/models/homedecor_deckchair.obj b/homedecor_exterior/models/homedecor_deckchair.obj similarity index 100% rename from homedecor/models/homedecor_deckchair.obj rename to homedecor_exterior/models/homedecor_deckchair.obj diff --git a/homedecor/models/homedecor_doghouse.obj b/homedecor_exterior/models/homedecor_doghouse.obj similarity index 100% rename from homedecor/models/homedecor_doghouse.obj rename to homedecor_exterior/models/homedecor_doghouse.obj diff --git a/homedecor/models/homedecor_shrubbery.obj b/homedecor_exterior/models/homedecor_shrubbery.obj similarity index 100% rename from homedecor/models/homedecor_shrubbery.obj rename to homedecor_exterior/models/homedecor_shrubbery.obj diff --git a/homedecor/models/homedecor_well.obj b/homedecor_exterior/models/homedecor_well.obj similarity index 100% rename from homedecor/models/homedecor_well.obj rename to homedecor_exterior/models/homedecor_well.obj diff --git a/homedecor/textures/homedecor_barbecue_meat.png b/homedecor_exterior/textures/homedecor_barbecue_meat.png similarity index 100% rename from homedecor/textures/homedecor_barbecue_meat.png rename to homedecor_exterior/textures/homedecor_barbecue_meat.png diff --git a/homedecor/textures/homedecor_bench_large_1_inv.png b/homedecor_exterior/textures/homedecor_bench_large_1_inv.png similarity index 100% rename from homedecor/textures/homedecor_bench_large_1_inv.png rename to homedecor_exterior/textures/homedecor_bench_large_1_inv.png diff --git a/homedecor/textures/homedecor_bench_large_2_inv.png b/homedecor_exterior/textures/homedecor_bench_large_2_inv.png similarity index 100% rename from homedecor/textures/homedecor_bench_large_2_inv.png rename to homedecor_exterior/textures/homedecor_bench_large_2_inv.png diff --git a/homedecor/textures/homedecor_chimney_tb.png b/homedecor_exterior/textures/homedecor_chimney_tb.png similarity index 100% rename from homedecor/textures/homedecor_chimney_tb.png rename to homedecor_exterior/textures/homedecor_chimney_tb.png diff --git a/homedecor/textures/homedecor_deckchair.png b/homedecor_exterior/textures/homedecor_deckchair.png similarity index 100% rename from homedecor/textures/homedecor_deckchair.png rename to homedecor_exterior/textures/homedecor_deckchair.png diff --git a/homedecor/textures/homedecor_deckchair_striped_blue.png b/homedecor_exterior/textures/homedecor_deckchair_striped_blue.png similarity index 100% rename from homedecor/textures/homedecor_deckchair_striped_blue.png rename to homedecor_exterior/textures/homedecor_deckchair_striped_blue.png diff --git a/homedecor/textures/homedecor_doghouse_inv.png b/homedecor_exterior/textures/homedecor_doghouse_inv.png similarity index 100% rename from homedecor/textures/homedecor_doghouse_inv.png rename to homedecor_exterior/textures/homedecor_doghouse_inv.png diff --git a/homedecor/textures/homedecor_embers.png b/homedecor_exterior/textures/homedecor_embers.png similarity index 100% rename from homedecor/textures/homedecor_embers.png rename to homedecor_exterior/textures/homedecor_embers.png diff --git a/homedecor/textures/homedecor_lattice.png b/homedecor_exterior/textures/homedecor_lattice.png similarity index 100% rename from homedecor/textures/homedecor_lattice.png rename to homedecor_exterior/textures/homedecor_lattice.png diff --git a/homedecor/textures/homedecor_lattice_vegetal.png b/homedecor_exterior/textures/homedecor_lattice_vegetal.png similarity index 100% rename from homedecor/textures/homedecor_lattice_vegetal.png rename to homedecor_exterior/textures/homedecor_lattice_vegetal.png diff --git a/homedecor/textures/homedecor_rope_texture.png b/homedecor_exterior/textures/homedecor_rope_texture.png similarity index 100% rename from homedecor/textures/homedecor_rope_texture.png rename to homedecor_exterior/textures/homedecor_rope_texture.png diff --git a/homedecor/textures/homedecor_shrubbery_green.png b/homedecor_exterior/textures/homedecor_shrubbery_green.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_green.png rename to homedecor_exterior/textures/homedecor_shrubbery_green.png diff --git a/homedecor/textures/homedecor_shrubbery_green_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_green_bottom.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_green_bottom.png rename to homedecor_exterior/textures/homedecor_shrubbery_green_bottom.png diff --git a/homedecor/textures/homedecor_shrubbery_red.png b/homedecor_exterior/textures/homedecor_shrubbery_red.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_red.png rename to homedecor_exterior/textures/homedecor_shrubbery_red.png diff --git a/homedecor/textures/homedecor_shrubbery_red_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_red_bottom.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_red_bottom.png rename to homedecor_exterior/textures/homedecor_shrubbery_red_bottom.png diff --git a/homedecor/textures/homedecor_shrubbery_roots.png b/homedecor_exterior/textures/homedecor_shrubbery_roots.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_roots.png rename to homedecor_exterior/textures/homedecor_shrubbery_roots.png diff --git a/homedecor/textures/homedecor_shrubbery_yellow.png b/homedecor_exterior/textures/homedecor_shrubbery_yellow.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_yellow.png rename to homedecor_exterior/textures/homedecor_shrubbery_yellow.png diff --git a/homedecor/textures/homedecor_shrubbery_yellow_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_yellow_bottom.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_yellow_bottom.png rename to homedecor_exterior/textures/homedecor_shrubbery_yellow_bottom.png diff --git a/homedecor/textures/homedecor_stonepath_inv.png b/homedecor_exterior/textures/homedecor_stonepath_inv.png similarity index 100% rename from homedecor/textures/homedecor_stonepath_inv.png rename to homedecor_exterior/textures/homedecor_stonepath_inv.png diff --git a/homedecor/textures/homedecor_swing_inv.png b/homedecor_exterior/textures/homedecor_swing_inv.png similarity index 100% rename from homedecor/textures/homedecor_swing_inv.png rename to homedecor_exterior/textures/homedecor_swing_inv.png diff --git a/homedecor/textures/homedecor_swing_top.png b/homedecor_exterior/textures/homedecor_swing_top.png similarity index 100% rename from homedecor/textures/homedecor_swing_top.png rename to homedecor_exterior/textures/homedecor_swing_top.png diff --git a/homedecor/textures/homedecor_swingrope_sides.png b/homedecor_exterior/textures/homedecor_swingrope_sides.png similarity index 100% rename from homedecor/textures/homedecor_swingrope_sides.png rename to homedecor_exterior/textures/homedecor_swingrope_sides.png diff --git a/homedecor/textures/homedecor_well_inv.png b/homedecor_exterior/textures/homedecor_well_inv.png similarity index 100% rename from homedecor/textures/homedecor_well_inv.png rename to homedecor_exterior/textures/homedecor_well_inv.png diff --git a/homedecor_fences/depends.txt b/homedecor_fences/depends.txt new file mode 100644 index 00000000..bb6198ed --- /dev/null +++ b/homedecor_fences/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +signs_lib? diff --git a/homedecor/fences.lua b/homedecor_fences/init.lua similarity index 71% rename from homedecor/fences.lua rename to homedecor_fences/init.lua index 3affefe2..7742d7ad 100644 --- a/homedecor/fences.lua +++ b/homedecor_fences/init.lua @@ -307,3 +307,183 @@ if signs_modpath then signs_lib.register_fence_with_sign("homedecor:fence_brass", "homedecor:fence_brass_with_sign") signs_lib.register_fence_with_sign("homedecor:fence_wrought_iron", "homedecor:fence_wrought_iron_with_sign") end + +-- crafting + +-- Brass/wrought iron fences + +minetest.register_craft( { + output = "homedecor:fence_brass 6", + recipe = { + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:fence_wrought_iron 6", + recipe = { + { "default:iron_lump","default:iron_lump","default:iron_lump" }, + { "default:iron_lump","default:iron_lump","default:iron_lump" }, + }, +}) + +-- other types of fences + +minetest.register_craft( { + output = "homedecor:fence_wrought_iron_2 4", + recipe = { + { "homedecor:pole_wrought_iron", "default:iron_lump" }, + { "homedecor:pole_wrought_iron", "default:iron_lump" }, + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_wrought_iron_2_corner", + recipe = { + "homedecor:fence_wrought_iron_2", + "homedecor:fence_wrought_iron_2" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_wrought_iron_2 2", + recipe = { + "homedecor:fence_wrought_iron_2_corner", + }, +}) + +-- + +minetest.register_craft( { + output = "homedecor:fence_picket 6", + recipe = { + { "group:stick", "group:stick", "group:stick" }, + { "group:stick", "", "group:stick" }, + { "group:stick", "group:stick", "group:stick" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket_corner", + recipe = { + "homedecor:fence_picket", + "homedecor:fence_picket" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket 2", + recipe = { + "homedecor:fence_picket_corner" + }, +}) + +-- + + +minetest.register_craft( { + output = "homedecor:fence_picket_white 6", + recipe = { + { "group:stick", "group:stick", "group:stick" }, + { "group:stick", "dye:white", "group:stick" }, + { "group:stick", "group:stick", "group:stick" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket_corner_white", + recipe = { + "homedecor:fence_picket_white", + "homedecor:fence_picket_white" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_picket_white 2", + recipe = { + "homedecor:fence_picket_corner_white" + }, +}) + +-- + + +minetest.register_craft( { + output = "homedecor:fence_privacy 6", + recipe = { + { "group:wood", "group:stick", "group:wood" }, + { "group:wood", "", "group:wood" }, + { "group:wood", "group:stick", "group:wood" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_privacy_corner", + recipe = { + "homedecor:fence_privacy", + "homedecor:fence_privacy" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_privacy 2", + recipe = { + "homedecor:fence_privacy_corner" + }, +}) + +-- + + +minetest.register_craft( { + output = "homedecor:fence_barbed_wire 6", + recipe = { + { "group:stick", "basic_materials:steel_wire", "group:stick" }, + { "group:stick", "", "group:stick" }, + { "group:stick", "basic_materials:steel_wire", "group:stick" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_barbed_wire_corner", + recipe = { "homedecor:fence_barbed_wire", "homedecor:fence_barbed_wire" }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_barbed_wire 2", + recipe = { "homedecor:fence_barbed_wire_corner" }, +}) + +-- + +minetest.register_craft( { + output = "homedecor:fence_chainlink 9", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }, + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_chainlink_corner", + recipe = { "homedecor:fence_chainlink", "homedecor:fence_chainlink" }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:fence_chainlink 2", + recipe = { "homedecor:fence_chainlink_corner" }, +}) diff --git a/homedecor/models/homedecor_fence_barbed_wire.obj b/homedecor_fences/models/homedecor_fence_barbed_wire.obj similarity index 100% rename from homedecor/models/homedecor_fence_barbed_wire.obj rename to homedecor_fences/models/homedecor_fence_barbed_wire.obj diff --git a/homedecor/models/homedecor_fence_barbed_wire_corner.obj b/homedecor_fences/models/homedecor_fence_barbed_wire_corner.obj similarity index 100% rename from homedecor/models/homedecor_fence_barbed_wire_corner.obj rename to homedecor_fences/models/homedecor_fence_barbed_wire_corner.obj diff --git a/homedecor/models/homedecor_fence_chainlink.obj b/homedecor_fences/models/homedecor_fence_chainlink.obj similarity index 100% rename from homedecor/models/homedecor_fence_chainlink.obj rename to homedecor_fences/models/homedecor_fence_chainlink.obj diff --git a/homedecor/models/homedecor_fence_chainlink_corner.obj b/homedecor_fences/models/homedecor_fence_chainlink_corner.obj similarity index 100% rename from homedecor/models/homedecor_fence_chainlink_corner.obj rename to homedecor_fences/models/homedecor_fence_chainlink_corner.obj diff --git a/homedecor/textures/homedecor_fence_barbed_wire.png b/homedecor_fences/textures/homedecor_fence_barbed_wire.png similarity index 100% rename from homedecor/textures/homedecor_fence_barbed_wire.png rename to homedecor_fences/textures/homedecor_fence_barbed_wire.png diff --git a/homedecor/textures/homedecor_fence_brass.png b/homedecor_fences/textures/homedecor_fence_brass.png similarity index 100% rename from homedecor/textures/homedecor_fence_brass.png rename to homedecor_fences/textures/homedecor_fence_brass.png diff --git a/homedecor/textures/homedecor_fence_chainlink_corner_front.png b/homedecor_fences/textures/homedecor_fence_chainlink_corner_front.png similarity index 100% rename from homedecor/textures/homedecor_fence_chainlink_corner_front.png rename to homedecor_fences/textures/homedecor_fence_chainlink_corner_front.png diff --git a/homedecor/textures/homedecor_fence_chainlink_corner_top.png b/homedecor_fences/textures/homedecor_fence_chainlink_corner_top.png similarity index 100% rename from homedecor/textures/homedecor_fence_chainlink_corner_top.png rename to homedecor_fences/textures/homedecor_fence_chainlink_corner_top.png diff --git a/homedecor/textures/homedecor_fence_chainlink_fb.png b/homedecor_fences/textures/homedecor_fence_chainlink_fb.png similarity index 100% rename from homedecor/textures/homedecor_fence_chainlink_fb.png rename to homedecor_fences/textures/homedecor_fence_chainlink_fb.png diff --git a/homedecor/textures/homedecor_fence_chainlink_sides.png b/homedecor_fences/textures/homedecor_fence_chainlink_sides.png similarity index 100% rename from homedecor/textures/homedecor_fence_chainlink_sides.png rename to homedecor_fences/textures/homedecor_fence_chainlink_sides.png diff --git a/homedecor/textures/homedecor_fence_chainlink_tb.png b/homedecor_fences/textures/homedecor_fence_chainlink_tb.png similarity index 100% rename from homedecor/textures/homedecor_fence_chainlink_tb.png rename to homedecor_fences/textures/homedecor_fence_chainlink_tb.png diff --git a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_sides.png similarity index 100% rename from homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png rename to homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_sides.png diff --git a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_tb.png similarity index 100% rename from homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png rename to homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_tb.png diff --git a/homedecor/textures/homedecor_fence_picket.png b/homedecor_fences/textures/homedecor_fence_picket.png similarity index 100% rename from homedecor/textures/homedecor_fence_picket.png rename to homedecor_fences/textures/homedecor_fence_picket.png diff --git a/homedecor/textures/homedecor_fence_picket_backside.png b/homedecor_fences/textures/homedecor_fence_picket_backside.png similarity index 100% rename from homedecor/textures/homedecor_fence_picket_backside.png rename to homedecor_fences/textures/homedecor_fence_picket_backside.png diff --git a/homedecor/textures/homedecor_fence_picket_white.png b/homedecor_fences/textures/homedecor_fence_picket_white.png similarity index 100% rename from homedecor/textures/homedecor_fence_picket_white.png rename to homedecor_fences/textures/homedecor_fence_picket_white.png diff --git a/homedecor/textures/homedecor_fence_picket_white_backside.png b/homedecor_fences/textures/homedecor_fence_picket_white_backside.png similarity index 100% rename from homedecor/textures/homedecor_fence_picket_white_backside.png rename to homedecor_fences/textures/homedecor_fence_picket_white_backside.png diff --git a/homedecor/textures/homedecor_fence_privacy_backside.png b/homedecor_fences/textures/homedecor_fence_privacy_backside.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_backside.png rename to homedecor_fences/textures/homedecor_fence_privacy_backside.png diff --git a/homedecor/textures/homedecor_fence_privacy_backside2.png b/homedecor_fences/textures/homedecor_fence_privacy_backside2.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_backside2.png rename to homedecor_fences/textures/homedecor_fence_privacy_backside2.png diff --git a/homedecor/textures/homedecor_fence_privacy_corner_front.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_front.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_corner_front.png rename to homedecor_fences/textures/homedecor_fence_privacy_corner_front.png diff --git a/homedecor/textures/homedecor_fence_privacy_corner_right.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_right.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_corner_right.png rename to homedecor_fences/textures/homedecor_fence_privacy_corner_right.png diff --git a/homedecor/textures/homedecor_fence_privacy_corner_tb.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_tb.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_corner_tb.png rename to homedecor_fences/textures/homedecor_fence_privacy_corner_tb.png diff --git a/homedecor/textures/homedecor_fence_privacy_front.png b/homedecor_fences/textures/homedecor_fence_privacy_front.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_front.png rename to homedecor_fences/textures/homedecor_fence_privacy_front.png diff --git a/homedecor/textures/homedecor_fence_privacy_sides.png b/homedecor_fences/textures/homedecor_fence_privacy_sides.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_sides.png rename to homedecor_fences/textures/homedecor_fence_privacy_sides.png diff --git a/homedecor/textures/homedecor_fence_privacy_tb.png b/homedecor_fences/textures/homedecor_fence_privacy_tb.png similarity index 100% rename from homedecor/textures/homedecor_fence_privacy_tb.png rename to homedecor_fences/textures/homedecor_fence_privacy_tb.png diff --git a/homedecor/textures/homedecor_fence_wrought_iron.png b/homedecor_fences/textures/homedecor_fence_wrought_iron.png similarity index 100% rename from homedecor/textures/homedecor_fence_wrought_iron.png rename to homedecor_fences/textures/homedecor_fence_wrought_iron.png diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_fb.png similarity index 100% rename from homedecor/textures/homedecor_fence_wrought_iron_2_fb.png rename to homedecor_fences/textures/homedecor_fence_wrought_iron_2_fb.png diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_sides.png similarity index 100% rename from homedecor/textures/homedecor_fence_wrought_iron_2_sides.png rename to homedecor_fences/textures/homedecor_fence_wrought_iron_2_sides.png diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_tb.png similarity index 100% rename from homedecor/textures/homedecor_fence_wrought_iron_2_tb.png rename to homedecor_fences/textures/homedecor_fence_wrought_iron_2_tb.png diff --git a/homedecor/textures/homedecor_sign_brass_post.png b/homedecor_fences/textures/homedecor_sign_brass_post.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post.png rename to homedecor_fences/textures/homedecor_sign_brass_post.png diff --git a/homedecor/textures/homedecor_sign_brass_post_back.png b/homedecor_fences/textures/homedecor_sign_brass_post_back.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post_back.png rename to homedecor_fences/textures/homedecor_sign_brass_post_back.png diff --git a/homedecor/textures/homedecor_sign_brass_post_bottom.png b/homedecor_fences/textures/homedecor_sign_brass_post_bottom.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post_bottom.png rename to homedecor_fences/textures/homedecor_sign_brass_post_bottom.png diff --git a/homedecor/textures/homedecor_sign_brass_post_front.png b/homedecor_fences/textures/homedecor_sign_brass_post_front.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post_front.png rename to homedecor_fences/textures/homedecor_sign_brass_post_front.png diff --git a/homedecor/textures/homedecor_sign_brass_post_side.png b/homedecor_fences/textures/homedecor_sign_brass_post_side.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post_side.png rename to homedecor_fences/textures/homedecor_sign_brass_post_side.png diff --git a/homedecor/textures/homedecor_sign_brass_post_top.png b/homedecor_fences/textures/homedecor_sign_brass_post_top.png similarity index 100% rename from homedecor/textures/homedecor_sign_brass_post_top.png rename to homedecor_fences/textures/homedecor_sign_brass_post_top.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_back.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_back.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post_back.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post_back.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_bottom.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post_bottom.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_front.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_front.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post_front.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post_front.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_side.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_side.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post_side.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post_side.png diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_top.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_top.png similarity index 100% rename from homedecor/textures/homedecor_sign_wrought_iron_post_top.png rename to homedecor_fences/textures/homedecor_sign_wrought_iron_post_top.png diff --git a/homedecor_foyer/depends.txt b/homedecor_foyer/depends.txt new file mode 100644 index 00000000..2a66bdcf --- /dev/null +++ b/homedecor_foyer/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +dye +homedecor_i18n diff --git a/homedecor/foyer.lua b/homedecor_foyer/init.lua similarity index 63% rename from homedecor/foyer.lua rename to homedecor_foyer/init.lua index c6fb401c..baa07771 100644 --- a/homedecor/foyer.lua +++ b/homedecor_foyer/init.lua @@ -67,3 +67,55 @@ for _, mat in ipairs(mat_colors) do } }) end + +-- crafting + + +minetest.register_craft({ + output = "homedecor:welcome_mat_grey 2", + recipe = { + { "", "dye:black", "" }, + { "wool:grey", "wool:grey", "wool:grey" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:welcome_mat_brown 2", + recipe = { + { "", "dye:black", "" }, + { "wool:brown", "wool:brown", "wool:brown" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:welcome_mat_green 2", + recipe = { + { "", "dye:white", "" }, + { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:welcome_mat_green 2", + recipe = { + { "", "dye:white", "" }, + { "dye:black", "dye:black", "dye:black" }, + { "wool:green", "wool:green", "wool:green" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:coat_tree", + recipe = { + { "group:stick", "group:stick", "group:stick" }, + { "", "group:stick", "" }, + { "", "group:wood", "" } + }, +}) + +minetest.register_craft( { + output = "homedecor:coatrack_wallmount", + recipe = { + { "group:stick", "homedecor:curtainrod_wood", "group:stick" }, + }, +}) diff --git a/homedecor/models/homedecor_coatrack.obj b/homedecor_foyer/models/homedecor_coatrack.obj similarity index 100% rename from homedecor/models/homedecor_coatrack.obj rename to homedecor_foyer/models/homedecor_coatrack.obj diff --git a/homedecor/textures/homedecor_coatrack_inv.png b/homedecor_foyer/textures/homedecor_coatrack_inv.png similarity index 100% rename from homedecor/textures/homedecor_coatrack_inv.png rename to homedecor_foyer/textures/homedecor_coatrack_inv.png diff --git a/homedecor/textures/homedecor_coatrack_wallmount_inv.png b/homedecor_foyer/textures/homedecor_coatrack_wallmount_inv.png similarity index 100% rename from homedecor/textures/homedecor_coatrack_wallmount_inv.png rename to homedecor_foyer/textures/homedecor_coatrack_wallmount_inv.png diff --git a/homedecor/textures/homedecor_welcome_mat_bottom.png b/homedecor_foyer/textures/homedecor_welcome_mat_bottom.png similarity index 100% rename from homedecor/textures/homedecor_welcome_mat_bottom.png rename to homedecor_foyer/textures/homedecor_welcome_mat_bottom.png diff --git a/homedecor/textures/homedecor_welcome_mat_brown.png b/homedecor_foyer/textures/homedecor_welcome_mat_brown.png similarity index 100% rename from homedecor/textures/homedecor_welcome_mat_brown.png rename to homedecor_foyer/textures/homedecor_welcome_mat_brown.png diff --git a/homedecor/textures/homedecor_welcome_mat_green.png b/homedecor_foyer/textures/homedecor_welcome_mat_green.png similarity index 100% rename from homedecor/textures/homedecor_welcome_mat_green.png rename to homedecor_foyer/textures/homedecor_welcome_mat_green.png diff --git a/homedecor/textures/homedecor_welcome_mat_grey.png b/homedecor_foyer/textures/homedecor_welcome_mat_grey.png similarity index 100% rename from homedecor/textures/homedecor_welcome_mat_grey.png rename to homedecor_foyer/textures/homedecor_welcome_mat_grey.png diff --git a/homedecor_furniture/depends.txt b/homedecor_furniture/depends.txt new file mode 100644 index 00000000..5bb2547c --- /dev/null +++ b/homedecor_furniture/depends.txt @@ -0,0 +1,8 @@ +homedecor_common +default +unifieddyes +homedecor_i18n +wool +moreblocks? +technic? +bucket? diff --git a/homedecor/furniture.lua b/homedecor_furniture/init.lua similarity index 53% rename from homedecor/furniture.lua rename to homedecor_furniture/init.lua index 4acfa581..a88849e7 100644 --- a/homedecor/furniture.lua +++ b/homedecor_furniture/init.lua @@ -136,7 +136,7 @@ minetest.register_node(":homedecor:openframe_bookshelf", { homedecor.register("wall_shelf", { description = S("Wall Shelf"), tiles = { - "homedecor_wood_table_large_edges.png", + "default_wood.png", }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -149,6 +149,289 @@ homedecor.register("wall_shelf", { } }) +-- Crafts + + +minetest.register_craft({ + output = "homedecor:table", + recipe = { + { "default:wood","default:wood", "default:wood" }, + { "group:stick", "", "group:stick" }, + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:table_mahogany", + recipe = { + "homedecor:table", + "dye:brown", + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:table_mahogany", + recipe = { + "homedecor:table", + "unifieddyes:dark_orange", + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:table_white", + recipe = { + "homedecor:table", + "dye:white", + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:table", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:table_mahogany", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:table_white", + burntime = 30, +}) + +minetest.register_craft({ + output = "homedecor:kitchen_chair_wood 2", + recipe = { + { "group:stick",""}, + { "group:wood","group:wood" }, + { "group:stick","group:stick" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:armchair 2", + recipe = { + { "wool:white",""}, + { "group:wood","group:wood" }, + { "wool:white","wool:white" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:armchair", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:armchair", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:kitchen_chair_padded", + recipe = { + "homedecor:kitchen_chair_wood", + "wool:white", + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:kitchen_chair_padded", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:kitchen_chair_padded", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:kitchen_chair_wood", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:kitchen_chair_padded", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:armchair", + burntime = 30, +}) + +minetest.register_craft({ + output = "homedecor:standing_lamp_off", + recipe = { + {"homedecor:table_lamp_off"}, + {"group:stick"}, + {"group:stick"}, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:standing_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:standing_lamp_off", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:table_lamp_off", + burntime = 10, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "wool:white", "default:torch", "wool:white"}, + { "", "group:stick", ""}, + { "", "stairs:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "cottages:wool", "default:torch", "cottages:wool"}, + { "", "group:stick", ""}, + { "", "stairs:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "wool:white", "default:torch", "wool:white"}, + { "", "group:stick", ""}, + { "", "moreblocks:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "cottages:wool", "default:torch", "cottages:wool"}, + { "", "group:stick", ""}, + { "", "moreblocks:slab_wood", "" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:table_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:table_lamp_off", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + output = "homedecor:toilet", + recipe = { + { "","","bucket:bucket_water"}, + { "group:marble","group:marble", "group:marble" }, + { "", "bucket:bucket_empty", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:sink", + recipe = { + { "group:marble","bucket:bucket_empty", "group:marble" }, + { "", "group:marble", "" } + }, +}) + +minetest.register_craft({ + output = "homedecor:taps", + recipe = { + { "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:taps_brass", + recipe = { + { "technic:brass_ingot","bucket:bucket_water", "technic:brass_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:shower_tray", + recipe = { + { "group:marble","bucket:bucket_empty", "group:marble" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:shower_head", + recipe = { + {"default:steel_ingot", "bucket:bucket_water"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:bathtub_clawfoot_brass_taps", + recipe = { + { "homedecor:taps_brass", "", "" }, + { "group:marble", "", "group:marble" }, + {"default:steel_ingot", "group:marble", "default:steel_ingot"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:bathtub_clawfoot_chrome_taps", + recipe = { + { "homedecor:taps", "", "" }, + { "group:marble", "", "group:marble" }, + {"default:steel_ingot", "group:marble", "default:steel_ingot"}, + }, +}) + +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" }, + }, +}) + +minetest.register_craft({ + 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" }, + }, +}) + -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") @@ -189,7 +472,7 @@ end table.insert(homedecor.old_static_chairs, "homedecor:chair") minetest.register_lbm({ - name = "homedecor:convert_chairs", + name = ":homedecor:convert_chairs", label = "Convert homedecor chairs to use param2 color", run_at_every_load = false, nodenames = homedecor.old_static_chairs, diff --git a/homedecor/models/forniture_armchair.obj b/homedecor_furniture/models/forniture_armchair.obj similarity index 100% rename from homedecor/models/forniture_armchair.obj rename to homedecor_furniture/models/forniture_armchair.obj diff --git a/homedecor/models/homedecor_kitchen_chair.obj b/homedecor_furniture/models/homedecor_kitchen_chair.obj similarity index 100% rename from homedecor/models/homedecor_kitchen_chair.obj rename to homedecor_furniture/models/homedecor_kitchen_chair.obj diff --git a/homedecor/models/homedecor_openframe_bookshelf.obj b/homedecor_furniture/models/homedecor_openframe_bookshelf.obj similarity index 100% rename from homedecor/models/homedecor_openframe_bookshelf.obj rename to homedecor_furniture/models/homedecor_openframe_bookshelf.obj diff --git a/homedecor/textures/homedecor_armchair_inv.png b/homedecor_furniture/textures/homedecor_armchair_inv.png similarity index 100% rename from homedecor/textures/homedecor_armchair_inv.png rename to homedecor_furniture/textures/homedecor_armchair_inv.png diff --git a/homedecor/textures/homedecor_chair_padded_inv.png b/homedecor_furniture/textures/homedecor_chair_padded_inv.png similarity index 100% rename from homedecor/textures/homedecor_chair_padded_inv.png rename to homedecor_furniture/textures/homedecor_chair_padded_inv.png diff --git a/homedecor/textures/homedecor_chair_wood_inv.png b/homedecor_furniture/textures/homedecor_chair_wood_inv.png similarity index 100% rename from homedecor/textures/homedecor_chair_wood_inv.png rename to homedecor_furniture/textures/homedecor_chair_wood_inv.png diff --git a/homedecor/textures/homedecor_openframe_bookshelf_books.png b/homedecor_furniture/textures/homedecor_openframe_bookshelf_books.png similarity index 100% rename from homedecor/textures/homedecor_openframe_bookshelf_books.png rename to homedecor_furniture/textures/homedecor_openframe_bookshelf_books.png diff --git a/homedecor_furniture_medieval/depends.txt b/homedecor_furniture_medieval/depends.txt new file mode 100644 index 00000000..4948e7e6 --- /dev/null +++ b/homedecor_furniture_medieval/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +homedecor_i18n +creative diff --git a/homedecor/furniture_medieval.lua b/homedecor_furniture_medieval/init.lua similarity index 100% rename from homedecor/furniture_medieval.lua rename to homedecor_furniture_medieval/init.lua diff --git a/homedecor/models/forniture_chains.obj b/homedecor_furniture_medieval/models/forniture_chains.obj similarity index 100% rename from homedecor/models/forniture_chains.obj rename to homedecor_furniture_medieval/models/forniture_chains.obj diff --git a/homedecor/models/forniture_torch.obj b/homedecor_furniture_medieval/models/forniture_torch.obj similarity index 100% rename from homedecor/models/forniture_torch.obj rename to homedecor_furniture_medieval/models/forniture_torch.obj diff --git a/homedecor/models/homedecor_wall_lamp.obj b/homedecor_furniture_medieval/models/homedecor_wall_lamp.obj similarity index 100% rename from homedecor/models/homedecor_wall_lamp.obj rename to homedecor_furniture_medieval/models/homedecor_wall_lamp.obj diff --git a/homedecor/textures/forniture_chains_inv.png b/homedecor_furniture_medieval/textures/forniture_chains_inv.png similarity index 100% rename from homedecor/textures/forniture_chains_inv.png rename to homedecor_furniture_medieval/textures/forniture_chains_inv.png diff --git a/homedecor/textures/forniture_coal.png b/homedecor_furniture_medieval/textures/forniture_coal.png similarity index 100% rename from homedecor/textures/forniture_coal.png rename to homedecor_furniture_medieval/textures/forniture_coal.png diff --git a/homedecor/textures/forniture_marble_top_toilet.png b/homedecor_furniture_medieval/textures/forniture_marble_top_toilet.png similarity index 100% rename from homedecor/textures/forniture_marble_top_toilet.png rename to homedecor_furniture_medieval/textures/forniture_marble_top_toilet.png diff --git a/homedecor/textures/forniture_torch_flame.png b/homedecor_furniture_medieval/textures/forniture_torch_flame.png similarity index 100% rename from homedecor/textures/forniture_torch_flame.png rename to homedecor_furniture_medieval/textures/forniture_torch_flame.png diff --git a/homedecor/textures/forniture_torch_inv.png b/homedecor_furniture_medieval/textures/forniture_torch_inv.png similarity index 100% rename from homedecor/textures/forniture_torch_inv.png rename to homedecor_furniture_medieval/textures/forniture_torch_inv.png diff --git a/homedecor/textures/homedecor_wall_lamp_inv.png b/homedecor_furniture_medieval/textures/homedecor_wall_lamp_inv.png similarity index 100% rename from homedecor/textures/homedecor_wall_lamp_inv.png rename to homedecor_furniture_medieval/textures/homedecor_wall_lamp_inv.png diff --git a/homedecor_gastronomy/depends.txt b/homedecor_gastronomy/depends.txt new file mode 100644 index 00000000..cd30824b --- /dev/null +++ b/homedecor_gastronomy/depends.txt @@ -0,0 +1,8 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +creative +currency? +bucket? diff --git a/homedecor/gastronomy.lua b/homedecor_gastronomy/init.lua similarity index 53% rename from homedecor/gastronomy.lua rename to homedecor_gastronomy/init.lua index 8274b3f4..eef49f00 100644 --- a/homedecor/gastronomy.lua +++ b/homedecor_gastronomy/init.lua @@ -104,22 +104,6 @@ homedecor.register("wine_rack", { sounds = default.node_sound_defaults(), }) -homedecor.register("dartboard", { - description = S("Dartboard"), - mesh = "homedecor_dartboard.obj", - tiles = { "homedecor_dartboard.png" }, - inventory_image = "homedecor_dartboard_inv.png", - wield_image = "homedecor_dartboard_inv.png", - paramtype2 = "wallmounted", - walkable = false, - selection_box = { - type = "wallmounted", - }, - groups = {choppy=2,dig_immediate=2,attached_node=1}, - legacy_wallmounted = true, - sounds = default.node_sound_wood_defaults(), -}) - homedecor.register("beer_tap", { description = S("Beer tap"), mesh = "homedecor_beer_taps.obj", @@ -236,3 +220,218 @@ homedecor.register("soda_machine", { }) minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25") + +-- coffee! +-- coffee! +-- coffee! + +local cm_cbox = { + type = "fixed", + fixed = { + { 0, -8/16, 0, 7/16, 3/16, 8/16 }, + { -4/16, -8/16, -6/16, -1/16, -5/16, -3/16 } + } +} + +homedecor.register("coffee_maker", { + mesh = "homedecor_coffeemaker.obj", + tiles = { + "homedecor_coffeemaker_decanter.png", + "homedecor_coffeemaker_cup.png", + "homedecor_coffeemaker_case.png", + }, + description = S("Coffee Maker"), + inventory_image = "homedecor_coffeemaker_inv.png", + walkable = false, + groups = {snappy=3}, + selection_box = cm_cbox, + node_box = cm_cbox, + on_rotate = screwdriver.disallow +}) + +homedecor.register("toaster", { + description = S("Toaster"), + tiles = { "homedecor_toaster_sides.png" }, + inventory_image = "homedecor_toaster_inv.png", + walkable = false, + 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, itemstack, pointed_thing) + 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 + }) + return itemstack + 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" + }, + walkable = false, + 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, itemstack, pointed_thing) + local fdir = node.param2 + minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) + return itemstack + end, + drop = "homedecor:toaster" +}) + +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", + label = "sfx", + 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 +}) + +-- crafting + +minetest.register_craftitem(":homedecor:soda_can", { + description = S("Soda Can"), + inventory_image = "homedecor_soda_can.png", + on_use = minetest.item_eat(2), +}) + +minetest.register_craft( { + output = "homedecor:bottle_green", + recipe = { + { "vessels:glass_bottle", "dye:green" } + }, +}) + +minetest.register_craft( { + output = "homedecor:bottle_brown", + recipe = { + { "vessels:glass_bottle", "dye:brown" } + }, +}) + +minetest.register_craft({ + output = "homedecor:coffee_maker", + recipe = { + {"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} + }, +}) + +minetest.register_craft({ + output = "homedecor:toaster", + recipe = { + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:beer_tap", + recipe = { + { "group:stick","default:steel_ingot","group:stick" }, + { "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" }, + { "default:steel_ingot","default:steel_ingot","default:steel_ingot" } + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:4_bottles_brown", + recipe = { + "homedecor:bottle_brown", + "homedecor:bottle_brown", + "homedecor:bottle_brown", + "homedecor:bottle_brown" + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:4_bottles_green", + recipe = { + "homedecor:bottle_green", + "homedecor:bottle_green", + "homedecor:bottle_green", + "homedecor:bottle_green" + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:4_bottles_multi", + recipe = { + "homedecor:bottle_brown", + "homedecor:bottle_brown", + "homedecor:bottle_green", + "homedecor:bottle_green", + }, +}) + +minetest.register_craft({ + output = "homedecor:wine_rack", + recipe = { + { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, + { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, + { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:soda_machine", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "dye:red", "default:steel_ingot"}, + {"default:steel_ingot", "default:copperblock", "default:steel_ingot"}, + }, +}) diff --git a/homedecor/models/homedecor_4_bottles.obj b/homedecor_gastronomy/models/homedecor_4_bottles.obj similarity index 100% rename from homedecor/models/homedecor_4_bottles.obj rename to homedecor_gastronomy/models/homedecor_4_bottles.obj diff --git a/homedecor/models/homedecor_beer_mug.obj b/homedecor_gastronomy/models/homedecor_beer_mug.obj similarity index 100% rename from homedecor/models/homedecor_beer_mug.obj rename to homedecor_gastronomy/models/homedecor_beer_mug.obj diff --git a/homedecor/models/homedecor_beer_taps.obj b/homedecor_gastronomy/models/homedecor_beer_taps.obj similarity index 100% rename from homedecor/models/homedecor_beer_taps.obj rename to homedecor_gastronomy/models/homedecor_beer_taps.obj diff --git a/homedecor/models/homedecor_bottle.obj b/homedecor_gastronomy/models/homedecor_bottle.obj similarity index 100% rename from homedecor/models/homedecor_bottle.obj rename to homedecor_gastronomy/models/homedecor_bottle.obj diff --git a/homedecor/models/homedecor_coffeemaker.obj b/homedecor_gastronomy/models/homedecor_coffeemaker.obj similarity index 100% rename from homedecor/models/homedecor_coffeemaker.obj rename to homedecor_gastronomy/models/homedecor_coffeemaker.obj diff --git a/homedecor/models/homedecor_cutlery_set.obj b/homedecor_gastronomy/models/homedecor_cutlery_set.obj similarity index 100% rename from homedecor/models/homedecor_cutlery_set.obj rename to homedecor_gastronomy/models/homedecor_cutlery_set.obj diff --git a/homedecor/models/homedecor_soda_machine.obj b/homedecor_gastronomy/models/homedecor_soda_machine.obj similarity index 100% rename from homedecor/models/homedecor_soda_machine.obj rename to homedecor_gastronomy/models/homedecor_soda_machine.obj diff --git a/homedecor/models/homedecor_wine_rack.obj b/homedecor_gastronomy/models/homedecor_wine_rack.obj similarity index 100% rename from homedecor/models/homedecor_wine_rack.obj rename to homedecor_gastronomy/models/homedecor_wine_rack.obj diff --git a/homedecor/textures/homedecor_4_bottles_brown_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_brown_inv.png similarity index 100% rename from homedecor/textures/homedecor_4_bottles_brown_inv.png rename to homedecor_gastronomy/textures/homedecor_4_bottles_brown_inv.png diff --git a/homedecor/textures/homedecor_4_bottles_green_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_green_inv.png similarity index 100% rename from homedecor/textures/homedecor_4_bottles_green_inv.png rename to homedecor_gastronomy/textures/homedecor_4_bottles_green_inv.png diff --git a/homedecor/textures/homedecor_4_bottles_multi_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_multi_inv.png similarity index 100% rename from homedecor/textures/homedecor_4_bottles_multi_inv.png rename to homedecor_gastronomy/textures/homedecor_4_bottles_multi_inv.png diff --git a/homedecor/textures/homedecor_beer_mug.png b/homedecor_gastronomy/textures/homedecor_beer_mug.png similarity index 100% rename from homedecor/textures/homedecor_beer_mug.png rename to homedecor_gastronomy/textures/homedecor_beer_mug.png diff --git a/homedecor/textures/homedecor_beer_mug_inv.png b/homedecor_gastronomy/textures/homedecor_beer_mug_inv.png similarity index 100% rename from homedecor/textures/homedecor_beer_mug_inv.png rename to homedecor_gastronomy/textures/homedecor_beer_mug_inv.png diff --git a/homedecor/textures/homedecor_beertap_inv.png b/homedecor_gastronomy/textures/homedecor_beertap_inv.png similarity index 100% rename from homedecor/textures/homedecor_beertap_inv.png rename to homedecor_gastronomy/textures/homedecor_beertap_inv.png diff --git a/homedecor/textures/homedecor_bottle_brown.png b/homedecor_gastronomy/textures/homedecor_bottle_brown.png similarity index 100% rename from homedecor/textures/homedecor_bottle_brown.png rename to homedecor_gastronomy/textures/homedecor_bottle_brown.png diff --git a/homedecor/textures/homedecor_bottle_brown2.png b/homedecor_gastronomy/textures/homedecor_bottle_brown2.png similarity index 100% rename from homedecor/textures/homedecor_bottle_brown2.png rename to homedecor_gastronomy/textures/homedecor_bottle_brown2.png diff --git a/homedecor/textures/homedecor_bottle_brown3.png b/homedecor_gastronomy/textures/homedecor_bottle_brown3.png similarity index 100% rename from homedecor/textures/homedecor_bottle_brown3.png rename to homedecor_gastronomy/textures/homedecor_bottle_brown3.png diff --git a/homedecor/textures/homedecor_bottle_brown4.png b/homedecor_gastronomy/textures/homedecor_bottle_brown4.png similarity index 100% rename from homedecor/textures/homedecor_bottle_brown4.png rename to homedecor_gastronomy/textures/homedecor_bottle_brown4.png diff --git a/homedecor/textures/homedecor_bottle_brown_inv.png b/homedecor_gastronomy/textures/homedecor_bottle_brown_inv.png similarity index 100% rename from homedecor/textures/homedecor_bottle_brown_inv.png rename to homedecor_gastronomy/textures/homedecor_bottle_brown_inv.png diff --git a/homedecor/textures/homedecor_bottle_green.png b/homedecor_gastronomy/textures/homedecor_bottle_green.png similarity index 100% rename from homedecor/textures/homedecor_bottle_green.png rename to homedecor_gastronomy/textures/homedecor_bottle_green.png diff --git a/homedecor/textures/homedecor_bottle_green_inv.png b/homedecor_gastronomy/textures/homedecor_bottle_green_inv.png similarity index 100% rename from homedecor/textures/homedecor_bottle_green_inv.png rename to homedecor_gastronomy/textures/homedecor_bottle_green_inv.png diff --git a/homedecor/textures/homedecor_coffeemaker_case.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_case.png similarity index 100% rename from homedecor/textures/homedecor_coffeemaker_case.png rename to homedecor_gastronomy/textures/homedecor_coffeemaker_case.png diff --git a/homedecor/textures/homedecor_coffeemaker_cup.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_cup.png similarity index 100% rename from homedecor/textures/homedecor_coffeemaker_cup.png rename to homedecor_gastronomy/textures/homedecor_coffeemaker_cup.png diff --git a/homedecor/textures/homedecor_coffeemaker_decanter.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_decanter.png similarity index 100% rename from homedecor/textures/homedecor_coffeemaker_decanter.png rename to homedecor_gastronomy/textures/homedecor_coffeemaker_decanter.png diff --git a/homedecor/textures/homedecor_coffeemaker_inv.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_inv.png similarity index 100% rename from homedecor/textures/homedecor_coffeemaker_inv.png rename to homedecor_gastronomy/textures/homedecor_coffeemaker_inv.png diff --git a/homedecor/textures/homedecor_cutlery_set.png b/homedecor_gastronomy/textures/homedecor_cutlery_set.png similarity index 100% rename from homedecor/textures/homedecor_cutlery_set.png rename to homedecor_gastronomy/textures/homedecor_cutlery_set.png diff --git a/homedecor/textures/homedecor_cutlery_set_inv.png b/homedecor_gastronomy/textures/homedecor_cutlery_set_inv.png similarity index 100% rename from homedecor/textures/homedecor_cutlery_set_inv.png rename to homedecor_gastronomy/textures/homedecor_cutlery_set_inv.png diff --git a/homedecor/textures/homedecor_soda_can.png b/homedecor_gastronomy/textures/homedecor_soda_can.png similarity index 100% rename from homedecor/textures/homedecor_soda_can.png rename to homedecor_gastronomy/textures/homedecor_soda_can.png diff --git a/homedecor/textures/homedecor_soda_machine.png b/homedecor_gastronomy/textures/homedecor_soda_machine.png similarity index 100% rename from homedecor/textures/homedecor_soda_machine.png rename to homedecor_gastronomy/textures/homedecor_soda_machine.png diff --git a/homedecor/textures/homedecor_steam.png b/homedecor_gastronomy/textures/homedecor_steam.png similarity index 100% rename from homedecor/textures/homedecor_steam.png rename to homedecor_gastronomy/textures/homedecor_steam.png diff --git a/homedecor/textures/homedecor_toaster_inv.png b/homedecor_gastronomy/textures/homedecor_toaster_inv.png similarity index 100% rename from homedecor/textures/homedecor_toaster_inv.png rename to homedecor_gastronomy/textures/homedecor_toaster_inv.png diff --git a/homedecor/textures/homedecor_toaster_sides.png b/homedecor_gastronomy/textures/homedecor_toaster_sides.png similarity index 100% rename from homedecor/textures/homedecor_toaster_sides.png rename to homedecor_gastronomy/textures/homedecor_toaster_sides.png diff --git a/homedecor/textures/homedecor_toaster_toploaf.png b/homedecor_gastronomy/textures/homedecor_toaster_toploaf.png similarity index 100% rename from homedecor/textures/homedecor_toaster_toploaf.png rename to homedecor_gastronomy/textures/homedecor_toaster_toploaf.png diff --git a/homedecor/textures/homedecor_wine_rack_inv.png b/homedecor_gastronomy/textures/homedecor_wine_rack_inv.png similarity index 100% rename from homedecor/textures/homedecor_wine_rack_inv.png rename to homedecor_gastronomy/textures/homedecor_wine_rack_inv.png diff --git a/homedecor_kitchen/depends.txt b/homedecor_kitchen/depends.txt new file mode 100644 index 00000000..b01982e0 --- /dev/null +++ b/homedecor_kitchen/depends.txt @@ -0,0 +1,9 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +moreblocks? +building_blocks? +technic? +bucket? diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua new file mode 100644 index 00000000..38275a97 --- /dev/null +++ b/homedecor_kitchen/init.lua @@ -0,0 +1,552 @@ +-- This file supplies Kitchen stuff like refrigerators, sinks, etc. + +local S = homedecor_i18n.gettext + +local function N_(x) return x end + +-- steel-textured fridge +homedecor.register("refrigerator_steel", { + mesh = "homedecor_refrigerator.obj", + tiles = { "homedecor_refrigerator_steel.png" }, + inventory_image = "homedecor_refrigerator_steel_inv.png", + description = S("Refrigerator (stainless steel)"), + groups = {snappy=3}, + sounds = default.node_sound_stone_defaults(), + selection_box = homedecor.nodebox.slab_y(2), + collision_box = homedecor.nodebox.slab_y(2), + expand = { top="placeholder" }, + infotext=S("Refrigerator"), + inventory = { + size=50, + lockable=true, + }, + on_rotate = screwdriver.rotate_simple +}) + +-- white, enameled fridge +homedecor.register("refrigerator_white", { + mesh = "homedecor_refrigerator.obj", + tiles = { "homedecor_refrigerator_white.png" }, + inventory_image = "homedecor_refrigerator_white_inv.png", + description = S("Refrigerator"), + groups = {snappy=3}, + selection_box = homedecor.nodebox.slab_y(2), + collision_box = homedecor.nodebox.slab_y(2), + sounds = default.node_sound_stone_defaults(), + expand = { top="placeholder" }, + infotext=S("Refrigerator"), + inventory = { + size=50, + lockable=true, + }, + on_rotate = screwdriver.rotate_simple +}) + +minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") +minetest.register_alias("homedecor:refrigerator_white_top", "air") + +minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel") +minetest.register_alias("homedecor:refrigerator_steel_top", "air") + +minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked") +minetest.register_alias("homedecor:refrigerator_white_top_locked", "air") +minetest.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked") + +minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked") +minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air") + +-- kitchen "furnaces" +homedecor.register_furnace("oven", { + description = S("Oven"), + tile_format = "homedecor_oven_%s%s.png", + output_slots = 4, + output_width = 2, + cook_speed = 1.25, +}) + +homedecor.register_furnace("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("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 = { + node_box = { + type = "fixed", + fixed = { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 }, + }, + }, +}) + +homedecor.register("dishwasher", { + description = S("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" + }, + 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" }, + sounds = default.node_sound_stone_defaults(), + groups = { snappy = 3 }, +}) + +local materials = { N_("granite"), N_("marble"), N_("steel"), N_("wood") } + +for _, m in ipairs(materials) do +homedecor.register("dishwasher_"..m, { + description = S("Dishwasher (@1)", S(m)), + tiles = { + "homedecor_kitchen_cabinet_top_"..m..".png", + "homedecor_dishwasher_bottom.png", + "homedecor_dishwasher_sides.png", + "homedecor_dishwasher_sides.png^[transformFX", + "homedecor_dishwasher_back.png", + "homedecor_dishwasher_front.png" + }, + groups = { snappy = 3 }, + sounds = default.node_sound_stone_defaults(), +}) +end + +local S = homedecor_i18n.gettext + +local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" +local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" + +local function N_(x) return x end + +local counter_materials = { "", N_("granite"), N_("marble"), N_("steel") } + +for _, mat in ipairs(counter_materials) do + + local desc = S("Kitchen Cabinet") + local material = "" + + if mat ~= "" then + desc = S("Kitchen Cabinet (@1 top)", S(mat)) + material = "_"..mat + end + + homedecor.register("kitchen_cabinet"..material, { + description = desc, + tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png', + cabinet_bottom, + cabinet_sides, + cabinet_sides, + cabinet_sides, + 'homedecor_kitchen_cabinet_front.png'}, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Kitchen Cabinet"), + inventory = { + size=24, + lockable=true, + }, + }) +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 = { + cabinet_sides, + cabinet_bottom, + cabinet_sides, + cabinet_sides, + cabinet_sides, + '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, + lockable=true, + }, +}) + +homedecor.register("kitchen_cabinet_with_sink", { + description = S("Kitchen Cabinet with sink"), + mesh = "homedecor_kitchen_sink.obj", + tiles = { + "homedecor_kitchen_sink_top.png", + "homedecor_kitchen_cabinet_front.png", + cabinet_sides, + cabinet_bottom + }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Under-sink cabinet"), + inventory = { + size=16, + lockable=true, + }, + node_box = { + type = "fixed", + fixed = { + { -8/16, -8/16, -8/16, 8/16, 6/16, 8/16 }, + { -8/16, 6/16, -8/16, -6/16, 8/16, 8/16 }, + { 6/16, 6/16, -8/16, 8/16, 8/16, 8/16 }, + { -8/16, 6/16, -8/16, 8/16, 8/16, -6/16 }, + { -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, + } + }, + on_destruct = function(pos) + homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) + end +}) + +local cp_cbox = { + type = "fixed", + fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 } +} + +homedecor.register("copper_pans", { + description = S("Copper pans"), + mesh = "homedecor_copper_pans.obj", + tiles = { "homedecor_polished_copper.png" }, + inventory_image = "homedecor_copper_pans_inv.png", + groups = { snappy=3 }, + selection_box = cp_cbox, + walkable = false, + on_place = minetest.rotate_node +}) + +local kf_cbox = { + type = "fixed", + fixed = { -2/16, -8/16, 1/16, 2/16, -1/16, 8/16 } +} + +homedecor.register("kitchen_faucet", { + mesh = "homedecor_kitchen_faucet.obj", + tiles = { "homedecor_generic_metal_bright.png" }, + inventory_image = "homedecor_kitchen_faucet_inv.png", + description = S("Kitchen Faucet"), + groups = {snappy=3}, + selection_box = kf_cbox, + walkable = false, + on_rotate = screwdriver.disallow, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) + if below and + below.name == "homedecor:sink" or + below.name == "homedecor:kitchen_cabinet_with_sink" or + below.name == "homedecor:kitchen_cabinet_with_sink_locked" then + local particledef = { + outlet = { x = 0, y = -0.19, z = 0.13 }, + velocity_x = { min = -0.05, max = 0.05 }, + velocity_y = -0.3, + velocity_z = { min = -0.1, max = 0 }, + spread = 0 + } + homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") + end + return itemstack + end, + on_destruct = homedecor.stop_particle_spawner +}) + +homedecor.register("paper_towel", { + mesh = "homedecor_paper_towel.obj", + tiles = { + "homedecor_generic_quilted_paper.png", + "default_wood.png" + }, + inventory_image = "homedecor_paper_towel_inv.png", + description = S("Paper towels"), + groups = { snappy=3 }, + walkable = false, + selection_box = { + type = "fixed", + fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } + }, +}) + +-- crafting + + +minetest.register_craft({ + output = "homedecor:oven_steel", + recipe = { + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, + {"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, + } +}) + +minetest.register_craft({ + output = "homedecor:oven_steel", + recipe = { + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, + {"default:steel_ingot", "default:glass", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:oven", + recipe = { + "homedecor:oven_steel", + "dye:white", + "dye:white", + } +}) + +minetest.register_craft({ + output = "homedecor:microwave_oven 2", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, + {"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, + } +}) + +minetest.register_craft({ + output = "homedecor:microwave_oven 2", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, + {"default:steel_ingot", "default:glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, + } +}) + +minetest.register_craft({ + output = "homedecor:refrigerator_steel", + recipe = { + {"default:steel_ingot", "homedecor:glowlight_small_cube", "default:steel_ingot", }, + {"default:steel_ingot", "default:copperblock", "default:steel_ingot", }, + {"default:steel_ingot", "default:clay", "default:steel_ingot", }, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:refrigerator_white", + recipe = { + "homedecor:refrigerator_steel", + "dye:white", + "dye:white", + "dye:white", + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet", + recipe = { + {"group:wood", "group:stick", "group:wood", }, + {"group:wood", "group:stick", "group:wood", }, + {"group:wood", "group:stick", "group:wood", }, + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_steel", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"", "homedecor:kitchen_cabinet", ""}, + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_steel", + recipe = { + {"moreblocks:slab_steelblock_1"}, + { "homedecor:kitchen_cabinet" }, + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_marble", + recipe = { + {"building_blocks:slab_marble"}, + {"homedecor:kitchen_cabinet"}, + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_marble", + recipe = { + {"technic:slab_marble_1"}, + {"homedecor:kitchen_cabinet"}, + } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_granite", + recipe = { + {"technic:slab_granite_1"}, + {"homedecor:kitchen_cabinet"}, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:kitchen_cabinet_half 2", + recipe = { "homedecor:kitchen_cabinet" } +}) + +minetest.register_craft({ + output = "homedecor:kitchen_cabinet_with_sink", + recipe = { + {"group:wood", "default:steel_ingot", "group:wood", }, + {"group:wood", "default:steel_ingot", "group:wood", }, + {"group:wood", "group:stick", "group:wood", }, + } +}) + + +minetest.register_craft( { + output = "homedecor:dishwasher", + recipe = { + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher", + recipe = { + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_wood", + recipe = { + { "stairs:slab_wood" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_wood", + recipe = { + { "moreblocks:slab_wood" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_wood", + recipe = { + { "moreblocks:slab_wood_1" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_steel", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "", "homedecor:dishwasher", "" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_steel", + recipe = { + { "moreblocks:slab_steelblock_1" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_marble", + recipe = { + { "building_blocks:slab_marble" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_marble", + recipe = { + { "technic:slab_marble_1" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:dishwasher_granite", + recipe = { + { "technic:slab_granite_1" }, + { "homedecor:dishwasher" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:kitchen_faucet", + recipe = { + { "", "default:steel_ingot" }, + { "default:steel_ingot", "" }, + { "homedecor:taps", "" } + }, +}) + +minetest.register_craft( { + output = "homedecor:cutlery_set", + recipe = { + { "", "vessels:drinking_glass", "" }, + { "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:cutlery_set", + recipe = { + { "", "vessels:drinking_glass", "" }, + { "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:copper_pans", + recipe = { + { "basic_materials:copper_strip","","basic_materials:copper_strip" }, + { "default:copper_ingot","","default:copper_ingot" }, + { "default:copper_ingot","","default:copper_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:paper_towel", + recipe = { + { "homedecor:toilet_paper", "homedecor:toilet_paper" } + }, +}) diff --git a/homedecor/models/homedecor_copper_pans.obj b/homedecor_kitchen/models/homedecor_copper_pans.obj similarity index 100% rename from homedecor/models/homedecor_copper_pans.obj rename to homedecor_kitchen/models/homedecor_copper_pans.obj diff --git a/homedecor/models/homedecor_kitchen_faucet.obj b/homedecor_kitchen/models/homedecor_kitchen_faucet.obj similarity index 100% rename from homedecor/models/homedecor_kitchen_faucet.obj rename to homedecor_kitchen/models/homedecor_kitchen_faucet.obj diff --git a/homedecor/models/homedecor_kitchen_sink.obj b/homedecor_kitchen/models/homedecor_kitchen_sink.obj similarity index 100% rename from homedecor/models/homedecor_kitchen_sink.obj rename to homedecor_kitchen/models/homedecor_kitchen_sink.obj diff --git a/homedecor/models/homedecor_paper_towel.obj b/homedecor_kitchen/models/homedecor_paper_towel.obj similarity index 100% rename from homedecor/models/homedecor_paper_towel.obj rename to homedecor_kitchen/models/homedecor_paper_towel.obj diff --git a/homedecor/models/homedecor_refrigerator.obj b/homedecor_kitchen/models/homedecor_refrigerator.obj similarity index 100% rename from homedecor/models/homedecor_refrigerator.obj rename to homedecor_kitchen/models/homedecor_refrigerator.obj diff --git a/homedecor/textures/homedecor_copper_pans_inv.png b/homedecor_kitchen/textures/homedecor_copper_pans_inv.png similarity index 100% rename from homedecor/textures/homedecor_copper_pans_inv.png rename to homedecor_kitchen/textures/homedecor_copper_pans_inv.png diff --git a/homedecor/textures/homedecor_dishwasher_back.png b/homedecor_kitchen/textures/homedecor_dishwasher_back.png similarity index 100% rename from homedecor/textures/homedecor_dishwasher_back.png rename to homedecor_kitchen/textures/homedecor_dishwasher_back.png diff --git a/homedecor/textures/homedecor_dishwasher_bottom.png b/homedecor_kitchen/textures/homedecor_dishwasher_bottom.png similarity index 100% rename from homedecor/textures/homedecor_dishwasher_bottom.png rename to homedecor_kitchen/textures/homedecor_dishwasher_bottom.png diff --git a/homedecor/textures/homedecor_dishwasher_front.png b/homedecor_kitchen/textures/homedecor_dishwasher_front.png similarity index 100% rename from homedecor/textures/homedecor_dishwasher_front.png rename to homedecor_kitchen/textures/homedecor_dishwasher_front.png diff --git a/homedecor/textures/homedecor_dishwasher_sides.png b/homedecor_kitchen/textures/homedecor_dishwasher_sides.png similarity index 100% rename from homedecor/textures/homedecor_dishwasher_sides.png rename to homedecor_kitchen/textures/homedecor_dishwasher_sides.png diff --git a/homedecor/textures/homedecor_dishwasher_top.png b/homedecor_kitchen/textures/homedecor_dishwasher_top.png similarity index 100% rename from homedecor/textures/homedecor_dishwasher_top.png rename to homedecor_kitchen/textures/homedecor_dishwasher_top.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_bevel.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_bevel.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_front.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_front.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_front_half.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_front_half.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_top.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_top.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_granite.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_top_granite.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_granite.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_marble.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_marble.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_top_marble.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_marble.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_steel.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_steel.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_top_steel.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_steel.png diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_wood.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_wood.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_cabinet_top_wood.png rename to homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_wood.png diff --git a/homedecor/textures/homedecor_kitchen_faucet_inv.png b/homedecor_kitchen/textures/homedecor_kitchen_faucet_inv.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_faucet_inv.png rename to homedecor_kitchen/textures/homedecor_kitchen_faucet_inv.png diff --git a/homedecor/textures/homedecor_kitchen_sink_top.png b/homedecor_kitchen/textures/homedecor_kitchen_sink_top.png similarity index 100% rename from homedecor/textures/homedecor_kitchen_sink_top.png rename to homedecor_kitchen/textures/homedecor_kitchen_sink_top.png diff --git a/homedecor/textures/homedecor_microwave_front.png b/homedecor_kitchen/textures/homedecor_microwave_front.png similarity index 100% rename from homedecor/textures/homedecor_microwave_front.png rename to homedecor_kitchen/textures/homedecor_microwave_front.png diff --git a/homedecor/textures/homedecor_microwave_front_active.png b/homedecor_kitchen/textures/homedecor_microwave_front_active.png similarity index 100% rename from homedecor/textures/homedecor_microwave_front_active.png rename to homedecor_kitchen/textures/homedecor_microwave_front_active.png diff --git a/homedecor/textures/homedecor_microwave_top.png b/homedecor_kitchen/textures/homedecor_microwave_top.png similarity index 100% rename from homedecor/textures/homedecor_microwave_top.png rename to homedecor_kitchen/textures/homedecor_microwave_top.png diff --git a/homedecor/textures/homedecor_oven_bottom.png b/homedecor_kitchen/textures/homedecor_oven_bottom.png similarity index 100% rename from homedecor/textures/homedecor_oven_bottom.png rename to homedecor_kitchen/textures/homedecor_oven_bottom.png diff --git a/homedecor/textures/homedecor_oven_front.png b/homedecor_kitchen/textures/homedecor_oven_front.png similarity index 100% rename from homedecor/textures/homedecor_oven_front.png rename to homedecor_kitchen/textures/homedecor_oven_front.png diff --git a/homedecor/textures/homedecor_oven_front_active.png b/homedecor_kitchen/textures/homedecor_oven_front_active.png similarity index 100% rename from homedecor/textures/homedecor_oven_front_active.png rename to homedecor_kitchen/textures/homedecor_oven_front_active.png diff --git a/homedecor/textures/homedecor_oven_side.png b/homedecor_kitchen/textures/homedecor_oven_side.png similarity index 100% rename from homedecor/textures/homedecor_oven_side.png rename to homedecor_kitchen/textures/homedecor_oven_side.png diff --git a/homedecor/textures/homedecor_oven_steel_bottom.png b/homedecor_kitchen/textures/homedecor_oven_steel_bottom.png similarity index 100% rename from homedecor/textures/homedecor_oven_steel_bottom.png rename to homedecor_kitchen/textures/homedecor_oven_steel_bottom.png diff --git a/homedecor/textures/homedecor_oven_steel_front.png b/homedecor_kitchen/textures/homedecor_oven_steel_front.png similarity index 100% rename from homedecor/textures/homedecor_oven_steel_front.png rename to homedecor_kitchen/textures/homedecor_oven_steel_front.png diff --git a/homedecor/textures/homedecor_oven_steel_front_active.png b/homedecor_kitchen/textures/homedecor_oven_steel_front_active.png similarity index 100% rename from homedecor/textures/homedecor_oven_steel_front_active.png rename to homedecor_kitchen/textures/homedecor_oven_steel_front_active.png diff --git a/homedecor/textures/homedecor_oven_steel_side.png b/homedecor_kitchen/textures/homedecor_oven_steel_side.png similarity index 100% rename from homedecor/textures/homedecor_oven_steel_side.png rename to homedecor_kitchen/textures/homedecor_oven_steel_side.png diff --git a/homedecor/textures/homedecor_oven_steel_top.png b/homedecor_kitchen/textures/homedecor_oven_steel_top.png similarity index 100% rename from homedecor/textures/homedecor_oven_steel_top.png rename to homedecor_kitchen/textures/homedecor_oven_steel_top.png diff --git a/homedecor/textures/homedecor_oven_top.png b/homedecor_kitchen/textures/homedecor_oven_top.png similarity index 100% rename from homedecor/textures/homedecor_oven_top.png rename to homedecor_kitchen/textures/homedecor_oven_top.png diff --git a/homedecor/textures/homedecor_paper_towel_inv.png b/homedecor_kitchen/textures/homedecor_paper_towel_inv.png similarity index 100% rename from homedecor/textures/homedecor_paper_towel_inv.png rename to homedecor_kitchen/textures/homedecor_paper_towel_inv.png diff --git a/homedecor/textures/homedecor_refrigerator_steel.png b/homedecor_kitchen/textures/homedecor_refrigerator_steel.png similarity index 100% rename from homedecor/textures/homedecor_refrigerator_steel.png rename to homedecor_kitchen/textures/homedecor_refrigerator_steel.png diff --git a/homedecor/textures/homedecor_refrigerator_steel_inv.png b/homedecor_kitchen/textures/homedecor_refrigerator_steel_inv.png similarity index 100% rename from homedecor/textures/homedecor_refrigerator_steel_inv.png rename to homedecor_kitchen/textures/homedecor_refrigerator_steel_inv.png diff --git a/homedecor/textures/homedecor_refrigerator_white.png b/homedecor_kitchen/textures/homedecor_refrigerator_white.png similarity index 100% rename from homedecor/textures/homedecor_refrigerator_white.png rename to homedecor_kitchen/textures/homedecor_refrigerator_white.png diff --git a/homedecor/textures/homedecor_refrigerator_white_inv.png b/homedecor_kitchen/textures/homedecor_refrigerator_white_inv.png similarity index 100% rename from homedecor/textures/homedecor_refrigerator_white_inv.png rename to homedecor_kitchen/textures/homedecor_refrigerator_white_inv.png diff --git a/homedecor_laundry/depends.txt b/homedecor_laundry/depends.txt new file mode 100644 index 00000000..480f9332 --- /dev/null +++ b/homedecor_laundry/depends.txt @@ -0,0 +1,5 @@ +homedecor_common +default +basic_materials +homedecor_i18n +bucket? diff --git a/homedecor_laundry/init.lua b/homedecor_laundry/init.lua new file mode 100644 index 00000000..ee59c8c7 --- /dev/null +++ b/homedecor_laundry/init.lua @@ -0,0 +1,112 @@ +-- laundry devices + +homedecor.register("washing_machine", { + description = "Washing Machine", + tiles = { + "homedecor_washing_machine_top.png", + "homedecor_washing_machine_bottom.png", + "homedecor_washing_machine_sides.png", + "homedecor_washing_machine_sides.png^[transformFX", + "homedecor_washing_machine_back.png", + "homedecor_washing_machine_front.png" + }, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.375, 0.375}, + {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, + } + }, + selection_box = { type = "regular" }, + groups = { snappy = 3 }, +}) + +homedecor.register("dryer", { + description = "Tumble dryer", + tiles = { + "homedecor_dryer_top.png", + "homedecor_dryer_bottom.png", + "homedecor_dryer_sides.png", + "homedecor_dryer_sides.png^[transformFX", + "homedecor_dryer_back.png", + "homedecor_dryer_front.png" + }, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.375, 0.375}, + {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, + } + }, + selection_box = { type = "regular" }, + groups = { snappy = 3 }, +}) + +local ib_cbox = { + type = "fixed", + fixed = { -6/16, -8/16, -4/16, 17/16, 4/16, 4/16 } +} + +homedecor.register("ironing_board", { + description = "Ironing board", + mesh = "homedecor_ironing_board.obj", + tiles = { + "wool_grey.png", + { name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }, + }, + expand = {right = "placeholder"}, + groups = { snappy = 3 }, + selection_box = ib_cbox, + collision_box = ib_cbox +}) + +-- crafting + + +-- laundry stuff + +minetest.register_craft( { + output = "homedecor:washing_machine", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:washing_machine", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:dryer", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:dryer", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:ironing_board", + recipe = { + { "wool:grey", "wool:grey", "wool:grey"}, + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "", "default:steel_ingot" } + }, +}) + diff --git a/homedecor/models/homedecor_ironing_board.obj b/homedecor_laundry/models/homedecor_ironing_board.obj similarity index 100% rename from homedecor/models/homedecor_ironing_board.obj rename to homedecor_laundry/models/homedecor_ironing_board.obj diff --git a/homedecor/textures/homedecor_dryer_back.png b/homedecor_laundry/textures/homedecor_dryer_back.png similarity index 100% rename from homedecor/textures/homedecor_dryer_back.png rename to homedecor_laundry/textures/homedecor_dryer_back.png diff --git a/homedecor/textures/homedecor_dryer_bottom.png b/homedecor_laundry/textures/homedecor_dryer_bottom.png similarity index 100% rename from homedecor/textures/homedecor_dryer_bottom.png rename to homedecor_laundry/textures/homedecor_dryer_bottom.png diff --git a/homedecor/textures/homedecor_dryer_front.png b/homedecor_laundry/textures/homedecor_dryer_front.png similarity index 100% rename from homedecor/textures/homedecor_dryer_front.png rename to homedecor_laundry/textures/homedecor_dryer_front.png diff --git a/homedecor/textures/homedecor_dryer_sides.png b/homedecor_laundry/textures/homedecor_dryer_sides.png similarity index 100% rename from homedecor/textures/homedecor_dryer_sides.png rename to homedecor_laundry/textures/homedecor_dryer_sides.png diff --git a/homedecor/textures/homedecor_dryer_top.png b/homedecor_laundry/textures/homedecor_dryer_top.png similarity index 100% rename from homedecor/textures/homedecor_dryer_top.png rename to homedecor_laundry/textures/homedecor_dryer_top.png diff --git a/homedecor/textures/homedecor_washing_machine_back.png b/homedecor_laundry/textures/homedecor_washing_machine_back.png similarity index 100% rename from homedecor/textures/homedecor_washing_machine_back.png rename to homedecor_laundry/textures/homedecor_washing_machine_back.png diff --git a/homedecor/textures/homedecor_washing_machine_bottom.png b/homedecor_laundry/textures/homedecor_washing_machine_bottom.png similarity index 100% rename from homedecor/textures/homedecor_washing_machine_bottom.png rename to homedecor_laundry/textures/homedecor_washing_machine_bottom.png diff --git a/homedecor/textures/homedecor_washing_machine_front.png b/homedecor_laundry/textures/homedecor_washing_machine_front.png similarity index 100% rename from homedecor/textures/homedecor_washing_machine_front.png rename to homedecor_laundry/textures/homedecor_washing_machine_front.png diff --git a/homedecor/textures/homedecor_washing_machine_sides.png b/homedecor_laundry/textures/homedecor_washing_machine_sides.png similarity index 100% rename from homedecor/textures/homedecor_washing_machine_sides.png rename to homedecor_laundry/textures/homedecor_washing_machine_sides.png diff --git a/homedecor/textures/homedecor_washing_machine_top.png b/homedecor_laundry/textures/homedecor_washing_machine_top.png similarity index 100% rename from homedecor/textures/homedecor_washing_machine_top.png rename to homedecor_laundry/textures/homedecor_washing_machine_top.png diff --git a/homedecor/depends.txt b/homedecor_lighting/depends.txt similarity index 51% rename from homedecor/depends.txt rename to homedecor_lighting/depends.txt index ec574795..4187addc 100644 --- a/homedecor/depends.txt +++ b/homedecor_lighting/depends.txt @@ -1,19 +1,9 @@ +homedecor_common default basic_materials unifieddyes homedecor_i18n creative -currency? -building_blocks? -signs_lib? moreblocks? -technic? -dye? -bees? -bucket? -beds? -flowers? -3d_armor? -skinsdb? -mesecons? +building_blocks? darkage? diff --git a/homedecor/lighting.lua b/homedecor_lighting/init.lua similarity index 76% rename from homedecor/lighting.lua rename to homedecor_lighting/init.lua index 67c54d6e..2e508021 100644 --- a/homedecor/lighting.lua +++ b/homedecor_lighting/init.lua @@ -11,7 +11,7 @@ local glowlight_nodebox = { }, } -minetest.register_node("homedecor:glowlight_half", { +minetest.register_node(":homedecor:glowlight_half", { description = S("Thick Glowlight"), tiles = { "homedecor_glowlight_top.png", @@ -49,7 +49,7 @@ minetest.register_node("homedecor:glowlight_half", { end, }) -minetest.register_node("homedecor:glowlight_quarter", { +minetest.register_node(":homedecor:glowlight_quarter", { description = S("Thin Glowlight"), tiles = { "homedecor_glowlight_top.png", @@ -87,7 +87,7 @@ minetest.register_node("homedecor:glowlight_quarter", { end, }) -minetest.register_node("homedecor:glowlight_small_cube", { +minetest.register_node(":homedecor:glowlight_small_cube", { description = S("Small Glowlight Cube"), tiles = { "homedecor_glowlight_cube_tb.png", @@ -602,7 +602,7 @@ for _, power in ipairs(lamp_power) do end minetest.register_lbm({ - name = "homedecor:convert_lighting", + name = ":homedecor:convert_lighting", label = "Convert homedecor glowlights, table lamps, and standing lamps to use param2 color", run_at_every_load = false, nodenames = homedecor.old_static_nodes, @@ -707,7 +707,7 @@ homedecor.old_static_desk_lamps = { } minetest.register_lbm({ - name = "homedecor:convert_desk_lamps", + name = ":homedecor:convert_desk_lamps", label = "Convert homedecor desk lamps to use param2 color", run_at_every_load = false, nodenames = homedecor.old_static_desk_lamps, @@ -756,7 +756,7 @@ local topchains_sbox = { } } -minetest.register_node("homedecor:chain_steel_top", { +minetest.register_node(":homedecor:chain_steel_top", { description = S("Hanging chain (ceiling mount, steel)"), drawtype = "mesh", mesh = "homedecor_chains_top.obj", @@ -770,7 +770,7 @@ minetest.register_node("homedecor:chain_steel_top", { selection_box = topchains_sbox, }) -minetest.register_node("homedecor:chain_brass_top", { +minetest.register_node(":homedecor:chain_brass_top", { description = S("Hanging chain (ceiling mount, brass)"), drawtype = "mesh", mesh = "homedecor_chains_top.obj", @@ -784,7 +784,7 @@ minetest.register_node("homedecor:chain_brass_top", { selection_box = topchains_sbox, }) -minetest.register_node("homedecor:chandelier_steel", { +minetest.register_node(":homedecor:chandelier_steel", { description = S("Chandelier (steel)"), paramtype = "light", light_source = 12, @@ -810,7 +810,7 @@ minetest.register_node("homedecor:chandelier_steel", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("homedecor:chandelier_brass", { +minetest.register_node(":homedecor:chandelier_brass", { description = S("Chandelier (brass)"), paramtype = "light", light_source = 12, @@ -836,7 +836,7 @@ minetest.register_node("homedecor:chandelier_brass", { sounds = default.node_sound_stone_defaults(), }) --- crafts +-- crafting minetest.register_craft({ output = 'homedecor:chain_steel_top', @@ -874,6 +874,322 @@ minetest.register_craft({ } }) +-- candles + +minetest.register_craft({ + output = "homedecor:candle_thin 4", + recipe = { + {"farming:string" }, + {"basic_materials:paraffin" } + } +}) + +minetest.register_craft({ + output = "homedecor:candle 2", + recipe = { + {"farming:string" }, + {"basic_materials:paraffin" }, + {"basic_materials:paraffin" } + } +}) + +minetest.register_craft({ + output = "homedecor:wall_sconce 2", + recipe = { + {"default:iron_lump", "", ""}, + {"default:iron_lump", "homedecor:candle", ""}, + {"default:iron_lump", "", ""}, + } +}) + +minetest.register_craft({ + output = "homedecor:candlestick_wrought_iron", + recipe = { + {""}, + {"homedecor:candle_thin"}, + {"default:iron_lump"}, + } +}) + +minetest.register_craft({ + output = "homedecor:candlestick_brass", + recipe = { + {""}, + {"homedecor:candle_thin"}, + {"basic_materials:brass_ingot"}, + } +}) + +minetest.register_craft({ + output = "homedecor:oil_lamp", + recipe = { + { "", "vessels:glass_bottle", "" }, + { "", "farming:string", "" }, + { "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" } + } +}) + +minetest.register_craft({ + output = "homedecor:oil_lamp_tabletop", + recipe = { + { "", "vessels:glass_bottle", "" }, + { "", "farming:string", "" }, + { "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" } + } +}) + +-- Wrought-iron wall latern + +minetest.register_craft({ + output = "homedecor:ground_lantern", + recipe = { + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + { "default:iron_lump", "default:torch", "default:iron_lump" }, + { "", "default:iron_lump", "" } + } +}) + +-- wood-lattice lamps + +if minetest.get_modpath("darkage") then + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { + { "darkage:lamp" }, + }, + }) + + minetest.register_craft( { + output = "darkage:lamp", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) +else + minetest.register_craft( { + output = "homedecor:lattice_lantern_large 2", + recipe = { + { "dye:black", "dye:yellow", "dye:black" }, + { "group:stick", "building_blocks:woodglass", "group:stick" }, + { "group:stick", "basic_materials:energy_crystal_simple", "group:stick" } + }, + }) + + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { + { "homedecor:lattice_lantern_large" }, + }, + }) + + minetest.register_craft( { + output = "homedecor:lattice_lantern_large", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) +end + +-- glowlights + +minetest.register_craft({ + output = "homedecor:glowlight_half 6", + recipe = { + { "default:glass", "basic_materials:energy_crystal_simple", "default:glass", }, + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_half 6", + recipe = { + {"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", }, + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_half", + recipe = { + {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}, + {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"} + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_half", + type = "shapeless", + recipe = { + "homedecor:glowlight_quarter", + "homedecor:glowlight_quarter" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_half", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_half", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_quarter 6", + recipe = { + {"homedecor:glowlight_half", "homedecor:glowlight_half", "homedecor:glowlight_half", }, + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_quarter", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_quarter", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_small_cube 8", + recipe = { + { "dye:white" }, + { "default:glass" }, + { "basic_materials:energy_crystal_simple" }, + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_small_cube 8", + recipe = { + {"dye:white" }, + {"moreblocks:super_glow_glass" }, + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_small_cube 4", + recipe = { + {"homedecor:glowlight_half" }, + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:glowlight_small_cube", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:glowlight_small_cube", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +---- + +minetest.register_craft({ + output = "homedecor:plasma_lamp", + recipe = { + {"", "default:glass", ""}, + {"default:glass", "basic_materials:energy_crystal_simple", "default:glass"}, + {"", "default:glass", ""} + } +}) + +minetest.register_craft({ + output = "homedecor:plasma_ball 2", + recipe = { + {"", "default:glass", ""}, + {"default:glass", "default:copper_ingot", "default:glass"}, + {"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"} + } +}) + + +minetest.register_craft({ + output = "homedecor:desk_lamp 2", + recipe = { + { "", "default:steel_ingot", "homedecor:glowlight_small_cube" }, + { "", "basic_materials:steel_strip", "" }, + { "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:desk_lamp", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:desk_lamp", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + output = "homedecor:hanging_lantern 2", + recipe = { + { "default:iron_lump", "default:iron_lump", "" }, + { "default:iron_lump", "homedecor:lattice_lantern_large", "" }, + { "default:iron_lump", "", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:ceiling_lantern 2", + recipe = { + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + { "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" }, + { "", "default:iron_lump", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:wall_lamp 2", + recipe = { + { "", "homedecor:lattice_lantern_large", "" }, + { "default:iron_lump", "group:stick", "" }, + { "default:iron_lump", "group:stick", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:ceiling_lamp", + recipe = { + { "", "basic_materials:brass_ingot", ""}, + { "", "basic_materials:chainlink_brass", ""}, + { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} + }, +}) + +minetest.register_craft({ + output = "homedecor:ceiling_lamp", + recipe = { + { "", "basic_materials:chain_steel_top_brass", ""}, + { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} + }, +}) + +-- aliases + minetest.register_alias("chains:chain_top", "homedecor:chain_steel_top") minetest.register_alias("chains:chain_top_brass", "homedecor:chain_brass_top") diff --git a/homedecor/models/homedecor_candle_thick.obj b/homedecor_lighting/models/homedecor_candle_thick.obj similarity index 100% rename from homedecor/models/homedecor_candle_thick.obj rename to homedecor_lighting/models/homedecor_candle_thick.obj diff --git a/homedecor/models/homedecor_candle_thin.obj b/homedecor_lighting/models/homedecor_candle_thin.obj similarity index 100% rename from homedecor/models/homedecor_candle_thin.obj rename to homedecor_lighting/models/homedecor_candle_thin.obj diff --git a/homedecor/models/homedecor_candlestick.obj b/homedecor_lighting/models/homedecor_candlestick.obj similarity index 100% rename from homedecor/models/homedecor_candlestick.obj rename to homedecor_lighting/models/homedecor_candlestick.obj diff --git a/homedecor/models/homedecor_ceiling_lamp.obj b/homedecor_lighting/models/homedecor_ceiling_lamp.obj similarity index 100% rename from homedecor/models/homedecor_ceiling_lamp.obj rename to homedecor_lighting/models/homedecor_ceiling_lamp.obj diff --git a/homedecor/models/homedecor_ceiling_lantern.obj b/homedecor_lighting/models/homedecor_ceiling_lantern.obj similarity index 100% rename from homedecor/models/homedecor_ceiling_lantern.obj rename to homedecor_lighting/models/homedecor_ceiling_lantern.obj diff --git a/homedecor/models/homedecor_chains_top.obj b/homedecor_lighting/models/homedecor_chains_top.obj similarity index 100% rename from homedecor/models/homedecor_chains_top.obj rename to homedecor_lighting/models/homedecor_chains_top.obj diff --git a/homedecor/models/homedecor_chandelier.obj b/homedecor_lighting/models/homedecor_chandelier.obj similarity index 100% rename from homedecor/models/homedecor_chandelier.obj rename to homedecor_lighting/models/homedecor_chandelier.obj diff --git a/homedecor/models/homedecor_desk_lamp.obj b/homedecor_lighting/models/homedecor_desk_lamp.obj similarity index 100% rename from homedecor/models/homedecor_desk_lamp.obj rename to homedecor_lighting/models/homedecor_desk_lamp.obj diff --git a/homedecor/models/homedecor_ground_lantern.obj b/homedecor_lighting/models/homedecor_ground_lantern.obj similarity index 100% rename from homedecor/models/homedecor_ground_lantern.obj rename to homedecor_lighting/models/homedecor_ground_lantern.obj diff --git a/homedecor/models/homedecor_hanging_lantern.obj b/homedecor_lighting/models/homedecor_hanging_lantern.obj similarity index 100% rename from homedecor/models/homedecor_hanging_lantern.obj rename to homedecor_lighting/models/homedecor_hanging_lantern.obj diff --git a/homedecor/models/homedecor_oil_lamp.obj b/homedecor_lighting/models/homedecor_oil_lamp.obj similarity index 100% rename from homedecor/models/homedecor_oil_lamp.obj rename to homedecor_lighting/models/homedecor_oil_lamp.obj diff --git a/homedecor/models/homedecor_oil_lamp_tabletop.obj b/homedecor_lighting/models/homedecor_oil_lamp_tabletop.obj similarity index 100% rename from homedecor/models/homedecor_oil_lamp_tabletop.obj rename to homedecor_lighting/models/homedecor_oil_lamp_tabletop.obj diff --git a/homedecor/models/homedecor_plasma_ball.obj b/homedecor_lighting/models/homedecor_plasma_ball.obj similarity index 100% rename from homedecor/models/homedecor_plasma_ball.obj rename to homedecor_lighting/models/homedecor_plasma_ball.obj diff --git a/homedecor/models/homedecor_standing_lamp.obj b/homedecor_lighting/models/homedecor_standing_lamp.obj similarity index 100% rename from homedecor/models/homedecor_standing_lamp.obj rename to homedecor_lighting/models/homedecor_standing_lamp.obj diff --git a/homedecor/models/homedecor_table_lamp.obj b/homedecor_lighting/models/homedecor_table_lamp.obj similarity index 100% rename from homedecor/models/homedecor_table_lamp.obj rename to homedecor_lighting/models/homedecor_table_lamp.obj diff --git a/homedecor/models/homedecor_wall_sconce.obj b/homedecor_lighting/models/homedecor_wall_sconce.obj similarity index 100% rename from homedecor/models/homedecor_wall_sconce.obj rename to homedecor_lighting/models/homedecor_wall_sconce.obj diff --git a/homedecor/models/plasma_lamp.obj b/homedecor_lighting/models/plasma_lamp.obj similarity index 100% rename from homedecor/models/plasma_lamp.obj rename to homedecor_lighting/models/plasma_lamp.obj diff --git a/homedecor/textures/homedecor_candle_flame.png b/homedecor_lighting/textures/homedecor_candle_flame.png similarity index 100% rename from homedecor/textures/homedecor_candle_flame.png rename to homedecor_lighting/textures/homedecor_candle_flame.png diff --git a/homedecor/textures/homedecor_candle_flat.png b/homedecor_lighting/textures/homedecor_candle_flat.png similarity index 100% rename from homedecor/textures/homedecor_candle_flat.png rename to homedecor_lighting/textures/homedecor_candle_flat.png diff --git a/homedecor/textures/homedecor_candle_inv.png b/homedecor_lighting/textures/homedecor_candle_inv.png similarity index 100% rename from homedecor/textures/homedecor_candle_inv.png rename to homedecor_lighting/textures/homedecor_candle_inv.png diff --git a/homedecor/textures/homedecor_candle_sides.png b/homedecor_lighting/textures/homedecor_candle_sides.png similarity index 100% rename from homedecor/textures/homedecor_candle_sides.png rename to homedecor_lighting/textures/homedecor_candle_sides.png diff --git a/homedecor/textures/homedecor_candle_thin_inv.png b/homedecor_lighting/textures/homedecor_candle_thin_inv.png similarity index 100% rename from homedecor/textures/homedecor_candle_thin_inv.png rename to homedecor_lighting/textures/homedecor_candle_thin_inv.png diff --git a/homedecor/textures/homedecor_candlestick_brass_inv.png b/homedecor_lighting/textures/homedecor_candlestick_brass_inv.png similarity index 100% rename from homedecor/textures/homedecor_candlestick_brass_inv.png rename to homedecor_lighting/textures/homedecor_candlestick_brass_inv.png diff --git a/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png b/homedecor_lighting/textures/homedecor_candlestick_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/homedecor_candlestick_wrought_iron_inv.png rename to homedecor_lighting/textures/homedecor_candlestick_wrought_iron_inv.png diff --git a/homedecor/textures/homedecor_ceiling_lamp_glass.png b/homedecor_lighting/textures/homedecor_ceiling_lamp_glass.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_lamp_glass.png rename to homedecor_lighting/textures/homedecor_ceiling_lamp_glass.png diff --git a/homedecor/textures/homedecor_ceiling_lamp_inv.png b/homedecor_lighting/textures/homedecor_ceiling_lamp_inv.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_lamp_inv.png rename to homedecor_lighting/textures/homedecor_ceiling_lamp_inv.png diff --git a/homedecor/textures/homedecor_ceiling_lantern_inv.png b/homedecor_lighting/textures/homedecor_ceiling_lantern_inv.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_lantern_inv.png rename to homedecor_lighting/textures/homedecor_ceiling_lantern_inv.png diff --git a/homedecor/textures/homedecor_desk_lamp_inv.png b/homedecor_lighting/textures/homedecor_desk_lamp_inv.png similarity index 100% rename from homedecor/textures/homedecor_desk_lamp_inv.png rename to homedecor_lighting/textures/homedecor_desk_lamp_inv.png diff --git a/homedecor/textures/homedecor_glowlight_bottom.png b/homedecor_lighting/textures/homedecor_glowlight_bottom.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_bottom.png rename to homedecor_lighting/textures/homedecor_glowlight_bottom.png diff --git a/homedecor/textures/homedecor_glowlight_cube_sides.png b/homedecor_lighting/textures/homedecor_glowlight_cube_sides.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_cube_sides.png rename to homedecor_lighting/textures/homedecor_glowlight_cube_sides.png diff --git a/homedecor/textures/homedecor_glowlight_cube_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_cube_sides_overlay.png rename to homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png diff --git a/homedecor/textures/homedecor_glowlight_cube_tb.png b/homedecor_lighting/textures/homedecor_glowlight_cube_tb.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_cube_tb.png rename to homedecor_lighting/textures/homedecor_glowlight_cube_tb.png diff --git a/homedecor/textures/homedecor_glowlight_cube_tb_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_cube_tb_overlay.png rename to homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png diff --git a/homedecor/textures/homedecor_glowlight_thick_sides.png b/homedecor_lighting/textures/homedecor_glowlight_thick_sides.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_thick_sides.png rename to homedecor_lighting/textures/homedecor_glowlight_thick_sides.png diff --git a/homedecor/textures/homedecor_glowlight_thick_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_thick_sides_overlay.png rename to homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png diff --git a/homedecor/textures/homedecor_glowlight_thin_sides.png b/homedecor_lighting/textures/homedecor_glowlight_thin_sides.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_thin_sides.png rename to homedecor_lighting/textures/homedecor_glowlight_thin_sides.png diff --git a/homedecor/textures/homedecor_glowlight_thin_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_thin_sides_overlay.png rename to homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png diff --git a/homedecor/textures/homedecor_glowlight_top.png b/homedecor_lighting/textures/homedecor_glowlight_top.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_top.png rename to homedecor_lighting/textures/homedecor_glowlight_top.png diff --git a/homedecor/textures/homedecor_glowlight_top_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_top_overlay.png similarity index 100% rename from homedecor/textures/homedecor_glowlight_top_overlay.png rename to homedecor_lighting/textures/homedecor_glowlight_top_overlay.png diff --git a/homedecor/textures/homedecor_ground_lantern_inv.png b/homedecor_lighting/textures/homedecor_ground_lantern_inv.png similarity index 100% rename from homedecor/textures/homedecor_ground_lantern_inv.png rename to homedecor_lighting/textures/homedecor_ground_lantern_inv.png diff --git a/homedecor/textures/homedecor_hanging_lantern_inv.png b/homedecor_lighting/textures/homedecor_hanging_lantern_inv.png similarity index 100% rename from homedecor/textures/homedecor_hanging_lantern_inv.png rename to homedecor_lighting/textures/homedecor_hanging_lantern_inv.png diff --git a/homedecor/textures/homedecor_lattice_lantern_large.png b/homedecor_lighting/textures/homedecor_lattice_lantern_large.png similarity index 100% rename from homedecor/textures/homedecor_lattice_lantern_large.png rename to homedecor_lighting/textures/homedecor_lattice_lantern_large.png diff --git a/homedecor/textures/homedecor_lattice_lantern_small_sides.png b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png similarity index 100% rename from homedecor/textures/homedecor_lattice_lantern_small_sides.png rename to homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png diff --git a/homedecor/textures/homedecor_lattice_lantern_small_tb.png b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png similarity index 100% rename from homedecor/textures/homedecor_lattice_lantern_small_tb.png rename to homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png diff --git a/homedecor/textures/homedecor_oil_lamp_glass.png b/homedecor_lighting/textures/homedecor_oil_lamp_glass.png similarity index 100% rename from homedecor/textures/homedecor_oil_lamp_glass.png rename to homedecor_lighting/textures/homedecor_oil_lamp_glass.png diff --git a/homedecor/textures/homedecor_oil_lamp_inv.png b/homedecor_lighting/textures/homedecor_oil_lamp_inv.png similarity index 100% rename from homedecor/textures/homedecor_oil_lamp_inv.png rename to homedecor_lighting/textures/homedecor_oil_lamp_inv.png diff --git a/homedecor/textures/homedecor_oil_lamp_tabletop.png b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop.png similarity index 100% rename from homedecor/textures/homedecor_oil_lamp_tabletop.png rename to homedecor_lighting/textures/homedecor_oil_lamp_tabletop.png diff --git a/homedecor/textures/homedecor_oil_lamp_tabletop_inv.png b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop_inv.png similarity index 100% rename from homedecor/textures/homedecor_oil_lamp_tabletop_inv.png rename to homedecor_lighting/textures/homedecor_oil_lamp_tabletop_inv.png diff --git a/homedecor/textures/homedecor_oil_lamp_wick.png b/homedecor_lighting/textures/homedecor_oil_lamp_wick.png similarity index 100% rename from homedecor/textures/homedecor_oil_lamp_wick.png rename to homedecor_lighting/textures/homedecor_oil_lamp_wick.png diff --git a/homedecor/textures/homedecor_plasma_ball_glass.png b/homedecor_lighting/textures/homedecor_plasma_ball_glass.png similarity index 100% rename from homedecor/textures/homedecor_plasma_ball_glass.png rename to homedecor_lighting/textures/homedecor_plasma_ball_glass.png diff --git a/homedecor/textures/homedecor_plasma_ball_inv.png b/homedecor_lighting/textures/homedecor_plasma_ball_inv.png similarity index 100% rename from homedecor/textures/homedecor_plasma_ball_inv.png rename to homedecor_lighting/textures/homedecor_plasma_ball_inv.png diff --git a/homedecor/textures/homedecor_plasma_ball_streamers.png b/homedecor_lighting/textures/homedecor_plasma_ball_streamers.png similarity index 100% rename from homedecor/textures/homedecor_plasma_ball_streamers.png rename to homedecor_lighting/textures/homedecor_plasma_ball_streamers.png diff --git a/homedecor/textures/homedecor_plasma_storm.png b/homedecor_lighting/textures/homedecor_plasma_storm.png similarity index 100% rename from homedecor/textures/homedecor_plasma_storm.png rename to homedecor_lighting/textures/homedecor_plasma_storm.png diff --git a/homedecor/textures/homedecor_standing_lamp_foot_inv.png b/homedecor_lighting/textures/homedecor_standing_lamp_foot_inv.png similarity index 100% rename from homedecor/textures/homedecor_standing_lamp_foot_inv.png rename to homedecor_lighting/textures/homedecor_standing_lamp_foot_inv.png diff --git a/homedecor/textures/homedecor_standing_lamp_top_inv.png b/homedecor_lighting/textures/homedecor_standing_lamp_top_inv.png similarity index 100% rename from homedecor/textures/homedecor_standing_lamp_top_inv.png rename to homedecor_lighting/textures/homedecor_standing_lamp_top_inv.png diff --git a/homedecor/textures/homedecor_table_lamp_foot_inv.png b/homedecor_lighting/textures/homedecor_table_lamp_foot_inv.png similarity index 100% rename from homedecor/textures/homedecor_table_lamp_foot_inv.png rename to homedecor_lighting/textures/homedecor_table_lamp_foot_inv.png diff --git a/homedecor/textures/homedecor_table_lamp_top_inv.png b/homedecor_lighting/textures/homedecor_table_lamp_top_inv.png similarity index 100% rename from homedecor/textures/homedecor_table_lamp_top_inv.png rename to homedecor_lighting/textures/homedecor_table_lamp_top_inv.png diff --git a/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png b/homedecor_lighting/textures/homedecor_table_standing_lamp_lightbulb.png similarity index 100% rename from homedecor/textures/homedecor_table_standing_lamp_lightbulb.png rename to homedecor_lighting/textures/homedecor_table_standing_lamp_lightbulb.png diff --git a/homedecor/textures/homedecor_wall_sconce_back.png b/homedecor_lighting/textures/homedecor_wall_sconce_back.png similarity index 100% rename from homedecor/textures/homedecor_wall_sconce_back.png rename to homedecor_lighting/textures/homedecor_wall_sconce_back.png diff --git a/homedecor/textures/homedecor_wall_sconce_inv.png b/homedecor_lighting/textures/homedecor_wall_sconce_inv.png similarity index 100% rename from homedecor/textures/homedecor_wall_sconce_inv.png rename to homedecor_lighting/textures/homedecor_wall_sconce_inv.png diff --git a/homedecor_misc/depends.txt b/homedecor_misc/depends.txt new file mode 100644 index 00000000..2d48d544 --- /dev/null +++ b/homedecor_misc/depends.txt @@ -0,0 +1,8 @@ +homedecor_common +default +basic_materials +unifieddyes +homedecor_i18n +building_blocks? +technic? +bucket? diff --git a/homedecor/misc-nodes.lua b/homedecor_misc/init.lua similarity index 59% rename from homedecor/misc-nodes.lua rename to homedecor_misc/init.lua index 9be77cbb..548d728d 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor_misc/init.lua @@ -1,8 +1,14 @@ +-- Home Decor mod by VanessaE +-- +-- Mostly my own code, with bits and pieces lifted from Minetest's default +-- 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 +-- copies of the code for chests and furnaces. local S = homedecor_i18n.gettext -local function N_(x) return x end - homedecor.register("ceiling_paint", { description = S("Textured Ceiling Paint"), drawtype = 'signlike', @@ -28,9 +34,9 @@ homedecor.register("ceiling_tile", { }) local rug_types = { - { N_("small"), "homedecor_small_rug.obj" }, - { N_("large"), homedecor.box.slab_y(0.0625) }, - { N_("persian"), homedecor.box.slab_y(0.0625) }, + { "small", "homedecor_small_rug.obj" }, + { "large", homedecor.box.slab_y(0.0625) }, + { "persian", homedecor.box.slab_y(0.0625) }, } for _, rt in ipairs(rug_types) do @@ -66,7 +72,7 @@ for _, rt in ipairs(rug_types) do }) end -local pot_colors = { N_("black"), N_("green"), N_("terracotta") } +local pot_colors = { "black", "green", "terracotta" } for _, p in ipairs(pot_colors) do homedecor.register("flower_pot_"..p, { @@ -388,53 +394,6 @@ homedecor.register("tool_cabinet", { minetest.register_alias("homedecor:tool_cabinet_bottom", "homedecor:tool_cabinet") minetest.register_alias("homedecor:tool_cabinet_top", "air") -local pframe_cbox = { - type = "fixed", - fixed = { -0.18, -0.5, -0.08, 0.18, -0.08, 0.18 } -} -local n = { 1, 2 } - -for _, i in ipairs(n) do - homedecor.register("picture_frame"..i, { - description = S("Picture Frame "..i), - mesh = "homedecor_picture_frame.obj", - tiles = { - "homedecor_picture_frame_image"..i..".png", - homedecor.lux_wood, - "homedecor_picture_frame_back.png", - }, - inventory_image = "homedecor_picture_frame"..i.."_inv.png", - wield_image = "homedecor_picture_frame"..i.."_inv.png", - groups = {snappy = 3}, - selection_box = pframe_cbox, - walkable = false, - sounds = default.node_sound_glass_defaults() - }) -end - -local p_cbox = { - type = "fixed", - fixed = { - { -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 } - } -} - -for i = 1,20 do - homedecor.register("painting_"..i, { - description = S("Decorative painting #@1", i), - mesh = "homedecor_painting.obj", - tiles = { - "default_wood.png", - "homedecor_blank_canvas.png", - "homedecor_painting"..i..".png" - }, - selection_box = p_cbox, - walkable = false, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - }) -end - homedecor.banister_materials = { { "wood", S("wood"), @@ -627,3 +586,416 @@ minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack end end end) + +minetest.register_node(":homedecor:tatami_mat", { + tiles = { + "homedecor_tatami.png", + "homedecor_tatami.png", + "homedecor_tatami.png", + "homedecor_tatami.png", + "homedecor_tatami.png", + "homedecor_tatami.png" + }, + description = S("Japanese tatami"), + drawtype = "nodebox", + paramtype = "light", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}, + } + } +}) + +homedecor.register("dartboard", { + description = S("Dartboard"), + mesh = "homedecor_dartboard.obj", + tiles = { "homedecor_dartboard.png" }, + inventory_image = "homedecor_dartboard_inv.png", + wield_image = "homedecor_dartboard_inv.png", + paramtype2 = "wallmounted", + walkable = false, + selection_box = { + type = "wallmounted", + }, + groups = {choppy=2,dig_immediate=2,attached_node=1}, + legacy_wallmounted = true, + sounds = default.node_sound_wood_defaults(), +}) + +-- crafting + +-- Crafting for homedecor mod (includes folding) by Vanessa Ezekowitz +-- +-- Mostly my own code; overall template borrowed from game default + +local S = homedecor_i18n.gettext + +minetest.register_craft( { + output = "homedecor:flower_pot_terracotta", + recipe = { + { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" }, + { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_green", + recipe = { + { "", "dye:dark_green", "" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_black", + recipe = { + { "dye:black", "dye:black", "dye:black" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:ceiling_paint 20", + recipe = { + "dye:white", + "dye:white", + "default:sand", + "bucket:bucket_water", + }, + replacements = { { "bucket:bucket_water","bucket:bucket_empty" } } +}) + +minetest.register_craft( { + output = "homedecor:ceiling_tile 10", + recipe = { + { "", "dye:white", "" }, + { "default:steel_ingot", "default:stone", "default:steel_ingot" }, + + }, +}) + +minetest.register_craft( { + output = "homedecor:drawer_small", + recipe = { + { "group:wood", "default:steel_ingot", "group:wood" }, + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:drawer_small", + burntime = 30, +}) + +-- vertical poles/lampposts + +minetest.register_craft( { + output = "homedecor:pole_brass 4", + recipe = { + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" } + }, +}) + +minetest.register_craft( { + output = "homedecor:pole_wrought_iron 4", + recipe = { + { "default:iron_lump", }, + { "default:iron_lump", }, + { "default:iron_lump", }, + }, +}) + +-- =========================================================== +-- Recipes that require materials from wool (cotton alternate) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:rug_small 8", + recipe = { + "wool:red", + "wool:yellow", + "wool:blue", + "wool:black" + }, +}) + +minetest.register_craft( { + output = "homedecor:rug_persian 8", + recipe = { + { "", "wool:yellow", "" }, + { "wool:red", "wool:blue", "wool:red" }, + { "", "wool:yellow", "" } + }, +}) + +-- cotton versions: + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:rug_small 8", + recipe = { + "cotton:red", + "cotton:yellow", + "cotton:blue", + "cotton:black" + }, +}) + +minetest.register_craft( { + output = "homedecor:rug_persian 8", + recipe = { + { "", "cotton:yellow", "" }, + { "cotton:red", "cotton:blue", "cotton:red" }, + { "", "cotton:yellow", "" } + }, +}) + +-- fuel recipes for same + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:rug_small", + burntime = 30, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:rug_large 2", + recipe = { + "homedecor:rug_small", + "homedecor:rug_small", + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:rug_large", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:rug_persian", + burntime = 30, +}) + +-- more misc stuff here + +minetest.register_craft({ + output = "homedecor:fishtank", + recipe = { + { "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" }, + { "default:glass", "bucket:bucket_water", "default:glass" }, + { "default:glass", "building_blocks:gravel_spread", "default:glass" }, + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"} } +}) + +minetest.register_craft({ + output = "homedecor:cardboard_box 2", + recipe = { + { "default:paper", "", "default:paper" }, + { "default:paper", "default:paper", "default:paper" }, + }, +}) + +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:openframe_bookshelf", + recipe = { + {"group:wood", "", "group:wood"}, + {"default:book", "default:book", "default:book"}, + {"group:wood", "", "group:wood"}, + }, +}) + +-- japanese walls and mat + +minetest.register_craft( { + output = "homedecor:japanese_wall_top", + recipe = { + {"group:stick", "default:paper"}, + {"default:paper", "group:stick"}, + {"group:stick", "default:paper"} + }, +}) + +minetest.register_craft( { + output = "homedecor:japanese_wall_top", + recipe = { + {"default:paper", "group:stick"}, + {"group:stick", "default:paper"}, + {"default:paper", "group:stick"} + }, +}) + +minetest.register_craft( { + output = "homedecor:japanese_wall_middle", + recipe = { + {"homedecor:japanese_wall_top"} + }, +}) + +minetest.register_craft( { + output = "homedecor:japanese_wall_bottom", + recipe = { + {"homedecor:japanese_wall_middle"} + }, +}) + +minetest.register_craft( { + output = "homedecor:japanese_wall_top", + recipe = { + {"homedecor:japanese_wall_bottom"} + }, +}) + +minetest.register_craft( { + output = "homedecor:tatami_mat", + recipe = { + {"farming:wheat", "farming:wheat", "farming:wheat"} + }, +}) + +minetest.register_craft( { + output = "homedecor:pool_table", + recipe = { + { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, + { "building_blocks:hardwood", "building_blocks:hardwood", "building_blocks:hardwood" }, + { "building_blocks:slab_hardwood", "", "building_blocks:slab_hardwood" } + }, +}) + +minetest.register_craft({ + output = "homedecor:dartboard", + recipe = { + {"dye:black", "basic_materials:plastic_sheet", "dye:white"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, + {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"} + }, +}) + +minetest.register_craft({ + output = "homedecor:piano", + recipe = { + { "", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" } + }, +}) + +minetest.register_craft({ + output = "homedecor:wall_shelf 2", + recipe = { + { "homedecor:wood_table_small_square", "homedecor:curtainrod_wood", "homedecor:curtainrod_wood" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:trophy 3", + recipe = { + { "default:gold_ingot","","default:gold_ingot" }, + { "","default:gold_ingot","" }, + { "group:wood","default:gold_ingot","group:wood" } + }, +}) + +minetest.register_craft({ + output = "homedecor:sportbench", + recipe = { + { "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" }, + { "default:steel_ingot","wool:black","default:steel_ingot" }, + { "default:steel_ingot","wool:black","default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:skateboard", + recipe = { + { "dye:yellow","dye:green","dye:blue" }, + { "homedecor:wood_table_small_square","homedecor:wood_table_small_square","homedecor:wood_table_small_square" }, + { "default:steel_ingot","","default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:tool_cabinet", + recipe = { + { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, + { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, + { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:spiral_staircase", + recipe = { + { "default:steelblock", "homedecor:pole_wrought_iron", "" }, + { "", "homedecor:pole_wrought_iron", "default:steelblock" }, + { "default:steelblock", "homedecor:pole_wrought_iron", "" } + }, +}) + +minetest.register_craftitem(":homedecor:flower_pot_small", { + description = S("Small Flower Pot"), + inventory_image = "homedecor_flowerpot_small_inv.png" +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_small", + recipe = { + { "default:clay_brick", "", "default:clay_brick" }, + { "", "default:clay_brick", "" } + } +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_small 3", + recipe = { { "homedecor:flower_pot_terracotta" } } +}) + +for i in ipairs(homedecor.banister_materials) do + + local name = homedecor.banister_materials[i][1] + local topmat = homedecor.banister_materials[i][5] + local vertmat = homedecor.banister_materials[i][6] + local dye1 = homedecor.banister_materials[i][7] + local dye2 = homedecor.banister_materials[i][8] + + minetest.register_craft({ + output = "homedecor:banister_"..name.."_horizontal 2", + recipe = { + { topmat, "", dye1 }, + { vertmat, topmat, "" }, + { dye2, vertmat, topmat } + }, + }) +end + +unifieddyes.register_color_craft({ + output = "", + palette = "split", + neutral_node = "homedecor:banister_wood_horizontal", + type = "shapeless", + output_prefix = "homedecor:banister_wood_horizontal_", + output_suffix = "", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE", + } +}) diff --git a/homedecor/models/homedecor_banister_diagonal_left.obj b/homedecor_misc/models/homedecor_banister_diagonal_left.obj similarity index 100% rename from homedecor/models/homedecor_banister_diagonal_left.obj rename to homedecor_misc/models/homedecor_banister_diagonal_left.obj diff --git a/homedecor/models/homedecor_banister_diagonal_right.obj b/homedecor_misc/models/homedecor_banister_diagonal_right.obj similarity index 100% rename from homedecor/models/homedecor_banister_diagonal_right.obj rename to homedecor_misc/models/homedecor_banister_diagonal_right.obj diff --git a/homedecor/models/homedecor_banister_horizontal.obj b/homedecor_misc/models/homedecor_banister_horizontal.obj similarity index 100% rename from homedecor/models/homedecor_banister_horizontal.obj rename to homedecor_misc/models/homedecor_banister_horizontal.obj diff --git a/homedecor/models/homedecor_dartboard.obj b/homedecor_misc/models/homedecor_dartboard.obj similarity index 100% rename from homedecor/models/homedecor_dartboard.obj rename to homedecor_misc/models/homedecor_dartboard.obj diff --git a/homedecor/models/homedecor_dvd_cabinet.obj b/homedecor_misc/models/homedecor_dvd_cabinet.obj similarity index 100% rename from homedecor/models/homedecor_dvd_cabinet.obj rename to homedecor_misc/models/homedecor_dvd_cabinet.obj diff --git a/homedecor/models/homedecor_fishtank.obj b/homedecor_misc/models/homedecor_fishtank.obj similarity index 100% rename from homedecor/models/homedecor_fishtank.obj rename to homedecor_misc/models/homedecor_fishtank.obj diff --git a/homedecor/models/homedecor_flowerpot.obj b/homedecor_misc/models/homedecor_flowerpot.obj similarity index 100% rename from homedecor/models/homedecor_flowerpot.obj rename to homedecor_misc/models/homedecor_flowerpot.obj diff --git a/homedecor/models/homedecor_piano.obj b/homedecor_misc/models/homedecor_piano.obj similarity index 100% rename from homedecor/models/homedecor_piano.obj rename to homedecor_misc/models/homedecor_piano.obj diff --git a/homedecor/models/homedecor_pool_table.obj b/homedecor_misc/models/homedecor_pool_table.obj similarity index 100% rename from homedecor/models/homedecor_pool_table.obj rename to homedecor_misc/models/homedecor_pool_table.obj diff --git a/homedecor/models/homedecor_potted_plant.obj b/homedecor_misc/models/homedecor_potted_plant.obj similarity index 100% rename from homedecor/models/homedecor_potted_plant.obj rename to homedecor_misc/models/homedecor_potted_plant.obj diff --git a/homedecor/models/homedecor_round_pole.obj b/homedecor_misc/models/homedecor_round_pole.obj similarity index 100% rename from homedecor/models/homedecor_round_pole.obj rename to homedecor_misc/models/homedecor_round_pole.obj diff --git a/homedecor/models/homedecor_skateboard.obj b/homedecor_misc/models/homedecor_skateboard.obj similarity index 100% rename from homedecor/models/homedecor_skateboard.obj rename to homedecor_misc/models/homedecor_skateboard.obj diff --git a/homedecor/models/homedecor_small_rug.obj b/homedecor_misc/models/homedecor_small_rug.obj similarity index 100% rename from homedecor/models/homedecor_small_rug.obj rename to homedecor_misc/models/homedecor_small_rug.obj diff --git a/homedecor/models/homedecor_spiral_staircase.obj b/homedecor_misc/models/homedecor_spiral_staircase.obj similarity index 100% rename from homedecor/models/homedecor_spiral_staircase.obj rename to homedecor_misc/models/homedecor_spiral_staircase.obj diff --git a/homedecor/models/homedecor_sport_bench.obj b/homedecor_misc/models/homedecor_sport_bench.obj similarity index 100% rename from homedecor/models/homedecor_sport_bench.obj rename to homedecor_misc/models/homedecor_sport_bench.obj diff --git a/homedecor/models/homedecor_tool_cabinet.obj b/homedecor_misc/models/homedecor_tool_cabinet.obj similarity index 100% rename from homedecor/models/homedecor_tool_cabinet.obj rename to homedecor_misc/models/homedecor_tool_cabinet.obj diff --git a/homedecor/models/homedecor_trophy.obj b/homedecor_misc/models/homedecor_trophy.obj similarity index 100% rename from homedecor/models/homedecor_trophy.obj rename to homedecor_misc/models/homedecor_trophy.obj diff --git a/homedecor/sounds/homedecor_book_close.ogg b/homedecor_misc/sounds/homedecor_book_close.ogg similarity index 100% rename from homedecor/sounds/homedecor_book_close.ogg rename to homedecor_misc/sounds/homedecor_book_close.ogg diff --git a/homedecor/sounds/homedecor_door_close.ogg b/homedecor_misc/sounds/homedecor_door_close.ogg similarity index 100% rename from homedecor/sounds/homedecor_door_close.ogg rename to homedecor_misc/sounds/homedecor_door_close.ogg diff --git a/homedecor/sounds/homedecor_door_open.ogg b/homedecor_misc/sounds/homedecor_door_open.ogg similarity index 100% rename from homedecor/sounds/homedecor_door_open.ogg rename to homedecor_misc/sounds/homedecor_door_open.ogg diff --git a/homedecor/sounds/homedecor_faucet.ogg b/homedecor_misc/sounds/homedecor_faucet.ogg similarity index 100% rename from homedecor/sounds/homedecor_faucet.ogg rename to homedecor_misc/sounds/homedecor_faucet.ogg diff --git a/homedecor/sounds/homedecor_gate_open_close.ogg b/homedecor_misc/sounds/homedecor_gate_open_close.ogg similarity index 100% rename from homedecor/sounds/homedecor_gate_open_close.ogg rename to homedecor_misc/sounds/homedecor_gate_open_close.ogg diff --git a/homedecor/sounds/homedecor_shower.ogg b/homedecor_misc/sounds/homedecor_shower.ogg similarity index 100% rename from homedecor/sounds/homedecor_shower.ogg rename to homedecor_misc/sounds/homedecor_shower.ogg diff --git a/homedecor/sounds/homedecor_toilet_flush.ogg b/homedecor_misc/sounds/homedecor_toilet_flush.ogg similarity index 100% rename from homedecor/sounds/homedecor_toilet_flush.ogg rename to homedecor_misc/sounds/homedecor_toilet_flush.ogg diff --git a/homedecor/sounds/homedecor_trash_all.ogg b/homedecor_misc/sounds/homedecor_trash_all.ogg similarity index 100% rename from homedecor/sounds/homedecor_trash_all.ogg rename to homedecor_misc/sounds/homedecor_trash_all.ogg diff --git a/homedecor/sounds/insert_coin.ogg b/homedecor_misc/sounds/insert_coin.ogg similarity index 100% rename from homedecor/sounds/insert_coin.ogg rename to homedecor_misc/sounds/insert_coin.ogg diff --git a/homedecor/sounds/toaster.ogg b/homedecor_misc/sounds/toaster.ogg similarity index 100% rename from homedecor/sounds/toaster.ogg rename to homedecor_misc/sounds/toaster.ogg diff --git a/homedecor/textures/flowers_bonsai.png b/homedecor_misc/textures/flowers_bonsai.png similarity index 100% rename from homedecor/textures/flowers_bonsai.png rename to homedecor_misc/textures/flowers_bonsai.png diff --git a/homedecor/textures/flowers_cactus.png b/homedecor_misc/textures/flowers_cactus.png similarity index 100% rename from homedecor/textures/flowers_cactus.png rename to homedecor_misc/textures/flowers_cactus.png diff --git a/homedecor/textures/homedecor_banister_brass_inv.png b/homedecor_misc/textures/homedecor_banister_brass_inv.png similarity index 100% rename from homedecor/textures/homedecor_banister_brass_inv.png rename to homedecor_misc/textures/homedecor_banister_brass_inv.png diff --git a/homedecor/textures/homedecor_banister_white_dark_inv.png b/homedecor_misc/textures/homedecor_banister_white_dark_inv.png similarity index 100% rename from homedecor/textures/homedecor_banister_white_dark_inv.png rename to homedecor_misc/textures/homedecor_banister_white_dark_inv.png diff --git a/homedecor/textures/homedecor_banister_wood_colored_inv.png b/homedecor_misc/textures/homedecor_banister_wood_colored_inv.png similarity index 100% rename from homedecor/textures/homedecor_banister_wood_colored_inv.png rename to homedecor_misc/textures/homedecor_banister_wood_colored_inv.png diff --git a/homedecor/textures/homedecor_banister_wood_inv.png b/homedecor_misc/textures/homedecor_banister_wood_inv.png similarity index 100% rename from homedecor/textures/homedecor_banister_wood_inv.png rename to homedecor_misc/textures/homedecor_banister_wood_inv.png diff --git a/homedecor/textures/homedecor_banister_wrought_iron_inv.png b/homedecor_misc/textures/homedecor_banister_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/homedecor_banister_wrought_iron_inv.png rename to homedecor_misc/textures/homedecor_banister_wrought_iron_inv.png diff --git a/homedecor/textures/homedecor_cardbox_big_sides.png b/homedecor_misc/textures/homedecor_cardbox_big_sides.png similarity index 100% rename from homedecor/textures/homedecor_cardbox_big_sides.png rename to homedecor_misc/textures/homedecor_cardbox_big_sides.png diff --git a/homedecor/textures/homedecor_cardbox_big_tb.png b/homedecor_misc/textures/homedecor_cardbox_big_tb.png similarity index 100% rename from homedecor/textures/homedecor_cardbox_big_tb.png rename to homedecor_misc/textures/homedecor_cardbox_big_tb.png diff --git a/homedecor/textures/homedecor_cardbox_sides.png b/homedecor_misc/textures/homedecor_cardbox_sides.png similarity index 100% rename from homedecor/textures/homedecor_cardbox_sides.png rename to homedecor_misc/textures/homedecor_cardbox_sides.png diff --git a/homedecor/textures/homedecor_cardbox_tb.png b/homedecor_misc/textures/homedecor_cardbox_tb.png similarity index 100% rename from homedecor/textures/homedecor_cardbox_tb.png rename to homedecor_misc/textures/homedecor_cardbox_tb.png diff --git a/homedecor/textures/homedecor_ceiling_paint.png b/homedecor_misc/textures/homedecor_ceiling_paint.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_paint.png rename to homedecor_misc/textures/homedecor_ceiling_paint.png diff --git a/homedecor/textures/homedecor_ceiling_paint_roller.png b/homedecor_misc/textures/homedecor_ceiling_paint_roller.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_paint_roller.png rename to homedecor_misc/textures/homedecor_ceiling_paint_roller.png diff --git a/homedecor/textures/homedecor_ceiling_tile.png b/homedecor_misc/textures/homedecor_ceiling_tile.png similarity index 100% rename from homedecor/textures/homedecor_ceiling_tile.png rename to homedecor_misc/textures/homedecor_ceiling_tile.png diff --git a/homedecor/textures/homedecor_dartboard.png b/homedecor_misc/textures/homedecor_dartboard.png similarity index 100% rename from homedecor/textures/homedecor_dartboard.png rename to homedecor_misc/textures/homedecor_dartboard.png diff --git a/homedecor/textures/homedecor_dartboard_inv.png b/homedecor_misc/textures/homedecor_dartboard_inv.png similarity index 100% rename from homedecor/textures/homedecor_dartboard_inv.png rename to homedecor_misc/textures/homedecor_dartboard_inv.png diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/homedecor_misc/textures/homedecor_dvdcd_cabinet_back.png similarity index 100% rename from homedecor/textures/homedecor_dvdcd_cabinet_back.png rename to homedecor_misc/textures/homedecor_dvdcd_cabinet_back.png diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/homedecor_misc/textures/homedecor_dvdcd_cabinet_front.png similarity index 100% rename from homedecor/textures/homedecor_dvdcd_cabinet_front.png rename to homedecor_misc/textures/homedecor_dvdcd_cabinet_front.png diff --git a/homedecor/textures/homedecor_fishtank_filter.png b/homedecor_misc/textures/homedecor_fishtank_filter.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_filter.png rename to homedecor_misc/textures/homedecor_fishtank_filter.png diff --git a/homedecor/textures/homedecor_fishtank_fishes.png b/homedecor_misc/textures/homedecor_fishtank_fishes.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_fishes.png rename to homedecor_misc/textures/homedecor_fishtank_fishes.png diff --git a/homedecor/textures/homedecor_fishtank_fishes_lighted.png b/homedecor_misc/textures/homedecor_fishtank_fishes_lighted.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_fishes_lighted.png rename to homedecor_misc/textures/homedecor_fishtank_fishes_lighted.png diff --git a/homedecor/textures/homedecor_fishtank_gravel.png b/homedecor_misc/textures/homedecor_fishtank_gravel.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_gravel.png rename to homedecor_misc/textures/homedecor_fishtank_gravel.png diff --git a/homedecor/textures/homedecor_fishtank_gravel_lighted.png b/homedecor_misc/textures/homedecor_fishtank_gravel_lighted.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_gravel_lighted.png rename to homedecor_misc/textures/homedecor_fishtank_gravel_lighted.png diff --git a/homedecor/textures/homedecor_fishtank_sides.png b/homedecor_misc/textures/homedecor_fishtank_sides.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_sides.png rename to homedecor_misc/textures/homedecor_fishtank_sides.png diff --git a/homedecor/textures/homedecor_fishtank_sides_lighted.png b/homedecor_misc/textures/homedecor_fishtank_sides_lighted.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_sides_lighted.png rename to homedecor_misc/textures/homedecor_fishtank_sides_lighted.png diff --git a/homedecor/textures/homedecor_fishtank_water_top.png b/homedecor_misc/textures/homedecor_fishtank_water_top.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_water_top.png rename to homedecor_misc/textures/homedecor_fishtank_water_top.png diff --git a/homedecor/textures/homedecor_fishtank_water_top_lighted.png b/homedecor_misc/textures/homedecor_fishtank_water_top_lighted.png similarity index 100% rename from homedecor/textures/homedecor_fishtank_water_top_lighted.png rename to homedecor_misc/textures/homedecor_fishtank_water_top_lighted.png diff --git a/homedecor/textures/homedecor_flower_pot_black.png b/homedecor_misc/textures/homedecor_flower_pot_black.png similarity index 100% rename from homedecor/textures/homedecor_flower_pot_black.png rename to homedecor_misc/textures/homedecor_flower_pot_black.png diff --git a/homedecor/textures/homedecor_flower_pot_green.png b/homedecor_misc/textures/homedecor_flower_pot_green.png similarity index 100% rename from homedecor/textures/homedecor_flower_pot_green.png rename to homedecor_misc/textures/homedecor_flower_pot_green.png diff --git a/homedecor/textures/homedecor_flower_pot_terracotta.png b/homedecor_misc/textures/homedecor_flower_pot_terracotta.png similarity index 100% rename from homedecor/textures/homedecor_flower_pot_terracotta.png rename to homedecor_misc/textures/homedecor_flower_pot_terracotta.png diff --git a/homedecor/textures/homedecor_flowerpot_small_inv.png b/homedecor_misc/textures/homedecor_flowerpot_small_inv.png similarity index 100% rename from homedecor/textures/homedecor_flowerpot_small_inv.png rename to homedecor_misc/textures/homedecor_flowerpot_small_inv.png diff --git a/homedecor/textures/homedecor_piano_inv.png b/homedecor_misc/textures/homedecor_piano_inv.png similarity index 100% rename from homedecor/textures/homedecor_piano_inv.png rename to homedecor_misc/textures/homedecor_piano_inv.png diff --git a/homedecor/textures/homedecor_piano_keys.png b/homedecor_misc/textures/homedecor_piano_keys.png similarity index 100% rename from homedecor/textures/homedecor_piano_keys.png rename to homedecor_misc/textures/homedecor_piano_keys.png diff --git a/homedecor/textures/homedecor_pole_brass_inv.png b/homedecor_misc/textures/homedecor_pole_brass_inv.png similarity index 100% rename from homedecor/textures/homedecor_pole_brass_inv.png rename to homedecor_misc/textures/homedecor_pole_brass_inv.png diff --git a/homedecor/textures/homedecor_pole_wrought_iron_inv.png b/homedecor_misc/textures/homedecor_pole_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/homedecor_pole_wrought_iron_inv.png rename to homedecor_misc/textures/homedecor_pole_wrought_iron_inv.png diff --git a/homedecor/textures/homedecor_pool_table_baize.png b/homedecor_misc/textures/homedecor_pool_table_baize.png similarity index 100% rename from homedecor/textures/homedecor_pool_table_baize.png rename to homedecor_misc/textures/homedecor_pool_table_baize.png diff --git a/homedecor/textures/homedecor_pool_table_balls.png b/homedecor_misc/textures/homedecor_pool_table_balls.png similarity index 100% rename from homedecor/textures/homedecor_pool_table_balls.png rename to homedecor_misc/textures/homedecor_pool_table_balls.png diff --git a/homedecor/textures/homedecor_pool_table_cue.png b/homedecor_misc/textures/homedecor_pool_table_cue.png similarity index 100% rename from homedecor/textures/homedecor_pool_table_cue.png rename to homedecor_misc/textures/homedecor_pool_table_cue.png diff --git a/homedecor/textures/homedecor_pool_table_inv.png b/homedecor_misc/textures/homedecor_pool_table_inv.png similarity index 100% rename from homedecor/textures/homedecor_pool_table_inv.png rename to homedecor_misc/textures/homedecor_pool_table_inv.png diff --git a/homedecor/textures/homedecor_pool_table_pockets.png b/homedecor_misc/textures/homedecor_pool_table_pockets.png similarity index 100% rename from homedecor/textures/homedecor_pool_table_pockets.png rename to homedecor_misc/textures/homedecor_pool_table_pockets.png diff --git a/homedecor/textures/homedecor_rug_large.png b/homedecor_misc/textures/homedecor_rug_large.png similarity index 100% rename from homedecor/textures/homedecor_rug_large.png rename to homedecor_misc/textures/homedecor_rug_large.png diff --git a/homedecor/textures/homedecor_rug_persian.png b/homedecor_misc/textures/homedecor_rug_persian.png similarity index 100% rename from homedecor/textures/homedecor_rug_persian.png rename to homedecor_misc/textures/homedecor_rug_persian.png diff --git a/homedecor/textures/homedecor_rug_small.png b/homedecor_misc/textures/homedecor_rug_small.png similarity index 100% rename from homedecor/textures/homedecor_rug_small.png rename to homedecor_misc/textures/homedecor_rug_small.png diff --git a/homedecor/textures/homedecor_skateboard.png b/homedecor_misc/textures/homedecor_skateboard.png similarity index 100% rename from homedecor/textures/homedecor_skateboard.png rename to homedecor_misc/textures/homedecor_skateboard.png diff --git a/homedecor/textures/homedecor_skateboard_inv.png b/homedecor_misc/textures/homedecor_skateboard_inv.png similarity index 100% rename from homedecor/textures/homedecor_skateboard_inv.png rename to homedecor_misc/textures/homedecor_skateboard_inv.png diff --git a/homedecor/textures/homedecor_sport_bench_inv.png b/homedecor_misc/textures/homedecor_sport_bench_inv.png similarity index 100% rename from homedecor/textures/homedecor_sport_bench_inv.png rename to homedecor_misc/textures/homedecor_sport_bench_inv.png diff --git a/homedecor/textures/homedecor_tatami.png b/homedecor_misc/textures/homedecor_tatami.png similarity index 100% rename from homedecor/textures/homedecor_tatami.png rename to homedecor_misc/textures/homedecor_tatami.png diff --git a/homedecor/textures/homedecor_tool_cabinet_drawers.png b/homedecor_misc/textures/homedecor_tool_cabinet_drawers.png similarity index 100% rename from homedecor/textures/homedecor_tool_cabinet_drawers.png rename to homedecor_misc/textures/homedecor_tool_cabinet_drawers.png diff --git a/homedecor/textures/homedecor_tool_cabinet_inv.png b/homedecor_misc/textures/homedecor_tool_cabinet_inv.png similarity index 100% rename from homedecor/textures/homedecor_tool_cabinet_inv.png rename to homedecor_misc/textures/homedecor_tool_cabinet_inv.png diff --git a/homedecor/textures/homedecor_tool_cabinet_misc.png b/homedecor_misc/textures/homedecor_tool_cabinet_misc.png similarity index 100% rename from homedecor/textures/homedecor_tool_cabinet_misc.png rename to homedecor_misc/textures/homedecor_tool_cabinet_misc.png diff --git a/homedecor/textures/homedecor_trophy_inv.png b/homedecor_misc/textures/homedecor_trophy_inv.png similarity index 100% rename from homedecor/textures/homedecor_trophy_inv.png rename to homedecor_misc/textures/homedecor_trophy_inv.png diff --git a/homedecor/textures/top_chain_brass_inv.png b/homedecor_misc/textures/top_chain_brass_inv.png similarity index 100% rename from homedecor/textures/top_chain_brass_inv.png rename to homedecor_misc/textures/top_chain_brass_inv.png diff --git a/homedecor/textures/top_chain_wrought_iron_inv.png b/homedecor_misc/textures/top_chain_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/top_chain_wrought_iron_inv.png rename to homedecor_misc/textures/top_chain_wrought_iron_inv.png diff --git a/homedecor_office/depends.txt b/homedecor_office/depends.txt new file mode 100644 index 00000000..43559e02 --- /dev/null +++ b/homedecor_office/depends.txt @@ -0,0 +1,7 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n +moreblocks? +building_blocks? diff --git a/homedecor/office.lua b/homedecor_office/init.lua similarity index 63% rename from homedecor/office.lua rename to homedecor_office/init.lua index 6e9bbc1b..7a7f4525 100644 --- a/homedecor/office.lua +++ b/homedecor_office/init.lua @@ -124,3 +124,79 @@ for _, c in pairs(chairs) do on_rotate = screwdriver.rotate_simple }) end + +-- crafting + + +minetest.register_craft({ + output = "homedecor:desk", + recipe = { + { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, + { "homedecor:drawer_small", "default:wood", "default:wood" }, + { "homedecor:drawer_small", "", "default:wood" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:desk", + recipe = { + { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, + { "homedecor:drawer_small", "default:wood", "default:wood" }, + { "homedecor:drawer_small", "", "default:wood" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:filing_cabinet", + recipe = { + { "", "default:wood", "" }, + { "default:wood", "homedecor:drawer_small", "default:wood" }, + { "", "default:wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:office_chair_basic", + recipe = { + { "", "", "wool:black" }, + { "", "wool:black", "default:steel_ingot" }, + { "group:stick", "homedecor:pole_wrought_iron", "group:stick" } + }, +}) + +minetest.register_craft({ + output = "homedecor:office_chair_upscale", + recipe = { + { "dye:black", "building_blocks:sticks", "group:wool" }, + { "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" }, + { "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" } + }, +}) + +minetest.register_craft({ + output = "homedecor:calendar", + recipe = { + { "","dye:red","" }, + { "","dye:black","" }, + { "","default:paper","" } + }, +}) + +minetest.register_craft({ + output = "homedecor:desk_globe", + recipe = { + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "group:stick", "stairs:slab_wood", "dye:blue" } + }, +}) + +minetest.register_craft({ + output = "homedecor:desk_globe", + recipe = { + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "group:stick", "moreblocks:slab_wood", "dye:blue" } + }, +}) + diff --git a/homedecor/models/homedecor_calendar.obj b/homedecor_office/models/homedecor_calendar.obj similarity index 100% rename from homedecor/models/homedecor_calendar.obj rename to homedecor_office/models/homedecor_calendar.obj diff --git a/homedecor/models/homedecor_desk.obj b/homedecor_office/models/homedecor_desk.obj similarity index 100% rename from homedecor/models/homedecor_desk.obj rename to homedecor_office/models/homedecor_desk.obj diff --git a/homedecor/models/homedecor_desk_globe.obj b/homedecor_office/models/homedecor_desk_globe.obj similarity index 100% rename from homedecor/models/homedecor_desk_globe.obj rename to homedecor_office/models/homedecor_desk_globe.obj diff --git a/homedecor/models/homedecor_filing_cabinet.obj b/homedecor_office/models/homedecor_filing_cabinet.obj similarity index 100% rename from homedecor/models/homedecor_filing_cabinet.obj rename to homedecor_office/models/homedecor_filing_cabinet.obj diff --git a/homedecor/models/homedecor_office_chair_basic.obj b/homedecor_office/models/homedecor_office_chair_basic.obj similarity index 100% rename from homedecor/models/homedecor_office_chair_basic.obj rename to homedecor_office/models/homedecor_office_chair_basic.obj diff --git a/homedecor/models/homedecor_office_chair_upscale.obj b/homedecor_office/models/homedecor_office_chair_upscale.obj similarity index 100% rename from homedecor/models/homedecor_office_chair_upscale.obj rename to homedecor_office/models/homedecor_office_chair_upscale.obj diff --git a/homedecor/textures/homedecor_calendar.png b/homedecor_office/textures/homedecor_calendar.png similarity index 100% rename from homedecor/textures/homedecor_calendar.png rename to homedecor_office/textures/homedecor_calendar.png diff --git a/homedecor/textures/homedecor_calendar_inv.png b/homedecor_office/textures/homedecor_calendar_inv.png similarity index 100% rename from homedecor/textures/homedecor_calendar_inv.png rename to homedecor_office/textures/homedecor_calendar_inv.png diff --git a/homedecor/textures/homedecor_desk_drawers.png b/homedecor_office/textures/homedecor_desk_drawers.png similarity index 100% rename from homedecor/textures/homedecor_desk_drawers.png rename to homedecor_office/textures/homedecor_desk_drawers.png diff --git a/homedecor/textures/homedecor_desk_globe_inv.png b/homedecor_office/textures/homedecor_desk_globe_inv.png similarity index 100% rename from homedecor/textures/homedecor_desk_globe_inv.png rename to homedecor_office/textures/homedecor_desk_globe_inv.png diff --git a/homedecor/textures/homedecor_desk_inv.png b/homedecor_office/textures/homedecor_desk_inv.png similarity index 100% rename from homedecor/textures/homedecor_desk_inv.png rename to homedecor_office/textures/homedecor_desk_inv.png diff --git a/homedecor/textures/homedecor_earth.png b/homedecor_office/textures/homedecor_earth.png similarity index 100% rename from homedecor/textures/homedecor_earth.png rename to homedecor_office/textures/homedecor_earth.png diff --git a/homedecor/textures/homedecor_filing_cabinet_bottom.png b/homedecor_office/textures/homedecor_filing_cabinet_bottom.png similarity index 100% rename from homedecor/textures/homedecor_filing_cabinet_bottom.png rename to homedecor_office/textures/homedecor_filing_cabinet_bottom.png diff --git a/homedecor/textures/homedecor_filing_cabinet_front.png b/homedecor_office/textures/homedecor_filing_cabinet_front.png similarity index 100% rename from homedecor/textures/homedecor_filing_cabinet_front.png rename to homedecor_office/textures/homedecor_filing_cabinet_front.png diff --git a/homedecor/textures/homedecor_office_chair_basic.png b/homedecor_office/textures/homedecor_office_chair_basic.png similarity index 100% rename from homedecor/textures/homedecor_office_chair_basic.png rename to homedecor_office/textures/homedecor_office_chair_basic.png diff --git a/homedecor/textures/homedecor_office_chair_upscale.png b/homedecor_office/textures/homedecor_office_chair_upscale.png similarity index 100% rename from homedecor/textures/homedecor_office_chair_upscale.png rename to homedecor_office/textures/homedecor_office_chair_upscale.png diff --git a/homedecor_pictures_and_paintings/depends.txt b/homedecor_pictures_and_paintings/depends.txt new file mode 100644 index 00000000..2a66bdcf --- /dev/null +++ b/homedecor_pictures_and_paintings/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +dye +homedecor_i18n diff --git a/homedecor_pictures_and_paintings/init.lua b/homedecor_pictures_and_paintings/init.lua new file mode 100644 index 00000000..e0377a7f --- /dev/null +++ b/homedecor_pictures_and_paintings/init.lua @@ -0,0 +1,162 @@ +local S = homedecor_i18n.gettext + +local pframe_cbox = { + type = "fixed", + fixed = { -0.18, -0.5, -0.08, 0.18, -0.08, 0.18 } +} +local n = { 1, 2 } + +for _, i in ipairs(n) do + homedecor.register("picture_frame"..i, { + description = S("Picture Frame "..i), + mesh = "homedecor_picture_frame.obj", + tiles = { + "homedecor_picture_frame_image"..i..".png", + homedecor.lux_wood, + "homedecor_picture_frame_back.png", + }, + inventory_image = "homedecor_picture_frame"..i.."_inv.png", + wield_image = "homedecor_picture_frame"..i.."_inv.png", + groups = {snappy = 3}, + selection_box = pframe_cbox, + walkable = false, + sounds = default.node_sound_glass_defaults() + }) +end + +local p_cbox = { + type = "fixed", + fixed = { + { -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 } + } +} + +for i = 1,20 do + homedecor.register("painting_"..i, { + description = S("Decorative painting #@1", i), + mesh = "homedecor_painting.obj", + tiles = { + "default_wood.png", + "homedecor_blank_canvas.png", + "homedecor_painting"..i..".png" + }, + selection_box = p_cbox, + walkable = false, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + }) +end + +-- crafting + +minetest.register_craftitem(":homedecor:blank_canvas", { + description = S("Blank Canvas"), + inventory_image = "homedecor_blank_canvas.png" +}) + +-- paintings + +minetest.register_craft({ + output = "homedecor:blank_canvas", + recipe = { + { "", "group:stick", "" }, + { "group:stick", "wool:white", "group:stick" }, + { "", "group:stick", "" }, + } +}) + +local painting_patterns = { + [1] = { { "brown", "red", "brown" }, + { "dark_green", "red", "green" } }, + + [2] = { { "green", "yellow", "green" }, + { "green", "yellow", "green" } }, + + [3] = { { "green", "pink", "green" }, + { "brown", "pink", "brown" } }, + + [4] = { { "black", "orange", "grey" }, + { "dark_green", "orange", "orange" } }, + + [5] = { { "blue", "orange", "yellow" }, + { "green", "red", "brown" } }, + + [6] = { { "green", "red", "orange" }, + { "orange", "yellow", "green" } }, + + [7] = { { "blue", "dark_green", "dark_green" }, + { "green", "grey", "green" } }, + + [8] = { { "blue", "blue", "blue" }, + { "green", "green", "green" } }, + + [9] = { { "blue", "blue", "dark_green" }, + { "green", "grey", "dark_green" } }, + + [10] = { { "green", "white", "green" }, + { "dark_green", "white", "dark_green" } }, + + [11] = { { "blue", "white", "blue" }, + { "blue", "grey", "dark_green" } }, + + [12] = { { "green", "green", "green" }, + { "grey", "grey", "green" } }, + + [13] = { { "blue", "blue", "grey" }, + { "dark_green", "white", "white" } }, + + [14] = { { "red", "yellow", "blue" }, + { "blue", "green", "violet" } }, + + [15] = { { "blue", "yellow", "blue" }, + { "black", "black", "black" } }, + + [16] = { { "red", "orange", "blue" }, + { "black", "dark_grey", "grey" } }, + + [17] = { { "orange", "yellow", "orange" }, + { "black", "black", "black" } }, + + [18] = { { "grey", "dark_green", "grey" }, + { "white", "white", "white" } }, + + [19] = { { "white", "brown", "green" }, + { "green", "brown", "brown" } }, + + [20] = { { "blue", "blue", "blue" }, + { "red", "brown", "grey" } } +} + +for i,recipe in pairs(painting_patterns) do + + local item1 = "dye:"..recipe[1][1] + local item2 = "dye:"..recipe[1][2] + local item3 = "dye:"..recipe[1][3] + local item4 = "dye:"..recipe[2][1] + local item5 = "dye:"..recipe[2][2] + local item6 = "dye:"..recipe[2][3] + + minetest.register_craft({ + output = "homedecor:painting_"..i, + recipe = { + { item1, item2, item3 }, + { item4, item5, item6 }, + {"", "homedecor:blank_canvas", "" } + } + }) +end + +local picture_dyes = { + {"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick + {"dye:green", "dye:blue"} -- the "family photo" +} + +for i in ipairs(picture_dyes) do + minetest.register_craft({ + output = "homedecor:picture_frame"..i, + recipe = { + { picture_dyes[i][1], picture_dyes[i][2] }, + { "homedecor:blank_canvas", "group:stick" }, + }, + }) +end diff --git a/homedecor/models/homedecor_painting.obj b/homedecor_pictures_and_paintings/models/homedecor_painting.obj similarity index 100% rename from homedecor/models/homedecor_painting.obj rename to homedecor_pictures_and_paintings/models/homedecor_painting.obj diff --git a/homedecor/models/homedecor_picture_frame.obj b/homedecor_pictures_and_paintings/models/homedecor_picture_frame.obj similarity index 100% rename from homedecor/models/homedecor_picture_frame.obj rename to homedecor_pictures_and_paintings/models/homedecor_picture_frame.obj diff --git a/homedecor/textures/homedecor_blank_canvas.png b/homedecor_pictures_and_paintings/textures/homedecor_blank_canvas.png similarity index 100% rename from homedecor/textures/homedecor_blank_canvas.png rename to homedecor_pictures_and_paintings/textures/homedecor_blank_canvas.png diff --git a/homedecor/textures/homedecor_painting1.png b/homedecor_pictures_and_paintings/textures/homedecor_painting1.png similarity index 100% rename from homedecor/textures/homedecor_painting1.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting1.png diff --git a/homedecor/textures/homedecor_painting10.png b/homedecor_pictures_and_paintings/textures/homedecor_painting10.png similarity index 100% rename from homedecor/textures/homedecor_painting10.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting10.png diff --git a/homedecor/textures/homedecor_painting11.png b/homedecor_pictures_and_paintings/textures/homedecor_painting11.png similarity index 100% rename from homedecor/textures/homedecor_painting11.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting11.png diff --git a/homedecor/textures/homedecor_painting12.png b/homedecor_pictures_and_paintings/textures/homedecor_painting12.png similarity index 100% rename from homedecor/textures/homedecor_painting12.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting12.png diff --git a/homedecor/textures/homedecor_painting13.png b/homedecor_pictures_and_paintings/textures/homedecor_painting13.png similarity index 100% rename from homedecor/textures/homedecor_painting13.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting13.png diff --git a/homedecor/textures/homedecor_painting14.png b/homedecor_pictures_and_paintings/textures/homedecor_painting14.png similarity index 100% rename from homedecor/textures/homedecor_painting14.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting14.png diff --git a/homedecor/textures/homedecor_painting15.png b/homedecor_pictures_and_paintings/textures/homedecor_painting15.png similarity index 100% rename from homedecor/textures/homedecor_painting15.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting15.png diff --git a/homedecor/textures/homedecor_painting16.png b/homedecor_pictures_and_paintings/textures/homedecor_painting16.png similarity index 100% rename from homedecor/textures/homedecor_painting16.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting16.png diff --git a/homedecor/textures/homedecor_painting17.png b/homedecor_pictures_and_paintings/textures/homedecor_painting17.png similarity index 100% rename from homedecor/textures/homedecor_painting17.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting17.png diff --git a/homedecor/textures/homedecor_painting18.png b/homedecor_pictures_and_paintings/textures/homedecor_painting18.png similarity index 100% rename from homedecor/textures/homedecor_painting18.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting18.png diff --git a/homedecor/textures/homedecor_painting19.png b/homedecor_pictures_and_paintings/textures/homedecor_painting19.png similarity index 100% rename from homedecor/textures/homedecor_painting19.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting19.png diff --git a/homedecor/textures/homedecor_painting2.png b/homedecor_pictures_and_paintings/textures/homedecor_painting2.png similarity index 100% rename from homedecor/textures/homedecor_painting2.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting2.png diff --git a/homedecor/textures/homedecor_painting20.png b/homedecor_pictures_and_paintings/textures/homedecor_painting20.png similarity index 100% rename from homedecor/textures/homedecor_painting20.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting20.png diff --git a/homedecor/textures/homedecor_painting3.png b/homedecor_pictures_and_paintings/textures/homedecor_painting3.png similarity index 100% rename from homedecor/textures/homedecor_painting3.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting3.png diff --git a/homedecor/textures/homedecor_painting4.png b/homedecor_pictures_and_paintings/textures/homedecor_painting4.png similarity index 100% rename from homedecor/textures/homedecor_painting4.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting4.png diff --git a/homedecor/textures/homedecor_painting5.png b/homedecor_pictures_and_paintings/textures/homedecor_painting5.png similarity index 100% rename from homedecor/textures/homedecor_painting5.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting5.png diff --git a/homedecor/textures/homedecor_painting6.png b/homedecor_pictures_and_paintings/textures/homedecor_painting6.png similarity index 100% rename from homedecor/textures/homedecor_painting6.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting6.png diff --git a/homedecor/textures/homedecor_painting7.png b/homedecor_pictures_and_paintings/textures/homedecor_painting7.png similarity index 100% rename from homedecor/textures/homedecor_painting7.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting7.png diff --git a/homedecor/textures/homedecor_painting8.png b/homedecor_pictures_and_paintings/textures/homedecor_painting8.png similarity index 100% rename from homedecor/textures/homedecor_painting8.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting8.png diff --git a/homedecor/textures/homedecor_painting9.png b/homedecor_pictures_and_paintings/textures/homedecor_painting9.png similarity index 100% rename from homedecor/textures/homedecor_painting9.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting9.png diff --git a/homedecor/textures/homedecor_painting_back.png b/homedecor_pictures_and_paintings/textures/homedecor_painting_back.png similarity index 100% rename from homedecor/textures/homedecor_painting_back.png rename to homedecor_pictures_and_paintings/textures/homedecor_painting_back.png diff --git a/homedecor/textures/homedecor_picture_frame1_inv.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame1_inv.png similarity index 100% rename from homedecor/textures/homedecor_picture_frame1_inv.png rename to homedecor_pictures_and_paintings/textures/homedecor_picture_frame1_inv.png diff --git a/homedecor/textures/homedecor_picture_frame2_inv.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame2_inv.png similarity index 100% rename from homedecor/textures/homedecor_picture_frame2_inv.png rename to homedecor_pictures_and_paintings/textures/homedecor_picture_frame2_inv.png diff --git a/homedecor/textures/homedecor_picture_frame_back.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_back.png similarity index 100% rename from homedecor/textures/homedecor_picture_frame_back.png rename to homedecor_pictures_and_paintings/textures/homedecor_picture_frame_back.png diff --git a/homedecor/textures/homedecor_picture_frame_image1.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image1.png similarity index 100% rename from homedecor/textures/homedecor_picture_frame_image1.png rename to homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image1.png diff --git a/homedecor/textures/homedecor_picture_frame_image2.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image2.png similarity index 100% rename from homedecor/textures/homedecor_picture_frame_image2.png rename to homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image2.png diff --git a/homedecor_roofing/depends.txt b/homedecor_roofing/depends.txt new file mode 100644 index 00000000..2a66bdcf --- /dev/null +++ b/homedecor_roofing/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +dye +homedecor_i18n diff --git a/homedecor/roofing.lua b/homedecor_roofing/init.lua similarity index 86% rename from homedecor/roofing.lua rename to homedecor_roofing/init.lua index 1299fcb6..4d24e0b7 100644 --- a/homedecor/roofing.lua +++ b/homedecor_roofing/init.lua @@ -3,7 +3,7 @@ local S = homedecor_i18n.gettext local function N_(x) return x end -minetest.register_node("homedecor:skylight", { +minetest.register_node(":homedecor:skylight", { description = S("Glass Skylight"), drawtype = "raillike", tiles = { "default_glass.png" }, @@ -15,7 +15,7 @@ minetest.register_node("homedecor:skylight", { selection_box = homedecor.nodebox.slab_y(0.1), }) -minetest.register_node("homedecor:skylight_frosted", { +minetest.register_node(":homedecor:skylight_frosted", { description = S("Glass Skylight Frosted"), drawtype = "raillike", tiles = { "homedecor_skylight_frosted.png" }, @@ -29,7 +29,7 @@ minetest.register_node("homedecor:skylight_frosted", { }) for _, s in pairs({ N_("asphalt"), N_("terracotta"), N_("wood") }) do - minetest.register_node("homedecor:shingles_"..s, { + minetest.register_node(":homedecor:shingles_"..s, { description = S("Shingles (@1)", S(s)), drawtype = "raillike", tiles = { "homedecor_shingles_"..s..".png" }, @@ -83,7 +83,7 @@ homedecor.register_outer_corner = function(modname, subname, groups, slope_image tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end - minetest.register_node(modname..":shingle_outer_corner_" .. subname, { + minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, { description = S("@1 (outer corner)", description), drawtype = "mesh", mesh = "homedecor_slope_outer_corner.obj", @@ -105,7 +105,7 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end - minetest.register_node(modname..":shingle_inner_corner_" .. subname, { + minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, { description = S("@1 (inner corner)", description), drawtype = "mesh", mesh = "homedecor_slope_inner_corner.obj", @@ -126,7 +126,7 @@ homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_ tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end - minetest.register_node(modname..":shingle_side_" .. subname, { + minetest.register_node(":"..modname..":shingle_side_" .. subname, { description = description, drawtype = "mesh", mesh = "homedecor_slope.obj", @@ -319,3 +319,43 @@ homedecor.register("chimney", { groups = {cracky=3}, sounds = default.node_sound_stone_defaults() }) + +-- crafting + +minetest.register_craft( { + output = "homedecor:skylight 4", + recipe = { + { "homedecor:glass_table_large", "homedecor:glass_table_large" }, + { "homedecor:glass_table_large", "homedecor:glass_table_large" }, + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:skylight_frosted", + recipe = { + "dye:white", + "homedecor:skylight" + }, +}) + +minetest.register_craft({ + type = "cooking", + output = "homedecor:skylight", + recipe = "homedecor:skylight_frosted", +}) + +-- recycling + +minetest.register_craft({ + type = "shapeless", + output = "vessels:glass_fragments 2", + recipe = { + "homedecor:skylight", + "homedecor:skylight", + "homedecor:skylight", + "homedecor:skylight", + "homedecor:skylight", + "homedecor:skylight" + } +}) diff --git a/homedecor/textures/homedecor_shingles_asphalt_inv.png b/homedecor_roofing/textures/homedecor_shingles_asphalt_inv.png similarity index 100% rename from homedecor/textures/homedecor_shingles_asphalt_inv.png rename to homedecor_roofing/textures/homedecor_shingles_asphalt_inv.png diff --git a/homedecor/textures/homedecor_shingles_glass.png b/homedecor_roofing/textures/homedecor_shingles_glass.png similarity index 100% rename from homedecor/textures/homedecor_shingles_glass.png rename to homedecor_roofing/textures/homedecor_shingles_glass.png diff --git a/homedecor/textures/homedecor_shingles_wood_inv.png b/homedecor_roofing/textures/homedecor_shingles_wood_inv.png similarity index 100% rename from homedecor/textures/homedecor_shingles_wood_inv.png rename to homedecor_roofing/textures/homedecor_shingles_wood_inv.png diff --git a/homedecor/textures/homedecor_skylight_frosted.png b/homedecor_roofing/textures/homedecor_skylight_frosted.png similarity index 100% rename from homedecor/textures/homedecor_skylight_frosted.png rename to homedecor_roofing/textures/homedecor_skylight_frosted.png diff --git a/homedecor/textures/homedecor_skylight_frosted_inv.png b/homedecor_roofing/textures/homedecor_skylight_frosted_inv.png similarity index 100% rename from homedecor/textures/homedecor_skylight_frosted_inv.png rename to homedecor_roofing/textures/homedecor_skylight_frosted_inv.png diff --git a/homedecor/textures/homedecor_skylight_inv.png b/homedecor_roofing/textures/homedecor_skylight_inv.png similarity index 100% rename from homedecor/textures/homedecor_skylight_inv.png rename to homedecor_roofing/textures/homedecor_skylight_inv.png diff --git a/homedecor_tables/depends.txt b/homedecor_tables/depends.txt new file mode 100644 index 00000000..be47402e --- /dev/null +++ b/homedecor_tables/depends.txt @@ -0,0 +1,4 @@ +homedecor_common +default +basic_materials +homedecor_i18n diff --git a/homedecor/tables.lua b/homedecor_tables/init.lua similarity index 59% rename from homedecor/tables.lua rename to homedecor_tables/init.lua index 70ced410..7fb5dee7 100644 --- a/homedecor/tables.lua +++ b/homedecor_tables/init.lua @@ -200,3 +200,172 @@ homedecor.register("utility_table_legs", { fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } }, }) + +-- crafting + + +minetest.register_craft( { + output = "homedecor:glass_table_small_round_b 15", + recipe = { + { "", "default:glass", "" }, + { "default:glass", "default:glass", "default:glass" }, + { "", "default:glass", "" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:glass_table_small_square_b 2", + recipe = { + {"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" }, + } +}) + +minetest.register_craft( { + output = "homedecor:glass_table_large_b 2", + recipe = { + { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, + } +}) + +-- + +minetest.register_craft( { + output = "homedecor:wood_table_small_round_b 15", + recipe = { + { "", "group:wood", "" }, + { "group:wood", "group:wood", "group:wood" }, + { "", "group:wood", "" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:wood_table_small_square_b 2", + recipe = { + { "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }, + } +}) + +minetest.register_craft( { + output = "homedecor:wood_table_large_b 2", + recipe = { + { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, + } +}) + +-- + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:wood_table_small_round_b", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:wood_table_small_square_b", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:wood_table_large_b", + burntime = 30, +}) + + +minetest.register_craft( { + output = "homedecor:table_legs_wrought_iron 3", + recipe = { + { "", "default:iron_lump", "" }, + { "", "default:iron_lump", "" }, + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:table_legs_brass 3", + recipe = { + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:utility_table_legs", + recipe = { + { "group:stick", "group:stick", "group:stick" }, + { "group:stick", "", "group:stick" }, + { "group:stick", "", "group:stick" }, + }, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:utility_table_legs", + burntime = 30, +}) + + + +-- recycling + +minetest.register_craft({ + type = "shapeless", + output = "vessels:glass_fragments", + recipe = { + "homedecor:glass_table_small_round", + "homedecor:glass_table_small_round", + "homedecor:glass_table_small_round" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "vessels:glass_fragments", + recipe = { + "homedecor:glass_table_small_square", + "homedecor:glass_table_small_square", + "homedecor:glass_table_small_square" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "vessels:glass_fragments", + recipe = { + "homedecor:glass_table_large", + "homedecor:glass_table_large", + "homedecor:glass_table_large" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:stick 4", + recipe = { + "homedecor:wood_table_small_round", + "homedecor:wood_table_small_round", + "homedecor:wood_table_small_round" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:stick 4", + recipe = { + "homedecor:wood_table_small_square", + "homedecor:wood_table_small_square", + "homedecor:wood_table_small_square" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:stick 4", + recipe = { + "homedecor:wood_table_large", + "homedecor:wood_table_large", + "homedecor:wood_table_large" + } +}) diff --git a/homedecor/models/homedecor_table_small_round.obj b/homedecor_tables/models/homedecor_table_small_round.obj similarity index 100% rename from homedecor/models/homedecor_table_small_round.obj rename to homedecor_tables/models/homedecor_table_small_round.obj diff --git a/homedecor/models/homedecor_table_small_square.obj b/homedecor_tables/models/homedecor_table_small_square.obj similarity index 100% rename from homedecor/models/homedecor_table_small_square.obj rename to homedecor_tables/models/homedecor_table_small_square.obj diff --git a/homedecor/textures/homedecor_glass_face_clean.png b/homedecor_tables/textures/homedecor_glass_face_clean.png similarity index 100% rename from homedecor/textures/homedecor_glass_face_clean.png rename to homedecor_tables/textures/homedecor_glass_face_clean.png diff --git a/homedecor/textures/homedecor_glass_table_large_edges.png b/homedecor_tables/textures/homedecor_glass_table_large_edges.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_large_edges.png rename to homedecor_tables/textures/homedecor_glass_table_large_edges.png diff --git a/homedecor/textures/homedecor_glass_table_large_inv.png b/homedecor_tables/textures/homedecor_glass_table_large_inv.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_large_inv.png rename to homedecor_tables/textures/homedecor_glass_table_large_inv.png diff --git a/homedecor/textures/homedecor_glass_table_large_tb.png b/homedecor_tables/textures/homedecor_glass_table_large_tb.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_large_tb.png rename to homedecor_tables/textures/homedecor_glass_table_large_tb.png diff --git a/homedecor/textures/homedecor_glass_table_small_round.png b/homedecor_tables/textures/homedecor_glass_table_small_round.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_small_round.png rename to homedecor_tables/textures/homedecor_glass_table_small_round.png diff --git a/homedecor/textures/homedecor_glass_table_small_round_inv.png b/homedecor_tables/textures/homedecor_glass_table_small_round_inv.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_small_round_inv.png rename to homedecor_tables/textures/homedecor_glass_table_small_round_inv.png diff --git a/homedecor/textures/homedecor_glass_table_small_square.png b/homedecor_tables/textures/homedecor_glass_table_small_square.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_small_square.png rename to homedecor_tables/textures/homedecor_glass_table_small_square.png diff --git a/homedecor/textures/homedecor_glass_table_small_square_inv.png b/homedecor_tables/textures/homedecor_glass_table_small_square_inv.png similarity index 100% rename from homedecor/textures/homedecor_glass_table_small_square_inv.png rename to homedecor_tables/textures/homedecor_glass_table_small_square_inv.png diff --git a/homedecor/textures/homedecor_table_legs_brass.png b/homedecor_tables/textures/homedecor_table_legs_brass.png similarity index 100% rename from homedecor/textures/homedecor_table_legs_brass.png rename to homedecor_tables/textures/homedecor_table_legs_brass.png diff --git a/homedecor/textures/homedecor_table_legs_wrought_iron.png b/homedecor_tables/textures/homedecor_table_legs_wrought_iron.png similarity index 100% rename from homedecor/textures/homedecor_table_legs_wrought_iron.png rename to homedecor_tables/textures/homedecor_table_legs_wrought_iron.png diff --git a/homedecor/textures/homedecor_utility_table_edges.png b/homedecor_tables/textures/homedecor_utility_table_edges.png similarity index 100% rename from homedecor/textures/homedecor_utility_table_edges.png rename to homedecor_tables/textures/homedecor_utility_table_edges.png diff --git a/homedecor/textures/homedecor_utility_table_legs.png b/homedecor_tables/textures/homedecor_utility_table_legs.png similarity index 100% rename from homedecor/textures/homedecor_utility_table_legs.png rename to homedecor_tables/textures/homedecor_utility_table_legs.png diff --git a/homedecor/textures/homedecor_utility_table_legs_inv.png b/homedecor_tables/textures/homedecor_utility_table_legs_inv.png similarity index 100% rename from homedecor/textures/homedecor_utility_table_legs_inv.png rename to homedecor_tables/textures/homedecor_utility_table_legs_inv.png diff --git a/homedecor/textures/homedecor_utility_table_tb.png b/homedecor_tables/textures/homedecor_utility_table_tb.png similarity index 100% rename from homedecor/textures/homedecor_utility_table_tb.png rename to homedecor_tables/textures/homedecor_utility_table_tb.png diff --git a/homedecor/textures/homedecor_wood_table_large_edges.png b/homedecor_tables/textures/homedecor_wood_table_large_edges.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_large_edges.png rename to homedecor_tables/textures/homedecor_wood_table_large_edges.png diff --git a/homedecor/textures/homedecor_wood_table_large_inv.png b/homedecor_tables/textures/homedecor_wood_table_large_inv.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_large_inv.png rename to homedecor_tables/textures/homedecor_wood_table_large_inv.png diff --git a/homedecor/textures/homedecor_wood_table_large_tb.png b/homedecor_tables/textures/homedecor_wood_table_large_tb.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_large_tb.png rename to homedecor_tables/textures/homedecor_wood_table_large_tb.png diff --git a/homedecor/textures/homedecor_wood_table_small_round.png b/homedecor_tables/textures/homedecor_wood_table_small_round.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_small_round.png rename to homedecor_tables/textures/homedecor_wood_table_small_round.png diff --git a/homedecor/textures/homedecor_wood_table_small_round_inv.png b/homedecor_tables/textures/homedecor_wood_table_small_round_inv.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_small_round_inv.png rename to homedecor_tables/textures/homedecor_wood_table_small_round_inv.png diff --git a/homedecor/textures/homedecor_wood_table_small_square.png b/homedecor_tables/textures/homedecor_wood_table_small_square.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_small_square.png rename to homedecor_tables/textures/homedecor_wood_table_small_square.png diff --git a/homedecor/textures/homedecor_wood_table_small_square_inv.png b/homedecor_tables/textures/homedecor_wood_table_small_square_inv.png similarity index 100% rename from homedecor/textures/homedecor_wood_table_small_square_inv.png rename to homedecor_tables/textures/homedecor_wood_table_small_square_inv.png diff --git a/homedecor_trash_cans/depends.txt b/homedecor_trash_cans/depends.txt new file mode 100644 index 00000000..2d665e31 --- /dev/null +++ b/homedecor_trash_cans/depends.txt @@ -0,0 +1,5 @@ +homedecor_common +default +basic_materials +dye +homedecor_i18n diff --git a/homedecor/trash_cans.lua b/homedecor_trash_cans/init.lua similarity index 70% rename from homedecor/trash_cans.lua rename to homedecor_trash_cans/init.lua index 7da6c045..0791a316 100644 --- a/homedecor/trash_cans.lua +++ b/homedecor_trash_cans/init.lua @@ -6,10 +6,12 @@ local tg_cbox = { fixed = { -0.35, -0.5, -0.35, 0.35, 0.4, 0.35 } } +local trashcan_green = 0x00006000 + homedecor.register("trash_can_green", { drawtype = "mesh", mesh = "homedecor_trash_can_green.obj", - tiles = { "homedecor_pool_table_baize.png" }, + tiles = { { name = "homedecor_generic_plastic.png", color = trashcan_green } }, inventory_image = "homedecor_trash_can_green_inv.png", description = S("Green Trash Can"), groups = {snappy=3}, @@ -23,7 +25,7 @@ homedecor.register("trash_can_green", { homedecor.register("trash_can_green_open", { drawtype = "mesh", mesh = "homedecor_trash_can_green_open.obj", - tiles = { "homedecor_pool_table_baize.png" }, + tiles = { { name = "homedecor_generic_plastic.png", color = trashcan_green } }, groups = {snappy=3, not_in_creative_inventory=1}, selection_box = tg_cbox, collision_box = tg_cbox, @@ -64,3 +66,23 @@ homedecor.register("trash_can", { selection_box = trash_cbox, collision_box = trash_cbox, }) + +-- crafting + + +minetest.register_craft( { + output = "homedecor:trash_can 3", + recipe = { + { "basic_materials:steel_wire", "", "basic_materials:steel_wire" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:trash_can_green", + recipe = { + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } + }, +}) diff --git a/homedecor/models/homedecor_trash_can.obj b/homedecor_trash_cans/models/homedecor_trash_can.obj similarity index 100% rename from homedecor/models/homedecor_trash_can.obj rename to homedecor_trash_cans/models/homedecor_trash_can.obj diff --git a/homedecor/models/homedecor_trash_can_green.obj b/homedecor_trash_cans/models/homedecor_trash_can_green.obj similarity index 100% rename from homedecor/models/homedecor_trash_can_green.obj rename to homedecor_trash_cans/models/homedecor_trash_can_green.obj diff --git a/homedecor/models/homedecor_trash_can_green_open.obj b/homedecor_trash_cans/models/homedecor_trash_can_green_open.obj similarity index 100% rename from homedecor/models/homedecor_trash_can_green_open.obj rename to homedecor_trash_cans/models/homedecor_trash_can_green_open.obj diff --git a/homedecor/textures/homedecor_trash_can.png b/homedecor_trash_cans/textures/homedecor_trash_can.png similarity index 100% rename from homedecor/textures/homedecor_trash_can.png rename to homedecor_trash_cans/textures/homedecor_trash_can.png diff --git a/homedecor/textures/homedecor_trash_can_green_inv.png b/homedecor_trash_cans/textures/homedecor_trash_can_green_inv.png similarity index 100% rename from homedecor/textures/homedecor_trash_can_green_inv.png rename to homedecor_trash_cans/textures/homedecor_trash_can_green_inv.png diff --git a/homedecor/textures/homedecor_trash_can_inv.png b/homedecor_trash_cans/textures/homedecor_trash_can_inv.png similarity index 100% rename from homedecor/textures/homedecor_trash_can_inv.png rename to homedecor_trash_cans/textures/homedecor_trash_can_inv.png diff --git a/homedecor_wardrobe/depends.txt b/homedecor_wardrobe/depends.txt index 23634717..084de058 100644 --- a/homedecor_wardrobe/depends.txt +++ b/homedecor_wardrobe/depends.txt @@ -1,2 +1,4 @@ +homedecor_common default -homedecor? +homedecor_misc? +skinsdb? diff --git a/homedecor_windows_and_treatments/depends.txt b/homedecor_windows_and_treatments/depends.txt new file mode 100644 index 00000000..ef56acdf --- /dev/null +++ b/homedecor_windows_and_treatments/depends.txt @@ -0,0 +1,6 @@ +homedecor_common +default +basic_materials +unifieddyes +homedecor_i18n +building_blocks? diff --git a/homedecor/window_treatments.lua b/homedecor_windows_and_treatments/init.lua similarity index 52% rename from homedecor/window_treatments.lua rename to homedecor_windows_and_treatments/init.lua index c7eff500..7a58ab25 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor_windows_and_treatments/init.lua @@ -99,7 +99,7 @@ homedecor.register("blinds_thin", { selection_box = wb2_cbox }) -minetest.register_node("homedecor:curtain_closed", { +minetest.register_node(":homedecor:curtain_closed", { description = S("Curtains"), tiles = { "homedecor_curtain.png" }, inventory_image = "homedecor_curtain.png", @@ -126,7 +126,7 @@ minetest.register_node("homedecor:curtain_closed", { end }) -minetest.register_node("homedecor:curtain_open", { +minetest.register_node(":homedecor:curtain_open", { description = S("Curtains (open)"), tiles = { "homedecor_curtain_open.png" }, inventory_image = "homedecor_curtain_open.png", @@ -211,6 +211,106 @@ homedecor.register("stained_glass", { } }) +-- Various kinds of window shutters + +local shutters = { + "mahogany", + "red", + "yellow", + "forest_green", + "light_blue", + "violet", + "black", + "dark_grey", + "grey", + "white", +} + +local shutter_cbox = { + type = "wallmounted", + wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, + wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, + wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 } +} + +local inv = "homedecor_window_shutter_inv.png^[colorize:#a87034:150" + +homedecor.register("shutter", { + mesh = "homedecor_window_shutter.obj", + tiles = { + { name = "homedecor_window_shutter.png", color = 0xffa87034 } + }, + description = S("Wooden Shutter"), + inventory_image = inv, + wield_image = inv, + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + airbrush_replacement_node = "homedecor:shutter_colored", + groups = { snappy = 3, ud_param2_colorable = 1 }, + sounds = default.node_sound_wood_defaults(), + selection_box = shutter_cbox, + node_box = shutter_cbox, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) + end, +}) + +homedecor.register("shutter_colored", { + mesh = "homedecor_window_shutter.obj", + tiles = { "homedecor_window_shutter.png" }, + description = S("Wooden Shutter"), + inventory_image = "homedecor_window_shutter_inv.png", + wield_image = "homedecor_window_shutter_inv.png", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + groups = { snappy = 3 , not_in_creative_inventory = 1, ud_param2_colorable = 1}, + sounds = default.node_sound_wood_defaults(), + selection_box = shutter_cbox, + node_box = shutter_cbox, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) + end, +}) + +minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") +minetest.register_alias("homedecor:shutter_oak", "homedecor:shutter") + +-- convert old shutters to param2 coloring + +homedecor.old_shutter_nodes = {} + +for _, color in ipairs(shutters) do + table.insert(homedecor.old_shutter_nodes, "homedecor:shutter_"..color) +end + +minetest.register_lbm({ + name = ":homedecor:convert_shutters", + label = "Convert shutter static nodes to use param2 color", + run_at_every_load = false, + nodenames = homedecor.old_shutter_nodes, + action = function(pos, node) + local name = node.name + local color = string.sub(name, string.find(name, "_") + 1) + + if color == "mahogany" then + color = "dark_red" + elseif color == "forest_green" then + color = "dark_green" + elseif color == "light_blue" then + color = "medium_cyan" + elseif color == "red" then + color = "medium_red" + end + + local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") + local param2 = paletteidx + node.param2 + + minetest.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 }) + local meta = minetest.get_meta(pos) + meta:set_string("dye", "unifieddyes:"..color) + end +}) + -- Convert old curtain nodes to param2-colorization local curtaincolors = { @@ -230,7 +330,7 @@ for _, color in ipairs(curtaincolors) do end minetest.register_lbm({ - name = "homedecor:convert_curtains", + name = ":homedecor:convert_curtains", label = "Convert static curtain nodes to use param2 color", run_at_every_load = false, nodenames = homedecor.old_static_curtain_nodes, @@ -258,3 +358,176 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..metadye) end }) + +-- crafting + + +minetest.register_craft( { + output = "homedecor:shutter 2", + recipe = { + { "group:stick", "group:stick" }, + { "group:stick", "group:stick" }, + { "group:stick", "group:stick" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:shutter_colored", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:shutter", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:shutter_oak", + burntime = 30, +}) + + +minetest.register_craft( { + output = "homedecor:curtain_closed 4", + recipe = { + { "wool:white", "", ""}, + { "wool:white", "", ""}, + { "wool:white", "", ""}, + }, +}) + +minetest.register_craft( { + output = "homedecor:curtain_closed 4", + recipe = { + { "cottages:wool", "", ""}, + { "cottages:wool", "", ""}, + { "cottages:wool", "", ""}, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:curtain_closed", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:curtain_closed", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +unifieddyes.register_color_craft({ + output = "homedecor:curtain_open", + palette = "wallmounted", + type = "shapeless", + neutral_node = "homedecor:curtain_open", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +local mats = { + { "brass", "homedecor:pole_brass" }, + { "wrought_iron", "homedecor:pole_wrought_iron" }, + { "wood", "group:stick" } +} + +for i in ipairs(mats) do + local material = mats[i][1] + local ingredient = mats[i][2] + minetest.register_craft( { + output = "homedecor:curtainrod_"..material.." 3", + recipe = { + { ingredient, ingredient, ingredient }, + }, + }) +end + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:window_plain 8", + recipe = { + "dye:white", + "dye:white", + "dye:white", + "dye:white", + "building_blocks:woodglass" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:window_quartered", + recipe = { + "dye:white", + "group:stick", + "group:stick", + "homedecor:window_plain" + } +}) + +minetest.register_craft({ + output = "homedecor:blinds_thin", + recipe = { + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "" }, + { "", "basic_materials:plastic_strip", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:blinds_thick", + recipe = { + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, + { "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, + }, +}) + +minetest.register_craft( { + output = "homedecor:window_flowerbox", + recipe = { + { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" }, + { "", "homedecor:roof_tile_terracotta", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass 8", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "default:glass", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass 3", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "xpanes:pane_flat", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass 2", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "cottages:glass_pane_side", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass 2", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "cottages:glass_pane", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + diff --git a/homedecor/models/homedecor_window_shutter.obj b/homedecor_windows_and_treatments/models/homedecor_window_shutter.obj similarity index 100% rename from homedecor/models/homedecor_window_shutter.obj rename to homedecor_windows_and_treatments/models/homedecor_window_shutter.obj diff --git a/homedecor/models/homedecor_windowblind_thick.obj b/homedecor_windows_and_treatments/models/homedecor_windowblind_thick.obj similarity index 100% rename from homedecor/models/homedecor_windowblind_thick.obj rename to homedecor_windows_and_treatments/models/homedecor_windowblind_thick.obj diff --git a/homedecor/models/homedecor_windowblind_thin.obj b/homedecor_windows_and_treatments/models/homedecor_windowblind_thin.obj similarity index 100% rename from homedecor/models/homedecor_windowblind_thin.obj rename to homedecor_windows_and_treatments/models/homedecor_windowblind_thin.obj diff --git a/homedecor/textures/homedecor_curtain.png b/homedecor_windows_and_treatments/textures/homedecor_curtain.png similarity index 100% rename from homedecor/textures/homedecor_curtain.png rename to homedecor_windows_and_treatments/textures/homedecor_curtain.png diff --git a/homedecor/textures/homedecor_curtain_open.png b/homedecor_windows_and_treatments/textures/homedecor_curtain_open.png similarity index 100% rename from homedecor/textures/homedecor_curtain_open.png rename to homedecor_windows_and_treatments/textures/homedecor_curtain_open.png diff --git a/homedecor/textures/homedecor_curtainrod_brass_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_brass_inv.png similarity index 100% rename from homedecor/textures/homedecor_curtainrod_brass_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_curtainrod_brass_inv.png diff --git a/homedecor/textures/homedecor_curtainrod_wood_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wood_inv.png similarity index 100% rename from homedecor/textures/homedecor_curtainrod_wood_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_curtainrod_wood_inv.png diff --git a/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wrought_iron_inv.png similarity index 100% rename from homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_curtainrod_wrought_iron_inv.png diff --git a/homedecor/textures/homedecor_flowerbox_bottom.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_bottom.png similarity index 100% rename from homedecor/textures/homedecor_flowerbox_bottom.png rename to homedecor_windows_and_treatments/textures/homedecor_flowerbox_bottom.png diff --git a/homedecor/textures/homedecor_flowerbox_inv.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_inv.png similarity index 100% rename from homedecor/textures/homedecor_flowerbox_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_flowerbox_inv.png diff --git a/homedecor/textures/homedecor_flowerbox_sides.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_sides.png similarity index 100% rename from homedecor/textures/homedecor_flowerbox_sides.png rename to homedecor_windows_and_treatments/textures/homedecor_flowerbox_sides.png diff --git a/homedecor/textures/homedecor_flowerbox_top.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_top.png similarity index 100% rename from homedecor/textures/homedecor_flowerbox_top.png rename to homedecor_windows_and_treatments/textures/homedecor_flowerbox_top.png diff --git a/homedecor/textures/homedecor_stained_glass.png b/homedecor_windows_and_treatments/textures/homedecor_stained_glass.png similarity index 100% rename from homedecor/textures/homedecor_stained_glass.png rename to homedecor_windows_and_treatments/textures/homedecor_stained_glass.png diff --git a/homedecor/textures/homedecor_window_frame.png b/homedecor_windows_and_treatments/textures/homedecor_window_frame.png similarity index 100% rename from homedecor/textures/homedecor_window_frame.png rename to homedecor_windows_and_treatments/textures/homedecor_window_frame.png diff --git a/homedecor/textures/homedecor_window_quartered.png b/homedecor_windows_and_treatments/textures/homedecor_window_quartered.png similarity index 100% rename from homedecor/textures/homedecor_window_quartered.png rename to homedecor_windows_and_treatments/textures/homedecor_window_quartered.png diff --git a/homedecor/textures/homedecor_window_shutter.png b/homedecor_windows_and_treatments/textures/homedecor_window_shutter.png similarity index 100% rename from homedecor/textures/homedecor_window_shutter.png rename to homedecor_windows_and_treatments/textures/homedecor_window_shutter.png diff --git a/homedecor/textures/homedecor_window_shutter_inv.png b/homedecor_windows_and_treatments/textures/homedecor_window_shutter_inv.png similarity index 100% rename from homedecor/textures/homedecor_window_shutter_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_window_shutter_inv.png diff --git a/homedecor/textures/homedecor_window_sides.png b/homedecor_windows_and_treatments/textures/homedecor_window_sides.png similarity index 100% rename from homedecor/textures/homedecor_window_sides.png rename to homedecor_windows_and_treatments/textures/homedecor_window_sides.png diff --git a/homedecor/textures/homedecor_windowblind_strings.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_strings.png similarity index 100% rename from homedecor/textures/homedecor_windowblind_strings.png rename to homedecor_windows_and_treatments/textures/homedecor_windowblind_strings.png diff --git a/homedecor/textures/homedecor_windowblind_thick_inv.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thick_inv.png similarity index 100% rename from homedecor/textures/homedecor_windowblind_thick_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_windowblind_thick_inv.png diff --git a/homedecor/textures/homedecor_windowblind_thin_inv.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thin_inv.png similarity index 100% rename from homedecor/textures/homedecor_windowblind_thin_inv.png rename to homedecor_windows_and_treatments/textures/homedecor_windowblind_thin_inv.png diff --git a/homedecor/textures/homedecor_windowblinds.png b/homedecor_windows_and_treatments/textures/homedecor_windowblinds.png similarity index 100% rename from homedecor/textures/homedecor_windowblinds.png rename to homedecor_windows_and_treatments/textures/homedecor_windowblinds.png diff --git a/homedecor/listnodes.sh b/listnodes.sh similarity index 100% rename from homedecor/listnodes.sh rename to listnodes.sh From bb808a944c2566d3081f6982b2bb15c40dffb5e6 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 20 Apr 2019 15:54:10 -0400 Subject: [PATCH 33/40] fix wrong "kitchen" chair selection box --- homedecor_furniture/init.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/homedecor_furniture/init.lua b/homedecor_furniture/init.lua index a88849e7..cf0666ff 100644 --- a/homedecor_furniture/init.lua +++ b/homedecor_furniture/init.lua @@ -34,15 +34,7 @@ end local kc_cbox = { type = "fixed", - fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 }, -} - -local ac_cbox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 0.5 }, - {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } - } + fixed = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, 0.5 }, } homedecor.register("kitchen_chair_wood", { @@ -92,6 +84,14 @@ homedecor.register("kitchen_chair_padded", { end }) +local ac_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5 }, + {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } + } +} + homedecor.register("armchair", { description = S("Armchair"), mesh = "forniture_armchair.obj", From b94139c9df0c55b0e5f9ade3e260e6d511ef302e Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 20 Apr 2019 15:59:23 -0400 Subject: [PATCH 34/40] lighter, softer building_blocks marble texture --- .../textures/building_blocks_marble.png | Bin 499 -> 450 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/building_blocks/textures/building_blocks_marble.png b/building_blocks/textures/building_blocks_marble.png index 94aad999ad289a5d26d300c28d3b03b0ad72780d..497e2b6c09ba691cf8f401aa196a484b6b2fedc9 100644 GIT binary patch delta 435 zcmV;k0Zjh$1HuE48Gix*005AYXf^-<0f|XOK~yNubjwf^jx4OG?2Qqm?2?ATd!vu75>m-Fx3^1L{iaN^zbq zobyIR6{y3qtjO5ttUEabfaCEv2$NGDN2|~P@Ohp?2ujJ*HO_HJxsYo5Uh6c{=Uvv=nz8e0D3TtwVU@jm1&xA z&wKAj{P*U-KfUc}8`zLrYYuig6UlZr#tuaO$b&olBdmPgdSJX`ZFK%`#sqNU>An3+DycT|ht%_y8Cw0G&{j4Pangs*1t-rgoS z|GIyQ%F9yUMIMu$YX-_pd?J}Sanf|lLLtGnNqyH6_unt(Qq?X${`9e7Z{}MjWdq50lKpO{}d6|V?Rw3pXYi`o?~*dz+74{U%X{qslhI`zQ+NvYr}q4 z7B^SgF9};OcyhwU150k^7|is`kk&mmt@r<% Date: Sun, 21 Apr 2019 07:47:09 -0400 Subject: [PATCH 35/40] fix a couple of wrong depends --- fake_fire/depends.txt | 2 +- plasmascreen/depends.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fake_fire/depends.txt b/fake_fire/depends.txt index f91fb9f6..de194855 100644 --- a/fake_fire/depends.txt +++ b/fake_fire/depends.txt @@ -1,2 +1,2 @@ default -homedecor +homedecor_i18n diff --git a/plasmascreen/depends.txt b/plasmascreen/depends.txt index 7b3e79f7..3ea0d975 100644 --- a/plasmascreen/depends.txt +++ b/plasmascreen/depends.txt @@ -1,2 +1,3 @@ default -homedecor +homedecor_i18n +homedecor_electronics From 8b78caf7c6cfe7d15cc692a897921e8ff7eb7883 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Sun, 21 Apr 2019 15:22:27 +0100 Subject: [PATCH 36/40] wardrobe now uses homedecor api --- homedecor_wardrobe/init.lua | 115 +----------------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua index aaffc0db..4927ed3f 100644 --- a/homedecor_wardrobe/init.lua +++ b/homedecor_wardrobe/init.lua @@ -2,118 +2,6 @@ modpath = minetest.get_modpath("homedecor") screwdriver = screwdriver or {} -local placeholder_node = "air" - ---- select which node was pointed at based on it being known, not ignored, --- buildable_to. returns nil if no node could be selected -local function select_node(pointed_thing) - - local pos = pointed_thing.under - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - - if not def or not def.buildable_to then - - pos = pointed_thing.above - node = minetest.get_node_or_nil(pos) - def = node and minetest.registered_nodes[node.name] - end - - return def and pos, def -end - ---- check if all nodes can and may be build to -local function is_buildable_to(placer_name, ...) - - for _, pos in ipairs({...}) do - - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - - if not (def and def.buildable_to) - or minetest.is_protected(pos, placer_name) then - return false - end - end - - return true -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, pointed_thing) - - local placer_name = placer:get_player_name() or "" - - if is_buildable_to(placer_name, pos, pos2) then - - local lfdir = fdir or minetest.dir_to_facedir(placer:get_look_dir()) - - minetest.set_node(pos, {name = node1, param2 = lfdir}) - - -- this can be used to clear buildable_to nodes even though we are - -- using a multinode mesh, do not assume by default, as we still - -- might want to allow overlapping in some cases - node2 = node2 or "air" - - local has_facedir = node2 ~= "air" - - if node2 == "placeholder" then - has_facedir = false - node2 = placeholder_node - end - - minetest.set_node(pos2, {name = node2, - param2 = (has_facedir and lfdir) or nil}) - - -- call after_place_node of the placed node if available - local ctrl_node_def = minetest.registered_nodes[node1] - - if ctrl_node_def and ctrl_node_def.after_place_node then - ctrl_node_def.after_place_node(pos, placer, itemstack, pointed_thing) - end - - if not creative.is_enabled_for(placer_name) then - itemstack:take_item() - end - end - - return itemstack -end - -local function rightclick_pointed_thing(pos, placer, itemstack, pointed_thing) - - local node = minetest.get_node_or_nil(pos) - - if not node then return false end - - local def = minetest.registered_nodes[node.name] - - if not def or not def.on_rightclick then return false end - - return def.on_rightclick(pos, node, placer, itemstack, pointed_thing) or itemstack -end - --- Stack one node above another --- leave the last argument nil if it's one 2m high node -local function stack_vertically(itemstack, placer, pointed_thing, - node1, node2) - - local rightclick_result = rightclick_pointed_thing(pointed_thing.under, - placer, itemstack, pointed_thing) - - if rightclick_result then return rightclick_result end - - local pos, def = select_node(pointed_thing) - - if not pos then return 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, pointed_thing) -end - local placeholder_node = "air" local wd_cbox = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}} @@ -127,7 +15,6 @@ local armor_mod_path = minetest.get_modpath("3d_armor") local skinslist = {"male1", "male2", "male3", "male4", "male5"} local default_skin = "character.png" - local skinsdb_mod_path = minetest.get_modpath("skinsdb") if skinsdb_mod_path then @@ -221,7 +108,7 @@ local def = { on_place = function(itemstack, placer, pointed_thing) - return stack_vertically(itemstack, placer, pointed_thing, + return homedecor.stack_vertically(itemstack, placer, pointed_thing, itemstack:get_name(), "placeholder") end, From 0cd8bd7780ff62cd718d90ec72011b58fcd19ec5 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Sun, 21 Apr 2019 16:25:21 +0100 Subject: [PATCH 37/40] remove homedecor_i18n and merged into homedecor_common, fixed meseon global error --- building_blocks/alias.lua | 2 +- building_blocks/depends.txt | 2 +- building_blocks/init.lua | 4 ++-- building_blocks/node_stairs.lua | 4 ++-- building_blocks/others.lua | 4 ++-- building_blocks/recipes.lua | 2 +- computer/computers.lua | 2 +- computer/depends.txt | 2 +- computer/miscitems.lua | 2 +- computer/tetris.lua | 4 ++-- fake_fire/depends.txt | 4 ++-- fake_fire/init.lua | 2 +- homedecor_bathroom/depends.txt | 1 - homedecor_bathroom/init.lua | 5 +---- homedecor_bedroom/depends.txt | 1 - homedecor_bedroom/init.lua | 2 +- homedecor_books/depends.txt | 1 - homedecor_books/init.lua | 2 +- homedecor_climate_control/depends.txt | 1 - homedecor_climate_control/init.lua | 2 +- homedecor_clocks/depends.txt | 1 - homedecor_clocks/init.lua | 2 +- homedecor_cobweb/depends.txt | 1 - homedecor_cobweb/init.lua | 2 +- homedecor_common/crafts.lua | 2 +- homedecor_common/depends.txt | 3 +-- homedecor_common/expansion.lua | 2 +- homedecor_common/furnaces.lua | 2 +- homedecor_common/init.lua | 7 +++++-- {homedecor_i18n => homedecor_common}/intllib.lua | 0 homedecor_common/inventory.lua | 2 +- {homedecor_i18n => homedecor_common}/locale/de.po | 0 {homedecor_i18n => homedecor_common}/locale/es.po | 0 {homedecor_i18n => homedecor_common}/locale/fr.po | 0 {homedecor_i18n => homedecor_common}/locale/it.po | 0 {homedecor_i18n => homedecor_common}/locale/ms.po | 0 {homedecor_i18n => homedecor_common}/locale/pt.po | 0 {homedecor_i18n => homedecor_common}/locale/pt_BR.po | 0 {homedecor_i18n => homedecor_common}/locale/ru.po | 0 {homedecor_i18n => homedecor_common}/locale/template.pot | 0 {homedecor_i18n => homedecor_common}/tools/updatepo.sh | 0 homedecor_doors_and_gates/depends.txt | 1 - homedecor_doors_and_gates/init.lua | 7 +++++-- homedecor_electrical/depends.txt | 1 - homedecor_electrical/init.lua | 2 +- homedecor_electronics/depends.txt | 1 - homedecor_electronics/init.lua | 2 +- homedecor_exterior/depends.txt | 1 - homedecor_exterior/init.lua | 2 +- homedecor_fences/depends.txt | 1 - homedecor_fences/init.lua | 2 +- homedecor_foyer/depends.txt | 1 - homedecor_foyer/init.lua | 2 +- homedecor_furniture/depends.txt | 1 - homedecor_furniture/init.lua | 2 +- homedecor_furniture_medieval/depends.txt | 1 - homedecor_furniture_medieval/init.lua | 2 +- homedecor_gastronomy/depends.txt | 1 - homedecor_gastronomy/init.lua | 2 +- homedecor_i18n/depends.txt | 1 - homedecor_i18n/init.lua | 7 ------- homedecor_kitchen/depends.txt | 1 - homedecor_kitchen/init.lua | 4 +--- homedecor_laundry/depends.txt | 1 - homedecor_lighting/depends.txt | 1 - homedecor_lighting/init.lua | 2 +- homedecor_misc/depends.txt | 1 - homedecor_misc/init.lua | 8 ++++---- homedecor_office/depends.txt | 1 - homedecor_office/init.lua | 2 +- homedecor_pictures_and_paintings/depends.txt | 1 - homedecor_pictures_and_paintings/init.lua | 2 +- homedecor_roofing/depends.txt | 1 - homedecor_roofing/init.lua | 2 +- homedecor_tables/depends.txt | 1 - homedecor_tables/init.lua | 2 +- homedecor_trash_cans/depends.txt | 1 - homedecor_trash_cans/init.lua | 2 +- homedecor_windows_and_treatments/depends.txt | 1 - homedecor_windows_and_treatments/init.lua | 2 +- inbox/depends.txt | 2 +- inbox/init.lua | 2 +- itemframes/depends.txt | 2 +- itemframes/init.lua | 4 ++-- lavalamp/depends.txt | 2 +- lavalamp/init.lua | 2 +- lrfurn/armchairs.lua | 2 +- lrfurn/coffeetable.lua | 2 +- lrfurn/depends.txt | 2 +- lrfurn/endtable.lua | 2 +- lrfurn/init.lua | 2 +- lrfurn/longsofas.lua | 2 +- lrfurn/sofas.lua | 2 +- plasmascreen/depends.txt | 2 +- plasmascreen/init.lua | 2 +- 95 files changed, 74 insertions(+), 107 deletions(-) rename {homedecor_i18n => homedecor_common}/intllib.lua (100%) rename {homedecor_i18n => homedecor_common}/locale/de.po (100%) rename {homedecor_i18n => homedecor_common}/locale/es.po (100%) rename {homedecor_i18n => homedecor_common}/locale/fr.po (100%) rename {homedecor_i18n => homedecor_common}/locale/it.po (100%) rename {homedecor_i18n => homedecor_common}/locale/ms.po (100%) rename {homedecor_i18n => homedecor_common}/locale/pt.po (100%) rename {homedecor_i18n => homedecor_common}/locale/pt_BR.po (100%) rename {homedecor_i18n => homedecor_common}/locale/ru.po (100%) rename {homedecor_i18n => homedecor_common}/locale/template.pot (100%) rename {homedecor_i18n => homedecor_common}/tools/updatepo.sh (100%) delete mode 100644 homedecor_i18n/depends.txt delete mode 100644 homedecor_i18n/init.lua diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 8d6520b0..1ac24f52 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index 641d412a..a890df8d 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,5 +1,5 @@ default -homedecor_i18n +homedecor_common moreblocks? gloopblocks? stairs? diff --git a/building_blocks/init.lua b/building_blocks/init.lua index fc0c9e4c..fbb81a48 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,7 +1,7 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local modpath = minetest.get_modpath("building_blocks") dofile(modpath.."/alias.lua") dofile(modpath.."/node_stairs.lua") dofile(modpath.."/others.lua") -dofile(modpath.."/recipes.lua") \ No newline at end of file +dofile(modpath.."/recipes.lua") diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index b0fecb4c..daba5679 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"} @@ -33,7 +33,7 @@ local function building_blocks_stairs(nodename, def) ("%s Slab"):format(def.description), def.sounds ) - end + end end end diff --git a/building_blocks/others.lua b/building_blocks/others.lua index 180aa707..2cc613f9 100644 --- a/building_blocks/others.lua +++ b/building_blocks/others.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_craftitem("building_blocks:sticks", { description = S("Small bundle of sticks"), @@ -20,4 +20,4 @@ minetest.register_tool("building_blocks:knife", { fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1} } }, -}) \ No newline at end of file +}) diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index 42ac0a8b..689643fe 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext if minetest.get_modpath("moreblocks") then minetest.register_craft({ diff --git a/computer/computers.lua b/computer/computers.lua index b9d3dc47..06b04a93 100644 --- a/computer/computers.lua +++ b/computer/computers.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- Amiga 500 lookalike computer.register("computer:shefriendSOO", { diff --git a/computer/depends.txt b/computer/depends.txt index 947d2a71..997cb0b2 100644 --- a/computer/depends.txt +++ b/computer/depends.txt @@ -1,2 +1,2 @@ default -homedecor_i18n +homedecor_common diff --git a/computer/miscitems.lua b/computer/miscitems.lua index bbef89ba..1eb0634b 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -2,7 +2,7 @@ -- This file defines some items in order to not have to depend on other mods. -local S = homedecor_i18n.gettext +local S = homedecor.gettext if (not minetest.get_modpath("homedecor")) then diff --git a/computer/tetris.lua b/computer/tetris.lua index 023fc4d3..85e91513 100644 --- a/computer/tetris.lua +++ b/computer/tetris.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local shapes = { { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, @@ -231,7 +231,7 @@ local function step(pos, fields) local scr = { formsize, background, t.boardstring, t.previewstring, draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy), - "label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "), + "label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "), t.score, close, buttons } diff --git a/fake_fire/depends.txt b/fake_fire/depends.txt index de194855..997cb0b2 100644 --- a/fake_fire/depends.txt +++ b/fake_fire/depends.txt @@ -1,2 +1,2 @@ -default -homedecor_i18n +default +homedecor_common diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 55099768..6bdf0b21 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext screwdriver = screwdriver or {} diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt index 949c189c..8cb6cfda 100644 --- a/homedecor_bathroom/depends.txt +++ b/homedecor_bathroom/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 51f341bb..0811b700 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node(":homedecor:bathroom_tiles_dark", { description = S("Bathroom/kitchen tiles (dark)"), @@ -115,9 +115,6 @@ homedecor.register("medicine_cabinet_open", { -- "Sanitation" related - -local S = homedecor_i18n.gettext - local toilet_sbox = { type = "fixed", fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 }, diff --git a/homedecor_bedroom/depends.txt b/homedecor_bedroom/depends.txt index 9242a25b..f2e42cf9 100644 --- a/homedecor_bedroom/depends.txt +++ b/homedecor_bedroom/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n creative diff --git a/homedecor_bedroom/init.lua b/homedecor_bedroom/init.lua index 86b00fe5..fc3f7339 100644 --- a/homedecor_bedroom/init.lua +++ b/homedecor_bedroom/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_books/depends.txt b/homedecor_books/depends.txt index ed0ab327..ddb63ed1 100644 --- a/homedecor_books/depends.txt +++ b/homedecor_books/depends.txt @@ -1,6 +1,5 @@ homedecor_common default unifieddyes -homedecor_i18n creative diff --git a/homedecor_books/init.lua b/homedecor_books/init.lua index fb272c0b..3bdce05c 100644 --- a/homedecor_books/init.lua +++ b/homedecor_books/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_climate_control/depends.txt b/homedecor_climate_control/depends.txt index aae5ef28..f37b6553 100644 --- a/homedecor_climate_control/depends.txt +++ b/homedecor_climate_control/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n building_blocks? diff --git a/homedecor_climate_control/init.lua b/homedecor_climate_control/init.lua index 75fe7aa9..5524f261 100644 --- a/homedecor_climate_control/init.lua +++ b/homedecor_climate_control/init.lua @@ -1,6 +1,6 @@ -- Nodes that would affect the local temperature e.g. fans, heater, A/C -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("air_conditioner", { description = S("Air Conditioner"), diff --git a/homedecor_clocks/depends.txt b/homedecor_clocks/depends.txt index d581ebf7..ff3cb2b6 100644 --- a/homedecor_clocks/depends.txt +++ b/homedecor_clocks/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials dye -homedecor_i18n building_blocks? diff --git a/homedecor_clocks/init.lua b/homedecor_clocks/init.lua index 6bb610d7..42510601 100644 --- a/homedecor_clocks/init.lua +++ b/homedecor_clocks/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local clock_sbox = { type = "fixed", diff --git a/homedecor_cobweb/depends.txt b/homedecor_cobweb/depends.txt index b3703586..917d5132 100644 --- a/homedecor_cobweb/depends.txt +++ b/homedecor_cobweb/depends.txt @@ -1,3 +1,2 @@ homedecor_common default -homedecor_i18n diff --git a/homedecor_cobweb/init.lua b/homedecor_cobweb/init.lua index 0e7e0d75..eae886e2 100644 --- a/homedecor_cobweb/init.lua +++ b/homedecor_cobweb/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node(":homedecor:cobweb_corner", { description = S("Cobweb"), diff --git a/homedecor_common/crafts.lua b/homedecor_common/crafts.lua index db76b7b9..547ef186 100644 --- a/homedecor_common/crafts.lua +++ b/homedecor_common/crafts.lua @@ -1,6 +1,6 @@ -- crafts for common items that are used by more than one home decor component -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- items diff --git a/homedecor_common/depends.txt b/homedecor_common/depends.txt index b01e59f1..a78a220e 100644 --- a/homedecor_common/depends.txt +++ b/homedecor_common/depends.txt @@ -1,4 +1,3 @@ default -homedecor_i18n creative -building_blocks? + diff --git a/homedecor_common/expansion.lua b/homedecor_common/expansion.lua index bd87e90e..26efc6a8 100644 --- a/homedecor_common/expansion.lua +++ b/homedecor_common/expansion.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- vectors to place one node next to or behind another diff --git a/homedecor_common/furnaces.lua b/homedecor_common/furnaces.lua index 36a79391..d628273a 100644 --- a/homedecor_common/furnaces.lua +++ b/homedecor_common/furnaces.lua @@ -1,6 +1,6 @@ -- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures. -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function swap_node(pos, name) local node = minetest.get_node(pos) diff --git a/homedecor_common/init.lua b/homedecor_common/init.lua index 13392d8e..6d81c44b 100644 --- a/homedecor_common/init.lua +++ b/homedecor_common/init.lua @@ -3,11 +3,14 @@ local modpath = minetest.get_modpath("homedecor_common") -local S = homedecor_i18n.gettext - homedecor = {} homedecor.modpath = modpath +-- Intllib support +homedecor.gettext, homedecor.ngettext = dofile(modpath.."/intllib.lua") + +local S = homedecor.gettext + -- Determine if the item being pointed at is the underside of a node (e.g a ceiling) function homedecor.find_ceiling(itemstack, placer, pointed_thing) -- most of this is copied from the rotate-and-place function in builtin diff --git a/homedecor_i18n/intllib.lua b/homedecor_common/intllib.lua similarity index 100% rename from homedecor_i18n/intllib.lua rename to homedecor_common/intllib.lua diff --git a/homedecor_common/inventory.lua b/homedecor_common/inventory.lua index dd091339..2a49228c 100644 --- a/homedecor_common/inventory.lua +++ b/homedecor_common/inventory.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local default_can_dig = function(pos,player) local meta = minetest.get_meta(pos) diff --git a/homedecor_i18n/locale/de.po b/homedecor_common/locale/de.po similarity index 100% rename from homedecor_i18n/locale/de.po rename to homedecor_common/locale/de.po diff --git a/homedecor_i18n/locale/es.po b/homedecor_common/locale/es.po similarity index 100% rename from homedecor_i18n/locale/es.po rename to homedecor_common/locale/es.po diff --git a/homedecor_i18n/locale/fr.po b/homedecor_common/locale/fr.po similarity index 100% rename from homedecor_i18n/locale/fr.po rename to homedecor_common/locale/fr.po diff --git a/homedecor_i18n/locale/it.po b/homedecor_common/locale/it.po similarity index 100% rename from homedecor_i18n/locale/it.po rename to homedecor_common/locale/it.po diff --git a/homedecor_i18n/locale/ms.po b/homedecor_common/locale/ms.po similarity index 100% rename from homedecor_i18n/locale/ms.po rename to homedecor_common/locale/ms.po diff --git a/homedecor_i18n/locale/pt.po b/homedecor_common/locale/pt.po similarity index 100% rename from homedecor_i18n/locale/pt.po rename to homedecor_common/locale/pt.po diff --git a/homedecor_i18n/locale/pt_BR.po b/homedecor_common/locale/pt_BR.po similarity index 100% rename from homedecor_i18n/locale/pt_BR.po rename to homedecor_common/locale/pt_BR.po diff --git a/homedecor_i18n/locale/ru.po b/homedecor_common/locale/ru.po similarity index 100% rename from homedecor_i18n/locale/ru.po rename to homedecor_common/locale/ru.po diff --git a/homedecor_i18n/locale/template.pot b/homedecor_common/locale/template.pot similarity index 100% rename from homedecor_i18n/locale/template.pot rename to homedecor_common/locale/template.pot diff --git a/homedecor_i18n/tools/updatepo.sh b/homedecor_common/tools/updatepo.sh similarity index 100% rename from homedecor_i18n/tools/updatepo.sh rename to homedecor_common/tools/updatepo.sh diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt index f111618f..b93a08fe 100644 --- a/homedecor_doors_and_gates/depends.txt +++ b/homedecor_doors_and_gates/depends.txt @@ -2,6 +2,5 @@ homedecor_common default basic_materials dye -homedecor_i18n doors mesecons? diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 5a76bf99..1435cbe3 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -1,10 +1,13 @@ -- Node definitions for Homedecor doors -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end -local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate +local m_rules +if minetest.global_exists("mesecon") then + m_rules = mesecon and mesecon.rules and mesecon.rules.pplate +end -- doors diff --git a/homedecor_electrical/depends.txt b/homedecor_electrical/depends.txt index be47402e..fb5d6010 100644 --- a/homedecor_electrical/depends.txt +++ b/homedecor_electrical/depends.txt @@ -1,4 +1,3 @@ homedecor_common default basic_materials -homedecor_i18n diff --git a/homedecor_electrical/init.lua b/homedecor_electrical/init.lua index ae4dd8c0..c135021a 100644 --- a/homedecor_electrical/init.lua +++ b/homedecor_electrical/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("power_outlet", { description = S("Power Outlet"), diff --git a/homedecor_electronics/depends.txt b/homedecor_electronics/depends.txt index 54783361..68793864 100644 --- a/homedecor_electronics/depends.txt +++ b/homedecor_electronics/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n moreblocks? diff --git a/homedecor_electronics/init.lua b/homedecor_electronics/init.lua index 5843f034..004a6398 100644 --- a/homedecor_electronics/init.lua +++ b/homedecor_electronics/init.lua @@ -1,6 +1,6 @@ -- Various home electronics -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("speaker", { description = S("Large Stereo Speaker"), diff --git a/homedecor_exterior/depends.txt b/homedecor_exterior/depends.txt index 98c73413..4f9910bc 100644 --- a/homedecor_exterior/depends.txt +++ b/homedecor_exterior/depends.txt @@ -1,7 +1,6 @@ homedecor_common default dye -homedecor_i18n creative moreblocks? building_blocks? diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index a4bcb04f..efe3883f 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_fences/depends.txt b/homedecor_fences/depends.txt index bb6198ed..8505ec7c 100644 --- a/homedecor_fences/depends.txt +++ b/homedecor_fences/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials dye -homedecor_i18n signs_lib? diff --git a/homedecor_fences/init.lua b/homedecor_fences/init.lua index 7742d7ad..94badf60 100644 --- a/homedecor_fences/init.lua +++ b/homedecor_fences/init.lua @@ -14,7 +14,7 @@ if signs_modpath then sign_post_model = signs_lib.sign_post_model.nodebox end -local S = homedecor_i18n.gettext +local S = homedecor.gettext local materials = { { S("brass"), "brass" }, diff --git a/homedecor_foyer/depends.txt b/homedecor_foyer/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_foyer/depends.txt +++ b/homedecor_foyer/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_foyer/init.lua b/homedecor_foyer/init.lua index baa07771..0b466f3c 100644 --- a/homedecor_foyer/init.lua +++ b/homedecor_foyer/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("coatrack_wallmount", { tiles = { homedecor.plain_wood }, diff --git a/homedecor_furniture/depends.txt b/homedecor_furniture/depends.txt index 5bb2547c..016b9c4a 100644 --- a/homedecor_furniture/depends.txt +++ b/homedecor_furniture/depends.txt @@ -1,7 +1,6 @@ homedecor_common default unifieddyes -homedecor_i18n wool moreblocks? technic? diff --git a/homedecor_furniture/init.lua b/homedecor_furniture/init.lua index cf0666ff..108f28d2 100644 --- a/homedecor_furniture/init.lua +++ b/homedecor_furniture/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local table_colors = { { "", S("Table"), homedecor.plain_wood }, diff --git a/homedecor_furniture_medieval/depends.txt b/homedecor_furniture_medieval/depends.txt index 4948e7e6..dccb7bc8 100644 --- a/homedecor_furniture_medieval/depends.txt +++ b/homedecor_furniture_medieval/depends.txt @@ -1,4 +1,3 @@ homedecor_common default -homedecor_i18n creative diff --git a/homedecor_furniture_medieval/init.lua b/homedecor_furniture_medieval/init.lua index e0932a44..9fb9a9ef 100644 --- a/homedecor_furniture_medieval/init.lua +++ b/homedecor_furniture_medieval/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("bars", { description = S("Bars"), diff --git a/homedecor_gastronomy/depends.txt b/homedecor_gastronomy/depends.txt index cd30824b..c378b98e 100644 --- a/homedecor_gastronomy/depends.txt +++ b/homedecor_gastronomy/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials dye -homedecor_i18n creative currency? bucket? diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua index eef49f00..2d0a3996 100644 --- a/homedecor_gastronomy/init.lua +++ b/homedecor_gastronomy/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local cutlery_cbox = { type = "fixed", diff --git a/homedecor_i18n/depends.txt b/homedecor_i18n/depends.txt deleted file mode 100644 index 77e8d97c..00000000 --- a/homedecor_i18n/depends.txt +++ /dev/null @@ -1 +0,0 @@ -intllib? diff --git a/homedecor_i18n/init.lua b/homedecor_i18n/init.lua deleted file mode 100644 index 1256ff19..00000000 --- a/homedecor_i18n/init.lua +++ /dev/null @@ -1,7 +0,0 @@ - --- This file intentionally left blank. - -homedecor_i18n = { } - -local MP = minetest.get_modpath(minetest.get_current_modname()) -homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua") diff --git a/homedecor_kitchen/depends.txt b/homedecor_kitchen/depends.txt index b01982e0..d122ec02 100644 --- a/homedecor_kitchen/depends.txt +++ b/homedecor_kitchen/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials dye -homedecor_i18n moreblocks? building_blocks? technic? diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 38275a97..56cc9c75 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -1,6 +1,6 @@ -- This file supplies Kitchen stuff like refrigerators, sinks, etc. -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end @@ -138,8 +138,6 @@ homedecor.register("dishwasher_"..m, { }) end -local S = homedecor_i18n.gettext - local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" diff --git a/homedecor_laundry/depends.txt b/homedecor_laundry/depends.txt index 480f9332..4536f367 100644 --- a/homedecor_laundry/depends.txt +++ b/homedecor_laundry/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n bucket? diff --git a/homedecor_lighting/depends.txt b/homedecor_lighting/depends.txt index 4187addc..67304af7 100644 --- a/homedecor_lighting/depends.txt +++ b/homedecor_lighting/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n creative moreblocks? building_blocks? diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 2e508021..e5e0df71 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1,6 +1,6 @@ -- This file supplies glowlights -local S = homedecor_i18n.gettext +local S = homedecor.gettext local glowlight_nodebox = { half = homedecor.nodebox.slab_y(1/2), diff --git a/homedecor_misc/depends.txt b/homedecor_misc/depends.txt index 2d48d544..92ae6dc6 100644 --- a/homedecor_misc/depends.txt +++ b/homedecor_misc/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks? technic? bucket? diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index 548d728d..afeee27e 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -7,7 +7,7 @@ -- The code for ovens, nightstands, refrigerators are basically modified -- copies of the code for chests and furnaces. -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("ceiling_paint", { description = S("Textured Ceiling Paint"), @@ -470,7 +470,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do } if side ~= "horizontal" then - def.groups.not_in_creative_inventory = 1 + def.groups.not_in_creative_inventory = 1 end if name == "wood" then @@ -489,7 +489,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do homedecor.white_wood } def2.inventory_image = "homedecor_banister_wood_colored_inv.png" - def2.groups.not_in_creative_inventory = 1 + def2.groups.not_in_creative_inventory = 1 unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal") end @@ -630,7 +630,7 @@ homedecor.register("dartboard", { -- -- Mostly my own code; overall template borrowed from game default -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_craft( { output = "homedecor:flower_pot_terracotta", diff --git a/homedecor_office/depends.txt b/homedecor_office/depends.txt index 43559e02..f3234aeb 100644 --- a/homedecor_office/depends.txt +++ b/homedecor_office/depends.txt @@ -2,6 +2,5 @@ homedecor_common default basic_materials dye -homedecor_i18n moreblocks? building_blocks? diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index 7a7f4525..e6deb152 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("filing_cabinet", { description = S("Filing cabinet"), diff --git a/homedecor_pictures_and_paintings/depends.txt b/homedecor_pictures_and_paintings/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_pictures_and_paintings/depends.txt +++ b/homedecor_pictures_and_paintings/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_pictures_and_paintings/init.lua b/homedecor_pictures_and_paintings/init.lua index e0377a7f..66081074 100644 --- a/homedecor_pictures_and_paintings/init.lua +++ b/homedecor_pictures_and_paintings/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local pframe_cbox = { type = "fixed", diff --git a/homedecor_roofing/depends.txt b/homedecor_roofing/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_roofing/depends.txt +++ b/homedecor_roofing/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 4d24e0b7..31f2a1e2 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_tables/depends.txt b/homedecor_tables/depends.txt index be47402e..fb5d6010 100644 --- a/homedecor_tables/depends.txt +++ b/homedecor_tables/depends.txt @@ -1,4 +1,3 @@ homedecor_common default basic_materials -homedecor_i18n diff --git a/homedecor_tables/init.lua b/homedecor_tables/init.lua index 7fb5dee7..d32b51db 100644 --- a/homedecor_tables/init.lua +++ b/homedecor_tables/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- Various kinds of tables diff --git a/homedecor_trash_cans/depends.txt b/homedecor_trash_cans/depends.txt index 2d665e31..ac31e7dd 100644 --- a/homedecor_trash_cans/depends.txt +++ b/homedecor_trash_cans/depends.txt @@ -2,4 +2,3 @@ homedecor_common default basic_materials dye -homedecor_i18n diff --git a/homedecor_trash_cans/init.lua b/homedecor_trash_cans/init.lua index 0791a316..dbd4e111 100644 --- a/homedecor_trash_cans/init.lua +++ b/homedecor_trash_cans/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local tg_cbox = { type = "fixed", diff --git a/homedecor_windows_and_treatments/depends.txt b/homedecor_windows_and_treatments/depends.txt index ef56acdf..8c8316ab 100644 --- a/homedecor_windows_and_treatments/depends.txt +++ b/homedecor_windows_and_treatments/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks? diff --git a/homedecor_windows_and_treatments/init.lua b/homedecor_windows_and_treatments/init.lua index 7a58ab25..04bc3765 100644 --- a/homedecor_windows_and_treatments/init.lua +++ b/homedecor_windows_and_treatments/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("window_quartered", { description = S("Window (quartered)"), diff --git a/inbox/depends.txt b/inbox/depends.txt index ace758c7..e13666d7 100644 --- a/inbox/depends.txt +++ b/inbox/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common screwdriver? diff --git a/inbox/init.lua b/inbox/init.lua index 5ee77a8c..29c17455 100644 --- a/inbox/init.lua +++ b/inbox/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local inbox = {} local screwdriver = rawget(_G, "screwdriver") or {} diff --git a/itemframes/depends.txt b/itemframes/depends.txt index 29ebd95a..ae7019b6 100644 --- a/itemframes/depends.txt +++ b/itemframes/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common mesecons_mvps? diff --git a/itemframes/init.lua b/itemframes/init.lua index 21fac2f3..d424c383 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local tmp = {} screwdriver = screwdriver or {} @@ -299,4 +299,4 @@ minetest.register_craft({ if minetest.get_modpath("mesecons_mvps") then mesecon.register_mvps_stopper("itemframes:frame") mesecon.register_mvps_stopper("itemframes:pedestal") -end \ No newline at end of file +end diff --git a/lavalamp/depends.txt b/lavalamp/depends.txt index 99442029..bbc40a75 100644 --- a/lavalamp/depends.txt +++ b/lavalamp/depends.txt @@ -1,4 +1,4 @@ wool bucket -homedecor_i18n +homedecor_common unifieddyes diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 756bf1d3..fd1a8150 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext lavalamp = {} diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index fcb84e57..6950cad0 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local armchair_cbox = { type = "fixed", fixed = { diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index 827657ac..8b095cec 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable") minetest.register_alias("lrfurn:coffeetable_front", "air") diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt index 973de176..398a4107 100644 --- a/lrfurn/depends.txt +++ b/lrfurn/depends.txt @@ -1,4 +1,4 @@ default wool -homedecor_i18n +homedecor_common unifieddyes diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua index a318376f..470e907e 100644 --- a/lrfurn/endtable.lua +++ b/lrfurn/endtable.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node("lrfurn:endtable", { description = S("End Table"), diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 631e79a4..a23aff4f 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext lrfurn = {} screwdriver = screwdriver or {} diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index eeb3ca23..2df177c8 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local longsofa_cbox = { type = "wallmounted", diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index 6f89beaf..7d1cd53a 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local sofa_cbox = { type = "wallmounted", diff --git a/plasmascreen/depends.txt b/plasmascreen/depends.txt index 3ea0d975..5a0ba066 100644 --- a/plasmascreen/depends.txt +++ b/plasmascreen/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common homedecor_electronics diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua index 183d1f93..37ec395d 100644 --- a/plasmascreen/init.lua +++ b/plasmascreen/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext screwdriver = screwdriver or {} From 2ee1cd6887c70ef051e3a75df7677ab942c7dc0e Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 2 May 2019 18:36:36 -0400 Subject: [PATCH 38/40] Make sure all "lanterns" and "lamps" have "light" in their descriptions also (for easier searching in sfinv and unified inv) --- homedecor_lighting/init.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index e5e0df71..53cd52cc 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -126,7 +126,7 @@ minetest.register_node(":homedecor:glowlight_small_cube", { }) homedecor.register("plasma_lamp", { - description = S("Plasma Lamp"), + description = S("Plasma Lamp/Light"), drawtype = "mesh", mesh = "plasma_lamp.obj", tiles = { @@ -273,7 +273,7 @@ local ol_cbox = { } homedecor.register("oil_lamp", { - description = S("Oil lamp (hurricane)"), + description = S("Oil lamp/Light (hurricane)"), mesh = "homedecor_oil_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", @@ -293,7 +293,7 @@ homedecor.register("oil_lamp", { }) homedecor.register("oil_lamp_tabletop", { - description = S("Oil Lamp (tabletop)"), + description = S("Oil Lamp/Light (tabletop)"), mesh = "homedecor_oil_lamp_tabletop.obj", tiles = {"homedecor_oil_lamp_tabletop.png"}, inventory_image = "homedecor_oil_lamp_tabletop_inv.png", @@ -312,7 +312,7 @@ local gl_cbox = { minetest.register_alias("homedecor:wall_lantern", "homedecor:ground_lantern") homedecor.register("ground_lantern", { - description = S("Ground Lantern"), + description = S("Ground Lantern/Light"), mesh = "homedecor_ground_lantern.obj", tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" }, use_texture_alpha = true, @@ -330,7 +330,7 @@ local hl_cbox = { } homedecor.register("hanging_lantern", { - description = S("Hanging Lantern"), + description = S("Hanging Lantern/Light"), mesh = "homedecor_hanging_lantern.obj", tiles = { "homedecor_generic_metal_wrought_iron.png", "homedecor_light.png" }, use_texture_alpha = true, @@ -353,7 +353,7 @@ homedecor.register("ceiling_lantern", { tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" }, use_texture_alpha = true, inventory_image = "homedecor_ceiling_lantern_inv.png", - description = S("Ceiling Lantern"), + description = S("Ceiling Lantern/Light"), groups = {snappy=3}, light_source = 11, selection_box = cl_cbox, @@ -367,7 +367,7 @@ if minetest.get_modpath("darkage") then sm_light = default.LIGHT_MAX-5 else homedecor.register("lattice_lantern_large", { - description = S("Lattice lantern (large)"), + description = S("Lattice lantern/Light (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, groups = { snappy = 3 }, light_source = default.LIGHT_MAX, @@ -438,7 +438,7 @@ local function reg_lamp(suffix, nxt, light, brightness) local wool_brighten = (light or 0) * 15 homedecor.register("table_lamp_"..suffix, { - description = S("Table Lamp"), + description = S("Table Lamp/Light"), mesh = "homedecor_table_lamp.obj", tiles = { "wool_grey.png^[colorize:#ffffff:"..wool_brighten, @@ -471,7 +471,7 @@ local function reg_lamp(suffix, nxt, light, brightness) }) homedecor.register("standing_lamp_"..suffix, { - description = S("Standing Lamp"), + description = S("Standing Lamp/Light"), mesh = "homedecor_standing_lamp.obj", tiles = { "wool_grey.png^[colorize:#ffffff:"..wool_brighten, @@ -522,7 +522,7 @@ local dlamp_cbox = { } homedecor.register("desk_lamp", { - description = S("Desk Lamp"), + description = S("Desk Lamp/Light"), mesh = "homedecor_desk_lamp.obj", tiles = { "homedecor_generic_metal.png", @@ -547,7 +547,7 @@ homedecor.register("desk_lamp", { -- "kitchen"/"dining room" ceiling lamp homedecor.register("ceiling_lamp", { - description = S("Ceiling Lamp"), + description = S("Ceiling Lamp/Light"), mesh = "homedecor_ceiling_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", @@ -565,7 +565,7 @@ homedecor.register("ceiling_lamp", { }) homedecor.register("ceiling_lamp_off", { - description = S("Ceiling Lamp (off)"), + description = S("Ceiling Lamp/Light (off)"), mesh = "homedecor_ceiling_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", From 6e61cc4ad8f09afa4a5e71a5f887375aa33e4709 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 2 May 2019 18:40:25 -0400 Subject: [PATCH 39/40] move sounds to their correct folders --- .../sounds/homedecor_shower.ogg | Bin .../sounds/homedecor_toilet_flush.ogg | Bin .../sounds/homedecor_faucet.ogg | Bin .../sounds/homedecor_book_close.ogg | Bin .../sounds/homedecor_door_close.ogg | Bin .../sounds/homedecor_door_open.ogg | Bin .../sounds/homedecor_gate_open_close.ogg | Bin .../sounds/insert_coin.ogg | Bin .../sounds/toaster.ogg | Bin .../sounds/homedecor_trash_all.ogg | Bin 10 files changed, 0 insertions(+), 0 deletions(-) rename {homedecor_misc => homedecor_bathroom}/sounds/homedecor_shower.ogg (100%) rename {homedecor_misc => homedecor_bathroom}/sounds/homedecor_toilet_flush.ogg (100%) rename {homedecor_misc => homedecor_common}/sounds/homedecor_faucet.ogg (100%) rename {homedecor_misc => homedecor_doors_and_gates}/sounds/homedecor_book_close.ogg (100%) rename {homedecor_misc => homedecor_doors_and_gates}/sounds/homedecor_door_close.ogg (100%) rename {homedecor_misc => homedecor_doors_and_gates}/sounds/homedecor_door_open.ogg (100%) rename {homedecor_misc => homedecor_doors_and_gates}/sounds/homedecor_gate_open_close.ogg (100%) rename {homedecor_misc => homedecor_gastronomy}/sounds/insert_coin.ogg (100%) rename {homedecor_misc => homedecor_gastronomy}/sounds/toaster.ogg (100%) rename {homedecor_misc => homedecor_trash_cans}/sounds/homedecor_trash_all.ogg (100%) diff --git a/homedecor_misc/sounds/homedecor_shower.ogg b/homedecor_bathroom/sounds/homedecor_shower.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_shower.ogg rename to homedecor_bathroom/sounds/homedecor_shower.ogg diff --git a/homedecor_misc/sounds/homedecor_toilet_flush.ogg b/homedecor_bathroom/sounds/homedecor_toilet_flush.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_toilet_flush.ogg rename to homedecor_bathroom/sounds/homedecor_toilet_flush.ogg diff --git a/homedecor_misc/sounds/homedecor_faucet.ogg b/homedecor_common/sounds/homedecor_faucet.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_faucet.ogg rename to homedecor_common/sounds/homedecor_faucet.ogg diff --git a/homedecor_misc/sounds/homedecor_book_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_book_close.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_book_close.ogg rename to homedecor_doors_and_gates/sounds/homedecor_book_close.ogg diff --git a/homedecor_misc/sounds/homedecor_door_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_door_close.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_door_close.ogg rename to homedecor_doors_and_gates/sounds/homedecor_door_close.ogg diff --git a/homedecor_misc/sounds/homedecor_door_open.ogg b/homedecor_doors_and_gates/sounds/homedecor_door_open.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_door_open.ogg rename to homedecor_doors_and_gates/sounds/homedecor_door_open.ogg diff --git a/homedecor_misc/sounds/homedecor_gate_open_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_gate_open_close.ogg rename to homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg diff --git a/homedecor_misc/sounds/insert_coin.ogg b/homedecor_gastronomy/sounds/insert_coin.ogg similarity index 100% rename from homedecor_misc/sounds/insert_coin.ogg rename to homedecor_gastronomy/sounds/insert_coin.ogg diff --git a/homedecor_misc/sounds/toaster.ogg b/homedecor_gastronomy/sounds/toaster.ogg similarity index 100% rename from homedecor_misc/sounds/toaster.ogg rename to homedecor_gastronomy/sounds/toaster.ogg diff --git a/homedecor_misc/sounds/homedecor_trash_all.ogg b/homedecor_trash_cans/sounds/homedecor_trash_all.ogg similarity index 100% rename from homedecor_misc/sounds/homedecor_trash_all.ogg rename to homedecor_trash_cans/sounds/homedecor_trash_all.ogg From 854e96d4c02848b0208361312a5b45ec3a799538 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 3 May 2019 12:06:43 -0400 Subject: [PATCH 40/40] add "light" to lava lamp desc. --- lavalamp/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lavalamp/init.lua b/lavalamp/init.lua index fd1a8150..bf68aa93 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -4,7 +4,7 @@ local S = homedecor.gettext lavalamp = {} minetest.register_node("lavalamp:lavalamp", { - description = S("Lava Lamp"), + description = S("Lava Lamp/Light"), drawtype = "mesh", mesh = "lavalamp.obj", tiles = { @@ -46,7 +46,7 @@ minetest.register_node("lavalamp:lavalamp", { }) minetest.register_node("lavalamp:lavalamp_off", { - description = S("Lava Lamp (off)"), + description = S("Lava Lamp/Light (off)"), drawtype = "mesh", mesh = "lavalamp.obj", tiles = {