From 712ca909cad4c6117e1125f6e03ea9d039c1366d Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 24 May 2019 19:08:13 -0400 Subject: [PATCH] Multiple related changes: remove duplicate dishwasher recipe more kitchen depends fixes fix wrong brass taps recipe (ref technic brass, need basic_materials brass) re-add missing bathroom items recipes re-add missing stading- and table-lamp recipes add alternate dishwasher recipe add recipes for "half-doors" change light bath tiles recipe (don't need white dye for base node, now) move japanese wall parts to homedecor_misc, make _doors opt depend on that --- homedecor_bathroom/depends.txt | 2 + homedecor_bathroom/init.lua | 68 ++++++++++++++++++- homedecor_doors_and_gates/depends.txt | 1 + homedecor_doors_and_gates/init.lua | 94 +++++++++++---------------- homedecor_kitchen/init.lua | 16 +++-- homedecor_lighting/init.lua | 73 +++++++++++++++++++++ homedecor_misc/init.lua | 55 ++++++++++++++++ 7 files changed, 248 insertions(+), 61 deletions(-) diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt index 8cb6cfda..e778f7de 100644 --- a/homedecor_bathroom/depends.txt +++ b/homedecor_bathroom/depends.txt @@ -3,3 +3,5 @@ default basic_materials unifieddyes building_blocks +bucket? +homedecor_fences? diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 0811b700..7fef32a6 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -531,8 +531,8 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:bathroom_tiles_light 4", recipe = { - { "group:marble", "group:marble", "" }, - { "group:marble", "group:marble", "dye:white" } + { "group:marble", "group:marble" }, + { "group:marble", "group:marble" } }, }) @@ -593,3 +593,67 @@ minetest.register_craft({ { "group:stick", "basic_materials:plastic_sheet", "group:stick" } }, }) + +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 = { + { "basic_materials:brass_ingot","bucket:bucket_water", "basic_materials: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"}, + }, +}) + diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt index b93a08fe..c897dba1 100644 --- a/homedecor_doors_and_gates/depends.txt +++ b/homedecor_doors_and_gates/depends.txt @@ -1,4 +1,5 @@ homedecor_common +homedecor_misc? default basic_materials dye diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 1435cbe3..3d2d133d 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -529,61 +529,7 @@ function homedecor.flip_gate(pos, node, player, gate, oc) end end --- Japanese-style wood/paper wall pieces and door - -local jp_cbox = { - type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, -} - -minetest.register_node(":homedecor:japanese_wall_top", { - description = S("Japanese wall (top)"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_top.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node(":homedecor:japanese_wall_middle", { - description = S("Japanese wall"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_middle.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node(":homedecor:japanese_wall_bottom", { - description = S("Japanese wall (bottom)"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_bottom.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - +-- Japanese-style wood/paper door homedecor.register("door_japanese_closed", { description = S("Japanese-style door"), inventory_image = "homedecor_door_japanese_inv.png", @@ -636,6 +582,44 @@ homedecor.register("door_japanese_open", { -- crafting +-- half-doors + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_closed 4", + recipe = { + "homedecor:door_wood_plain_left", + "homedecor:door_wood_plain_left" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_closed 4", + recipe = { + "homedecor:door_wood_plain_right", + "homedecor:door_wood_plain_right" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_white_closed 4", + recipe = { + "homedecor:door_bedroom_left", + "homedecor:door_bedroom_left" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_white_closed 4", + recipe = { + "homedecor:door_bedroom_right", + "homedecor:door_bedroom_right" + }, +}) + -- Gates minetest.register_craft( { diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 56cc9c75..905fecc8 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -425,13 +425,12 @@ minetest.register_craft({ } }) - 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" } + { "basic_materials:ic", "building_blocks:slab_grate_1", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) @@ -517,6 +516,15 @@ minetest.register_craft( { }, }) +minetest.register_craft( { + output = "homedecor:kitchen_faucet", + recipe = { + { "default:steel_ingot","" }, + { "", "default:steel_ingot" }, + { "", "homedecor:taps" } + }, +}) + minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 53cd52cc..a1a51055 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1188,6 +1188,79 @@ minetest.register_craft({ }, }) +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" + } +}) + -- aliases minetest.register_alias("chains:chain_top", "homedecor:chain_steel_top") diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index afeee27e..95135aef 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -999,3 +999,58 @@ unifieddyes.register_color_craft({ "MAIN_DYE", } }) + +-- Japanese-style wood/paper wall pieces and door + +local jp_cbox = { + type = "fixed", + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, +} + +minetest.register_node(":homedecor:japanese_wall_top", { + description = S("Japanese wall (top)"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_top.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node(":homedecor:japanese_wall_middle", { + description = S("Japanese wall"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_middle.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node(":homedecor:japanese_wall_bottom", { + description = S("Japanese wall (bottom)"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_bottom.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +})