diff --git a/mods/ITEMS/mcl_end/building.lua b/mods/ITEMS/mcl_end/building.lua index 22a2a11b1..454cfdaca 100644 --- a/mods/ITEMS/mcl_end/building.lua +++ b/mods/ITEMS/mcl_end/building.lua @@ -62,20 +62,3 @@ minetest.register_node("mcl_end:dragon_egg", { end end, }) - -minetest.register_craft({ - output = "mcl_end:purpur_block 4", - recipe = { - {"mcl_end:chorus_fruit_popped", "mcl_end:chorus_fruit_popped",}, - {"mcl_end:chorus_fruit_popped", "mcl_end:chorus_fruit_popped",}, - } -}) - -minetest.register_craft({ - output = "mcl_end:end_rod 4", - recipe = { - {"mcl_mobitems:blaze_rod"}, - {"mcl_end:chorus_fruit_popped"}, - }, -}) - diff --git a/mods/ITEMS/mcl_mud/init.lua b/mods/ITEMS/mcl_mud/init.lua index fc41270b8..577142a73 100644 --- a/mods/ITEMS/mcl_mud/init.lua +++ b/mods/ITEMS/mcl_mud/init.lua @@ -21,24 +21,3 @@ minetest.register_node("mcl_mud:mud", { }, }, }) - -minetest.register_node("mcl_mud:packed_mud", { - description = S("Packed Mud"), - _doc_items_longdesc = S("Packed mud is a decorative block used to craft mud bricks."), - _doc_items_hidden = false, - tiles = {"mcl_mud_packed_mud.png"}, - groups = {handy=1, pickaxey=1, building_block=1}, - sounds = mcl_sounds.node_sound_dirt_defaults(), - _mcl_blast_resistance = 3, - _mcl_hardness = 1, -}) - --- packed mud -minetest.register_craft({ - type = "shapeless", - output = "mcl_mud:packed_mud", - recipe = { - "mcl_mud:mud", - "mcl_farming:wheat_item", - } -}) diff --git a/mods/ITEMS/mcl_ocean/prismarine.lua b/mods/ITEMS/mcl_ocean/prismarine.lua index ce3bcb7d0..e69de29bb 100644 --- a/mods/ITEMS/mcl_ocean/prismarine.lua +++ b/mods/ITEMS/mcl_ocean/prismarine.lua @@ -1,113 +0,0 @@ --- Nodes - -local S = minetest.get_translator(minetest.get_current_modname()) - -minetest.register_node("mcl_ocean:sea_lantern", { - description = S("Sea Lantern"), - _doc_items_longdesc = S("Sea lanterns are decorative light sources which look great underwater but can be placed anywhere."), - paramtype2 = "facedir", - is_ground_content = false, - stack_max = 64, - light_source = minetest.LIGHT_MAX, - drop = { - max_items = 1, - items = { - { items = {"mcl_ocean:prismarine_crystals 3"}, rarity = 2 }, - { items = {"mcl_ocean:prismarine_crystals 2"}} - } - }, - tiles = {{name="mcl_ocean_sea_lantern.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.25}}}, - groups = {handy=1, building_block=1, material_glass=1}, - sounds = mcl_sounds.node_sound_glass_defaults(), - _mcl_blast_resistance = 0.3, - _mcl_hardness = 0.3, - _mcl_silk_touch_drop = true, - _mcl_fortune_drop = { - discrete_uniform_distribution = true, - items = {"mcl_ocean:prismarine_crystals"}, - min_count = 2, - max_count = 3, - cap = 5, - } -}) - -minetest.register_node("mcl_ocean:prismarine", { - description = S("Prismarine"), - _doc_items_longdesc = S("Prismarine is used as a building block. It slowly changes its color."), - stack_max = 64, - is_ground_content = false, - -- Texture should have 22 frames for smooth transitions. - tiles = {{name="mcl_ocean_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}}, - groups = {pickaxey=1, building_block=1, material_stone=1}, - sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 1.5, -}) - -minetest.register_node("mcl_ocean:prismarine_dark", { - description = S("Dark Prismarine"), - _doc_items_longdesc = doc.sub.items.temp.build, - stack_max = 64, - is_ground_content = false, - tiles = {"mcl_ocean_prismarine_dark.png"}, - groups = {pickaxey=1, building_block=1, material_stone=1}, - sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 1.5, -}) - --- Craftitems - -minetest.register_craftitem("mcl_ocean:prismarine_crystals", { - description = S("Prismarine Crystals"), - _doc_items_longdesc = doc.sub.items.temp.craftitem, - inventory_image = "mcl_ocean_prismarine_crystals.png", - stack_max = 64, - groups = { craftitem = 1 }, -}) - -minetest.register_craftitem("mcl_ocean:prismarine_shard", { - description = S("Prismarine Shard"), - _doc_items_longdesc = doc.sub.items.temp.craftitem, - inventory_image = "mcl_ocean_prismarine_shard.png", - stack_max = 64, - groups = { craftitem = 1 }, -}) - --- Crafting - -minetest.register_craft({ - output = "mcl_ocean:sea_lantern", - recipe = { - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_crystals", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_crystals", "mcl_ocean:prismarine_crystals", "mcl_ocean:prismarine_crystals"}, - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_crystals", "mcl_ocean:prismarine_shard"}, - } -}) - -minetest.register_craft({ - output = "mcl_ocean:prismarine", - recipe = { - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - } -}) - -minetest.register_craft({ - output = "mcl_ocean:prismarine_brick", - recipe = { - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - } -}) - -minetest.register_craft({ - output = "mcl_ocean:prismarine_dark", - recipe = { - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_shard", "mcl_dye:black", "mcl_ocean:prismarine_shard"}, - {"mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard"}, - } -}) - diff --git a/mods/ITEMS/mcl_walls/register.lua b/mods/ITEMS/mcl_walls/register.lua index 9e7a4b690..65c3e733a 100644 --- a/mods/ITEMS/mcl_walls/register.lua +++ b/mods/ITEMS/mcl_walls/register.lua @@ -7,4 +7,4 @@ mcl_walls.register_wall("mcl_walls:granite", S("Granite Wall"), "mcl_core:granit mcl_walls.register_wall("mcl_walls:diorite", S("Diorite Wall"), "mcl_core:diorite") mcl_walls.register_wall("mcl_walls:sandstone", S("Sandstone Wall"), "mcl_core:sandstone") mcl_walls.register_wall("mcl_walls:redsandstone", S("Red Sandstone Wall"), "mcl_core:redsandstone") -mcl_walls.register_wall("mcl_walls:prismarine", S("Prismarine Wall"), "mcl_ocean:prismarine") + \ No newline at end of file diff --git a/mods/blocks/building/lighting.lua b/mods/blocks/building/lighting.lua index b97c8cdaf..1177a13b2 100644 --- a/mods/blocks/building/lighting.lua +++ b/mods/blocks/building/lighting.lua @@ -55,6 +55,33 @@ local blocks = { "biota_pumpkin_side.png", "building_jack_o_lantern.png" } + }, + ["sea_lantern"] = { + _mcl_blast_resistance = 0.3, + _mcl_hardness = 0.3, + _mcl_silk_touch_drop = true, + drop = { + items = { + {items = {"items:prismarine_crystals 3"}, rarity = 2}, + {items = {"items:prismarine_crystals 2"}} + }, + max_items = 1 + }, + groups = {building_blocks = 1, handy = 1}, + light_source = 14, + paramtype = "light", + sounds = mcl_sounds.node_sound_glass_defaults(), + tiles = { + { + animation = { + aspect_h = 16, + aspect_w = 16, + length = 1.25, + type = "vertical_frames" + }, + name = "building_sea_lantern.png" + } + } } } diff --git a/textures/building/building_sea_lantern.png b/textures/building/building_sea_lantern.png new file mode 100644 index 000000000..5a588b223 Binary files /dev/null and b/textures/building/building_sea_lantern.png differ