diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua index 682e7a73..6a2d5e14 100644 --- a/homedecor_common/materials.lua +++ b/homedecor_common/materials.lua @@ -15,6 +15,7 @@ homedecor.materials = { dye_dark_grey = "dye:dark_grey", dye_black = "dye:black", dye_white = "dye:white", + dye_green = "dye:green", silicon = "mesecons_materials:silicon", string = "farming:string", paper = "default:paper", @@ -65,7 +66,8 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then empty_bucket = "fl_bucket:bucket", dye_dark_grey = "fl_dyes:dark_grey_dye", dye_black = "fl_dyes:black_dye", - dye_white = "fl_dye:white_dye", + dye_white = "fl_dyes:white_dye", + dye_green = "fl_dyes:green_dye", copper_ingot = "fl_ores:copper_ingot", tin_ingot = "fl_ores:tin_ingot", silver_ingot = "fl_ores:iron_ingot", diff --git a/homedecor_trash_cans/.luacheckrc b/homedecor_trash_cans/.luacheckrc deleted file mode 100644 index 4f0848c8..00000000 --- a/homedecor_trash_cans/.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_trash_cans/init.lua b/homedecor_trash_cans/init.lua index 63e70ee7..cd03dda1 100644 --- a/homedecor_trash_cans/init.lua +++ b/homedecor_trash_cans/init.lua @@ -13,19 +13,28 @@ homedecor.register("trash_can_green", { 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}, + groups = {snappy=3, dig_stone=3}, selection_box = tg_cbox, collision_box = tg_cbox, on_punch = function(pos, node, puncher, pointed_thing) minetest.set_node(pos, {name = "homedecor:trash_can_green_open", param2 = node.param2}) - end + end, + crafts = { + { + 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" } + }, + } + } }) homedecor.register("trash_can_green_open", { drawtype = "mesh", mesh = "homedecor_trash_can_green_open.obj", tiles = { { name = "homedecor_generic_plastic.png", color = trashcan_green } }, - groups = {snappy=3, not_in_creative_inventory=1}, + groups = {snappy=3, not_in_creative_inventory=1, dig_stone=3}, selection_box = tg_cbox, collision_box = tg_cbox, drop = "homedecor:trash_can_green", @@ -35,7 +44,7 @@ homedecor.register("trash_can_green_open", { infotext=S("Trash Can"), inventory= { size = 9, - formspec = "size[8,9]" .. default.gui_bg .. default.gui_bg_img .. default.gui_slots .. + formspec = "size[8,9]".. "button[2.5,3.8;3,1;empty;Empty Trash]".. "list[context;main;2.5,0.5;3,3;]".. "list[current_player;main;0,5;8,4;]" .. @@ -62,27 +71,16 @@ homedecor.register("trash_can", { inventory_image = "homedecor_trash_can_inv.png", description = S("Small Trash Can"), use_texture_alpha = "clip", - groups = {snappy=3}, + groups = {snappy=3, dig_stone=3}, 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" } - }, + crafts = { + { + output = "homedecor:trash_can 3", + recipe = { + { "basic_materials:steel_wire", "", "basic_materials:steel_wire" }, + { "steel_ingot", "steel_ingot", "steel_ingot" } + }, + }, + } }) diff --git a/homedecor_trash_cans/mod.conf b/homedecor_trash_cans/mod.conf index b2947cc4..71062005 100644 --- a/homedecor_trash_cans/mod.conf +++ b/homedecor_trash_cans/mod.conf @@ -1,3 +1,4 @@ name = homedecor_trash_cans description = Homedecor mod: trash cans -depends = homedecor_common, default, basic_materials, dye +depends = homedecor_common +optional_depends = default, basic_materials, dye