From a2b5717c07deb31d082769bc4b1ad0ed70d23b69 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Mon, 11 Apr 2022 00:21:40 -0400 Subject: [PATCH] add hd office --- homedecor_common/materials.lua | 2 + homedecor_office/.luacheckrc | 20 ----- homedecor_office/init.lua | 134 ++++++++++++++++----------------- homedecor_office/mod.conf | 2 +- 4 files changed, 70 insertions(+), 88 deletions(-) delete mode 100644 homedecor_office/.luacheckrc diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua index 771381f8..60a728d0 100644 --- a/homedecor_common/materials.lua +++ b/homedecor_common/materials.lua @@ -19,6 +19,7 @@ homedecor.materials = { dye_red = "dye:red", dye_yellow = "dye:yellow", dye_brown = "dye:brown", + dye_blue = "dye:blue", silicon = "mesecons_materials:silicon", string = "farming:string", paper = "default:paper", @@ -79,6 +80,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then dye_red = "fl_dyes:red_dye", dye_yellow = "fl_dyes:yellow_dye", dye_brown = "fl_dyes:brown_dye", + dye_blue = "fl_dyes:blue_dye", copper_ingot = "fl_ores:copper_ingot", tin_ingot = "fl_ores:tin_ingot", silver_ingot = "fl_ores:iron_ingot", diff --git a/homedecor_office/.luacheckrc b/homedecor_office/.luacheckrc deleted file mode 100644 index 4f0848c8..00000000 --- a/homedecor_office/.luacheckrc +++ /dev/null @@ -1,20 +0,0 @@ -unused_args = false -allow_defined_top = true -max_comment_line_length = 999 - -read_globals = { - "DIR_DELIM", - "minetest", "core", - "unpack", - "dump", - table = { fields = { "copy", "getn" } }, - "vector", "nodeupdate", - "VoxelManip", "VoxelArea", - "PseudoRandom", "ItemStack", - "default", - "homedecor", -} - -globals = { -} - diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index c0fa573a..41697f1b 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -8,13 +8,24 @@ homedecor.register("filing_cabinet", { "homedecor_filing_cabinet_front.png", "homedecor_filing_cabinet_bottom.png" }, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, dig_tree=2 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Filing cabinet"), inventory = { size=16, lockable=true, }, + crafts = { + { + recipe = { + { "", "group:wood", "" }, + { "group:wood", "homedecor:drawer_small", "group:wood" }, + { "", "group:wood", "" }, + }, + } + } }) local desk_cbox = { @@ -32,13 +43,31 @@ homedecor.register("desk", { inventory_image = "homedecor_desk_inv.png", selection_box = desk_cbox, collision_box = desk_cbox, - sounds = default.node_sound_wood_defaults(), - groups = { snappy = 3 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, + groups = { snappy = 3, dig_tree=2 }, expand = { right="placeholder" }, inventory = { size=24, lockable=true, }, + crafts = { + { + recipe = { + { "slab_wood", "slab_wood", "slab_wood" }, + { "homedecor:drawer_small", "group:wood", "group:wood" }, + { "homedecor:drawer_small", "", "group:wood" }, + }, + }, + { + recipe = { + { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, + { "homedecor:drawer_small", "group:wood", "group:wood" }, + { "homedecor:drawer_small", "", "group:wood" }, + }, + } + } }) minetest.register_alias("homedecor:desk_r", "air") @@ -60,7 +89,25 @@ homedecor.register("desk_globe", { collision_box = globe_cbox, groups = {choppy=2, oddly_breakable_by_hand=2}, walkable = false, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, + crafts = { + { + recipe = { + { "group:stick", "basic_materials:plastic_sheet", "dye_green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "group:stick", "slab_wood", "dye_blue" } + }, + }, + { + 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" } + }, + } + } }) homedecor.register("calendar", { @@ -78,72 +125,25 @@ homedecor.register("calendar", { wall_top = { -4/16, 5/16, -8/16, 4/16, 8/16, 5/16 } }, use_texture_alpha = "clip", - groups = {choppy=2,attached_node=1}, + groups = {choppy=2,attached_node=1, dig_tree=2}, legacy_wallmounted = true, - sounds = default.node_sound_defaults(), + _sound_def = { + key = "node_sound_defaults", + }, infotext = S("Date (right-click to update):\n@1", os.date("%Y-%m-%d")), -- ISO 8601 format on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local meta = minetest.get_meta(pos) local date = os.date("%Y-%m-%d") meta:set_string("infotext", S("Date (right-click to update):\n@1", date)) return itemstack - end -}) - --- crafting - - -minetest.register_craft({ - output = "homedecor:desk", - recipe = { - { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, - { "homedecor:drawer_small", "group:wood", "group:wood" }, - { "homedecor:drawer_small", "", "group:wood" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:desk", - recipe = { - { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, - { "homedecor:drawer_small", "group:wood", "group:wood" }, - { "homedecor:drawer_small", "", "group:wood" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:filing_cabinet", - recipe = { - { "", "group:wood", "" }, - { "group:wood", "homedecor:drawer_small", "group:wood" }, - { "", "group:wood", "" }, - }, -}) - -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" } - }, -}) - + end, + crafts = { + { + recipe = { + { "","dye_red","" }, + { "","dye_black","" }, + { "","paper","" } + }, + } + } +}) \ No newline at end of file diff --git a/homedecor_office/mod.conf b/homedecor_office/mod.conf index d6c7eb4c..59b52162 100644 --- a/homedecor_office/mod.conf +++ b/homedecor_office/mod.conf @@ -1,4 +1,4 @@ name = homedecor_office description = Homedecor mod: office -depends = homedecor_common, default, basic_materials, dye +depends = homedecor_common optional_depends = moreblocks, building_blocks