diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua index 8809fc68..0c7951d9 100644 --- a/homedecor_common/materials.lua +++ b/homedecor_common/materials.lua @@ -40,6 +40,7 @@ homedecor.materials = { slab_wood = "stairs:slab_wood", glass_block = "default_glass", glass_bottle = "vessels:glass_bottle", + coal_lump = "default:coal_lump", } if minetest.get_modpath("moreores") then @@ -109,6 +110,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then slab_wood = "fl_trees:apple_plank_slab", glass_block = "fl_glass:framed_glass", glass_bottle = "fl_bottles:bottle", + coal_lump = "fl_ores:coal_ore" } elseif minetest.get_modpath("hades_core") then homedecor.materials = { diff --git a/homedecor_plasmascreen/.luacheckrc b/homedecor_plasmascreen/.luacheckrc deleted file mode 100644 index f65fce03..00000000 --- a/homedecor_plasmascreen/.luacheckrc +++ /dev/null @@ -1,19 +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", - "screwdriver", "homedecor", -} - -globals = { -} - diff --git a/homedecor_plasmascreen/README.md b/homedecor_plasmascreen/README.md deleted file mode 100644 index 867c2621..00000000 --- a/homedecor_plasmascreen/README.md +++ /dev/null @@ -1,14 +0,0 @@ -PLASMASCREEN -============ - -Mod adding a plasma screen TV for Minetest. - -This mod adds a 2x3 plasma screen TV using a single large mesh node. - -Point at the bottom center position where you want the TV to go, when placing. - -Note: If you're at a really steep view angle when trying to place a screen, -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. - diff --git a/homedecor_plasmascreen/init.lua b/homedecor_plasmascreen/init.lua index a3df75b0..fa311957 100644 --- a/homedecor_plasmascreen/init.lua +++ b/homedecor_plasmascreen/init.lua @@ -24,6 +24,15 @@ homedecor.register("tv_stand", { } }, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2}, + crafts = { + { + recipe = { + {'', '', ''}, + {'', 'steel_ingot', ''}, + {'group:stick', 'coal_lump', 'group:stick'}, + } + } + } }) local fdir_to_left = { @@ -121,7 +130,20 @@ homedecor.register("tv", { end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) minetest.set_node(pos, {name = "homedecor:tv_off", param2 = node.param2}) - end + end, + crafts = { + { + recipe = { + {'glass_block', 'coal_lump', 'glass_block'}, + {'steel_ingot', 'copper_ingot', 'steel_ingot'}, + {'glass_block', 'glass_block', 'glass_block'}, + } + }, + { + type = "shapeless", + recipe = {'homedecor:television', 'homedecor:television'}, + } + } }) homedecor.register("tv_off", { @@ -150,33 +172,7 @@ homedecor.register("tv_off", { on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) minetest.set_node(pos, {name = "homedecor:tv", param2 = node.param2}) end, - drop = "homedecor:tv" -}) - --- crafting recipes - -minetest.register_craft({ - output = "homedecor:tv", - recipe = { - {'default:glass', 'default:coal_lump', 'default:glass'}, - {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, - {'default:glass', 'default:glass', 'default:glass'}, - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:tv", - recipe = {'homedecor:television', 'homedecor:television'}, -}) - -minetest.register_craft({ - output = "homedecor:tv_stand", - recipe = { - {'', '', ''}, - {'', 'default:steel_ingot', ''}, - {'group:stick', 'default:coal_lump', 'group:stick'}, - } + drop = "homedecor:tv", }) minetest.register_alias("plasmascreen:screen1", "air") diff --git a/homedecor_plasmascreen/mod.conf b/homedecor_plasmascreen/mod.conf index 4f5edfc2..1d840a25 100644 --- a/homedecor_plasmascreen/mod.conf +++ b/homedecor_plasmascreen/mod.conf @@ -1,3 +1,3 @@ name = homedecor_plasmascreen -depends = default, homedecor_common, homedecor_electronics +depends = homedecor_common optional_depends = screwdriver