diff --git a/README.md b/README.md index 07aaa73..2532d3d 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,16 @@ Media licensed under CC-BY-SA 4.0, see [this deed](https://creativecommons.org/l ## Credits **For assets:** + - [Coalquartz Tile texture](textures/mcl_decor_coalquartz_tile.png) uses [coal block](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_core/textures/default_coal_block.png) and [quartz block](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_nether/textures/mcl_nether_quartz_block_side.png) textures under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (combined) - [Dyed planks template texture](textures/mcl_decor_dyed_planks.png) uses [oak planks](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_core/textures/default_wood.png) texture under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (desaturated and lighted up a bit from original) -- [Table Lamp bottom texture](textures/mcl_decor_table_lamp_bottom.png) uses [grey wool](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_wool/textures/wool_grey.png) texture under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (resized and partly darkened up from original) -- [Table Lamp side texture](textures/mcl_decor_table_lamp_side.png) uses [grey wool](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_wool/textures/wool_grey.png) and [oak tree](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_core/textures/default_tree.png) textures under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (combined) +- [Table Lamp texture](textures/mcl_decor_table_lamp.png) uses [red wool](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_wool/textures/wool_red.png), [black wool](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_wool/textures/wool_black.png), [torch](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_torches/textures/default_torch_on_floor.png), [smooth stone](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_stairs/textures/mcl_stairs_stone_slab_top.png) and [oak tree](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_core/textures/default_tree.png) textures under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (combined and resized) - [Curtains overlay texture](textures/mcl_decor_curtain_overlay.png) uses [top iron pane](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/xpanes/textures/xpanes_top_iron.png) texture under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) by [XSSheep](https://github.com/XSSheep) (resized) **For code:** + - Sitting function (in api.lua) uses code from [ts_furniture mod](https://content.minetest.net/packages/Thomas-S/ts_furniture/) under [MIT](https://spdx.org/licenses/MIT.html) by [Thomas-S](https://content.minetest.net/users/Thomas-S/) **Misc:** + - [Homedecor modpack](https://content.minetest.net/packages/VanessaE/homedecor_modpack/) and [xdecor](https://content.minetest.net/packages/jp/xdecor) mods were inspiration for me partly. Thanks to [VanessaE](https://content.minetest.net/users/VanessaE/) and [jp](https://content.minetest.net/users/jp/) for them! diff --git a/hedges.lua b/hedges.lua index cb87b4f..0f2d630 100644 --- a/hedges.lua +++ b/hedges.lua @@ -4,7 +4,17 @@ local S = minetest.get_translator(minetest.get_current_modname()) -- API function mcl_decor.register_hedge(name, desc, material, tiles) - mcl_fences.register_fence(name .. "_hedge", desc, tiles, {handy = 1, axey = 1, hedge = 1, deco_block = 1, flammable = 2, fire_encouragement = 10, fire_flammability = 10}, 1, 1, {"group:hedge"}, mcl_sounds.node_sound_wood_defaults()) + -- use mcl_fences api to register hedge + mcl_fences.register_fence( + name .. "_hedge", + desc, + tiles, + {handy = 1, axey = 1, hedge = 1, deco_block = 1, flammable = 2, fire_encouragement = 10, fire_flammability = 10}, + 1, 1, + {"group:hedge"}, + mcl_sounds.node_sound_leaves_defaults() + ) + -- crafting recipe minetest.register_craft({ output = "mcl_decor:" .. name .. "_hedge" .. " 6", recipe = { diff --git a/misc.lua b/misc.lua index 174ffa3..4f580cd 100644 --- a/misc.lua +++ b/misc.lua @@ -33,26 +33,22 @@ mcl_stairs.register_stair_and_slab_simple("coalquartz_tile", "mcl_decor:coalquar --- Table Lamp --- minetest.register_node("mcl_decor:table_lamp", { description = S("Table Lamp"), - tiles = {"wool_grey.png", "mcl_decor_table_lamp_bottom.png", "mcl_decor_table_lamp_side.png", - "mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png"}, - drawtype = "nodebox", + tiles = {"mcl_decor_table_lamp.png"}, + drawtype = "mesh", + mesh = "mcl_decor_table_lamp.obj", paramtype = "light", stack_max = 64, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.25, 0.25, -0.375, 0.25}, - {-0.0625, -0.375, -0.0625, 0.0625, 0, 0.0625}, - {-0.3125, 0, -0.3125, 0.3125, 0.5, 0.3125}, - } - }, selection_box = { type = "fixed", fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125}, }, + collision_box = { + type = "fixed", + fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125}, + }, is_ground_content = false, light_source = minetest.LIGHT_MAX, - groups = {handy=1, axey=1, attached_node=1, material_wood=1, deco_block=1, flammable=-1}, + groups = {handy=1, axey=1, attached_node=1, deco_block=1, flammable=-1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 0.9, _mcl_hardness = 0.9, diff --git a/models/mcl_decor_table_lamp.mtl b/models/mcl_decor_table_lamp.mtl new file mode 100644 index 0000000..78a8d5e --- /dev/null +++ b/models/mcl_decor_table_lamp.mtl @@ -0,0 +1,2 @@ +# Made in Blockbench 4.4.1 +newmtl none \ No newline at end of file diff --git a/models/mcl_decor_table_lamp.obj b/models/mcl_decor_table_lamp.obj new file mode 100644 index 0000000..159a40b --- /dev/null +++ b/models/mcl_decor_table_lamp.obj @@ -0,0 +1,141 @@ +# Made in Blockbench 4.4.1 +mtllib mcl_decor_table_lamp.mtl + +o cube +v 0.3125 0.5 0.3125 +v 0.3125 0.5 -0.3125 +v 0.3125 0 0.3125 +v 0.3125 0 -0.3125 +v -0.3125 0.5 -0.3125 +v -0.3125 0.5 0.3125 +v -0.3125 0 -0.3125 +v -0.3125 0 0.3125 +vt 0.15625 0.6153846153846154 +vt 0.3125 0.6153846153846154 +vt 0.3125 0.3076923076923077 +vt 0.15625 0.3076923076923077 +vt 0 0.6153846153846154 +vt 0.15625 0.6153846153846154 +vt 0.15625 0.3076923076923077 +vt 0 0.3076923076923077 +vt 0.46875 0.6153846153846154 +vt 0.625 0.6153846153846154 +vt 0.625 0.3076923076923077 +vt 0.46875 0.3076923076923077 +vt 0.3125 0.6153846153846154 +vt 0.46875 0.6153846153846154 +vt 0.46875 0.3076923076923077 +vt 0.3125 0.3076923076923077 +vt 0.3125 0.6153846153846154 +vt 0.15625 0.6153846153846154 +vt 0.15625 1 +vt 0.3125 1 +vt 0.46875 1 +vt 0.3125 1 +vt 0.3125 0.6153846153846154 +vt 0.46875 0.6153846153846154 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 4/4/1 7/3/1 5/2/1 2/1/1 +f 3/8/2 4/7/2 2/6/2 1/5/2 +f 8/12/3 3/11/3 1/10/3 6/9/3 +f 7/16/4 8/15/4 6/14/4 5/13/4 +f 6/20/5 1/19/5 2/18/5 5/17/5 +f 7/24/6 4/23/6 3/22/6 8/21/6 +o cube +v 0.25 -0.375 0.25 +v 0.25 -0.375 -0.25 +v 0.25 -0.5 0.25 +v 0.25 -0.5 -0.25 +v -0.25 -0.375 -0.25 +v -0.25 -0.375 0.25 +v -0.25 -0.5 -0.25 +v -0.25 -0.5 0.25 +vt 0.625 0.6923076923076923 +vt 0.75 0.6923076923076923 +vt 0.75 0.6153846153846154 +vt 0.625 0.6153846153846154 +vt 0.5 0.6923076923076923 +vt 0.625 0.6923076923076923 +vt 0.625 0.6153846153846154 +vt 0.5 0.6153846153846154 +vt 0.875 0.6923076923076923 +vt 1 0.6923076923076923 +vt 1 0.6153846153846154 +vt 0.875 0.6153846153846154 +vt 0.75 0.6923076923076923 +vt 0.875 0.6923076923076923 +vt 0.875 0.6153846153846154 +vt 0.75 0.6153846153846154 +vt 0.75 0.6923076923076923 +vt 0.625 0.6923076923076923 +vt 0.625 1 +vt 0.75 1 +vt 0.875 1 +vt 0.75 1 +vt 0.75 0.6923076923076923 +vt 0.875 0.6923076923076923 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 12/28/7 15/27/7 13/26/7 10/25/7 +f 11/32/8 12/31/8 10/30/8 9/29/8 +f 16/36/9 11/35/9 9/34/9 14/33/9 +f 15/40/10 16/39/10 14/38/10 13/37/10 +f 14/44/11 9/43/11 10/42/11 13/41/11 +f 15/48/12 12/47/12 11/46/12 16/45/12 +o cube +v 0.0625 0 0.0625 +v 0.0625 0 -0.0625 +v 0.0625 -0.375 0.0625 +v 0.0625 -0.375 -0.0625 +v -0.0625 0 -0.0625 +v -0.0625 0 0.0625 +v -0.0625 -0.375 -0.0625 +v -0.0625 -0.375 0.0625 +vt 0.03125 0.23076923076923073 +vt 0.0625 0.23076923076923073 +vt 0.0625 0 +vt 0.03125 0 +vt 0 0.23076923076923073 +vt 0.03125 0.23076923076923073 +vt 0.03125 0 +vt 0 0 +vt 0.09375 0.23076923076923073 +vt 0.125 0.23076923076923073 +vt 0.125 0 +vt 0.09375 0 +vt 0.0625 0.23076923076923073 +vt 0.09375 0.23076923076923073 +vt 0.09375 0 +vt 0.0625 0 +vt 0.0625 0.23076923076923073 +vt 0.03125 0.23076923076923073 +vt 0.03125 0.3076923076923077 +vt 0.0625 0.3076923076923077 +vt 0.09375 0.3076923076923077 +vt 0.0625 0.3076923076923077 +vt 0.0625 0.23076923076923073 +vt 0.09375 0.23076923076923073 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 20/52/13 23/51/13 21/50/13 18/49/13 +f 19/56/14 20/55/14 18/54/14 17/53/14 +f 24/60/15 19/59/15 17/58/15 22/57/15 +f 23/64/16 24/63/16 22/62/16 21/61/16 +f 22/68/17 17/67/17 18/66/17 21/65/17 +f 23/72/18 20/71/18 19/70/18 24/69/18 \ No newline at end of file diff --git a/textures/mcl_decor_table_lamp.png b/textures/mcl_decor_table_lamp.png new file mode 100644 index 0000000..963dac4 Binary files /dev/null and b/textures/mcl_decor_table_lamp.png differ diff --git a/textures/mcl_decor_table_lamp_bottom.png b/textures/mcl_decor_table_lamp_bottom.png deleted file mode 100644 index d884696..0000000 Binary files a/textures/mcl_decor_table_lamp_bottom.png and /dev/null differ diff --git a/textures/mcl_decor_table_lamp_side.png b/textures/mcl_decor_table_lamp_side.png deleted file mode 100644 index 0862929..0000000 Binary files a/textures/mcl_decor_table_lamp_side.png and /dev/null differ