From c1971b662a0a8d57d22014759915684a26a64cc1 Mon Sep 17 00:00:00 2001 From: Doods Date: Sat, 13 Apr 2024 23:52:46 +0000 Subject: [PATCH] Fireproof certain wood nodes & add planks crafting recipes (#4166) * Make Crimson and Warped Planks, Double Slab Planks, Fences, Fence Gates, Doors, Trapdoors, Pressure Plates, Wood, Bark, Stripped Wood, Stripped Bark, and Stairs Immune to fire by removing them from the 'flammable', 'fire_encouragement', and 'fire_flammability' groups. * Add crafting recipes which allow Cherry, Mangrove, Crimson, and Warped planks to be crafted from Wood, Bark, Stripped Wood, and Stripped Bark variants, to make them consistent with with all other planks. Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4166 Reviewed-by: the-real-herowl Co-authored-by: Doods Co-committed-by: Doods --- mods/ITEMS/mcl_cherry_blossom/crafting.lua | 23 +++++++++ mods/ITEMS/mcl_crimson/init.lua | 60 ++++++++++++++++++---- mods/ITEMS/mcl_mangrove/init.lua | 21 ++++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/mods/ITEMS/mcl_cherry_blossom/crafting.lua b/mods/ITEMS/mcl_cherry_blossom/crafting.lua index f26b2af96..5f41ccd13 100644 --- a/mods/ITEMS/mcl_cherry_blossom/crafting.lua +++ b/mods/ITEMS/mcl_cherry_blossom/crafting.lua @@ -2,6 +2,8 @@ local planks = "mcl_cherry_blossom:cherrywood" local logs = "mcl_cherry_blossom:cherrytree" local stripped_logs = "mcl_cherry_blossom:stripped_cherrytree" +local wood = "mcl_cherry_blossom:cherrytree_bark" +local stripped_wood = "mcl_cherry_blossom:stripped_cherrytree_bark" minetest.register_craft({ output = "mcl_cherry_blossom:cherrytree_bark 3", @@ -26,6 +28,27 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_cherry_blossom:cherrywood 4", + recipe = { + { wood }, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherrywood 4", + recipe = { + { stripped_logs }, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherrywood 4", + recipe = { + { stripped_wood }, + } +}) + minetest.register_craft({ output = "mcl_cherry_blossom:cherry_door 3", recipe = { diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index b6e6b44e8..3a7862019 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -5,8 +5,8 @@ local modpath = minetest.get_modpath(modname) -- by debiankaios -- adapted for mcl2 by cora -local wood_slab_groups = {handy = 1, axey = 1, flammable = 3, material_wood = 1, fire_encouragement = 5, fire_flammability = 20, wood_slab = 1} -local wood_stair_groups = {handy = 1, axey = 1, flammable = 3, material_wood = 1, fire_encouragement = 5, fire_flammability = 20, wood_stairs = 1} +local wood_slab_groups = {handy = 1, axey = 1, material_wood = 1, wood_slab = 1} +local wood_stair_groups = {handy = 1, axey = 1, material_wood = 1, wood_stairs = 1} local function generate_warped_tree(pos) minetest.place_schematic(pos,modpath.."/schematics/warped_fungus_1.mts","random",nil,false,"place_center_x,place_center_z") @@ -463,7 +463,7 @@ minetest.register_craft({ minetest.register_node("mcl_crimson:warped_hyphae_wood", { description = S("Warped Hyphae Wood"), tiles = {"mcl_crimson_warped_hyphae_wood.png"}, - groups = {handy = 5,axey = 1, flammable = 3, wood=1,building_block = 1, material_wood = 1, fire_encouragement = 5, fire_flammability = 20}, + groups = {handy = 5,axey = 1, wood=1,building_block = 1, material_wood = 1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_hardness = 2, }) @@ -478,6 +478,27 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "mcl_crimson:warped_hyphae_wood 4", + recipe = { + {"mcl_crimson:warped_hyphae_bark"}, + }, +}) + +minetest.register_craft({ + output = "mcl_crimson:warped_hyphae_wood 4", + recipe = { + {"mcl_crimson:stripped_warped_hyphae"}, + }, +}) + +minetest.register_craft({ + output = "mcl_crimson:warped_hyphae_wood 4", + recipe = { + {"mcl_crimson:stripped_warped_hyphae_bark"}, + }, +}) + minetest.register_craft({ output = "mcl_crimson:warped_nylium 2", recipe = { @@ -670,6 +691,27 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "mcl_crimson:crimson_hyphae_wood 4", + recipe = { + {"mcl_crimson:crimson_hyphae_bark"}, + }, +}) + +minetest.register_craft({ + output = "mcl_crimson:crimson_hyphae_wood 4", + recipe = { + {"mcl_crimson:stripped_crimson_hyphae"}, + }, +}) + +minetest.register_craft({ + output = "mcl_crimson:crimson_hyphae_wood 4", + recipe = { + {"mcl_crimson:stripped_crimson_hyphae_bark"}, + }, +}) + minetest.register_craft({ output = "mcl_crimson:crimson_nylium 2", recipe = { @@ -715,7 +757,7 @@ mcl_doors:register_door("mcl_crimson:crimson_door", { _doc_items_longdesc = S("Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal."), _doc_items_usagehelp = S("To open or close a wooden door, rightclick it or supply its lower half with a redstone signal."), inventory_image = "mcl_crimson_crimson_door.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, + groups = {handy=1,axey=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, tiles_bottom = "mcl_crimson_crimson_door_bottom.png", @@ -730,7 +772,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", { tile_front = "mcl_crimson_crimson_trapdoor.png", tile_side = "mcl_crimson_crimson_trapdoor_side.png", wield_image = "mcl_crimson_crimson_trapdoor.png", - groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, + groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -741,7 +783,7 @@ mcl_fences.register_fence_and_fence_gate( S("Crimson Fence"), S("Crimson Fence Gate"), "mcl_crimson_crimson_fence.png", - {handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20}, + {handy=1,axey=1,fence_wood=1}, minetest.registered_nodes["mcl_crimson:crimson_hyphae"]._mcl_hardness, minetest.registered_nodes["mcl_crimson:crimson_hyphae"]._mcl_blast_resistance, {"group:fence_wood"}, @@ -753,7 +795,7 @@ mcl_doors:register_door("mcl_crimson:warped_door", { _doc_items_longdesc = S("Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal."), _doc_items_usagehelp = S("To open or close a wooden door, rightclick it or supply its lower half with a redstone signal."), inventory_image = "mcl_crimson_warped_door.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, + groups = {handy=1,axey=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, tiles_bottom = "mcl_crimson_warped_door_bottom.png", @@ -768,7 +810,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", { tile_front = "mcl_crimson_warped_trapdoor.png", tile_side = "mcl_crimson_warped_trapdoor_side.png", wield_image = "mcl_crimson_warped_trapdoor.png", - groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, + groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -779,7 +821,7 @@ mcl_fences.register_fence_and_fence_gate( S("Warped Fence"), S("Warped Fence Gate"), "mcl_crimson_warped_fence.png", - {handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20}, + {handy=1,axey=1,fence_wood=1}, minetest.registered_nodes["mcl_crimson:warped_hyphae"]._mcl_hardness, minetest.registered_nodes["mcl_crimson:warped_hyphae"]._mcl_blast_resistance, {"group:fence_wood"}, diff --git a/mods/ITEMS/mcl_mangrove/init.lua b/mods/ITEMS/mcl_mangrove/init.lua index 932e7851d..24612cdd7 100644 --- a/mods/ITEMS/mcl_mangrove/init.lua +++ b/mods/ITEMS/mcl_mangrove/init.lua @@ -399,6 +399,27 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_mangrove:mangrove_wood 4", + recipe = { + {"mcl_mangrove:mangrove_tree_bark"}, + } + }) + +minetest.register_craft({ + output = "mcl_mangrove:mangrove_wood 4", + recipe = { + {"mcl_mangrove:mangrove_stripped"}, + } + }) + +minetest.register_craft({ + output = "mcl_mangrove:mangrove_wood 4", + recipe = { + {"mcl_mangrove:mangrove_stripped_bark"}, + } + }) + minetest.register_craft({ type = "fuel", recipe = "group:fence_wood",