From 81534872905cea04089d7f22e9196a15401795c7 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 19 Apr 2022 21:11:01 +0000 Subject: [PATCH 01/21] Add texture files for stripped stem Add texture files for stripped stem --- .../textures/stripped_crimson_stem_side.png | Bin 0 -> 193 bytes .../textures/stripped_crimson_stem_top.png | Bin 0 -> 231 bytes .../textures/stripped_warped_stem_side.png | Bin 0 -> 200 bytes .../textures/stripped_warped_stem_top.png | Bin 0 -> 239 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_side.png create mode 100644 mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_top.png create mode 100644 mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_side.png create mode 100644 mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_top.png diff --git a/mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_side.png b/mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ad6a41a2ed679bb4aeba43bb934944d4abb9606c GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bjnyzp(=aO1G^$e9Z_zZE z*!$=*P%78c#W95AI&bem!6OPhN6dV<6y&%Lw6XEsVfgkf{_@Am&dLv$R^AAjB4Ype z`o|o}i+-+_)ohy=$^J@W(w+H=eFC==>%K1%SGZcDXO&F(u;dnRk(%v3?rmrDFDxrK pdv)Qp9e3V&OHB>0vv8L9#s2-OsL-oROdvNgc)I$ztaD0e0sukTN5237 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_top.png b/mods/ITEMS/mcl_mushroom/textures/stripped_crimson_stem_top.png new file mode 100644 index 0000000000000000000000000000000000000000..21696b098b5138b428e35702de9a589d34010c68 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(aP17(c(ln}4*Kg4@=(BZM z>g2k|-Tg+4_lxS#?*=d9fXdoET^vI=uJfKTsO-HHwJNC*h4-GEOi&M* zIG5XMVd$b1v(Q$qhsWXJ8P3q c&DP|rudmSwXID!#0Xm7n)78&qol`;+0JS7o0{{R3 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_side.png b/mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_side.png new file mode 100644 index 0000000000000000000000000000000000000000..db93c05cb449ae364df6f0653b72382c070aa62d GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWwJ`THv-GjD337CZa&=1d zaZ6wQ&%zrhTj=TH7{YO#_v}H@!wNhs7jqe{H4j{SoTqZx!GTvH_y5|K+jIUs@cz7E zp+#`b-u-RKr=&|`f2_ILT)9y1SAy7;lvV4QZYo}BvbK$T)hd*id8wdH{i@lCd0%#v x-!Qqqp!DI3#g1!>cD$V)qV@LRLAgT}|6&qk```DsaR4o6@O1TaS?83{1OR&;P*wl{ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_top.png b/mods/ITEMS/mcl_mushroom/textures/stripped_warped_stem_top.png new file mode 100644 index 0000000000000000000000000000000000000000..4a8f14800e6a14771a73a98efe5712a89a97963e GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYwKVs(vkGvvi*U7%4suBi zaw`aS%a8S~$qAX56VX!_yDn|g>NcR_PEQxd5RU7-XKeYJ97J3np609g$D*sKwuy1+ zwXV31*9^(;Qmjm#?LDKnCM{*^rMb_nPb|3;v-Ff=w%V@s3v4b+)HNwjp7~W@L~-IR z{~Kqkl1rFh9huy3w!rjP%6z`H#`(YAZ74n6R_OBZar2zzt=Wt7I-_DYEKp8yJoTGv l)BMYuC0Qa>+q Date: Tue, 19 Apr 2022 22:35:18 +0000 Subject: [PATCH 02/21] Add warped hyphae stripped and bark --- mods/ITEMS/mcl_mushroom/init.lua | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 46383699a..532d7f98d 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -213,6 +213,72 @@ minetest.register_node("mcl_mushroom:warped_checknode", { drop = "mcl_nether:netherrack" }) +--Stem bark, stripped stem and bark + +minetest.register_node("mcl_mushroom:warped_hyphae_bark", { + description = S("Warped Hyphae"), + _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), + tiles = {"warped_hyphae_side.png"}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + is_ground_content = false, + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + _mcl_stripped_variant = "mcl_mushroom:stripped_warped_hyphae_bark", + }) + +minetest.register_craft({ + output = "mcl_mushroom:warped_hyphae_bark 3", + recipe = { + { "mcl_mushroom:warped_hyphae", "mcl_mushroom:warped_hyphae" }, + { "mcl_mushroom:warped_hyphae", "mcl_mushroom:warped_hyphae" }, + } + }) + +minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { + description = description_stripped_trunk, + _doc_items_longdesc = longdesc, + _doc_items_hidden = false, + tiles = {tile_stripped_inner, tile_stripped_inner, tile_stripped_bark}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + +minetest.register_node("mcl_mushroom:stripped_warped_hyphae_bark", { + description = description_stripped_bark, + _doc_items_longdesc = longdesc_wood, + tiles = {tile_stripped_bark}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + is_ground_content = false, + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + +minetest.register_craft({ + output = "mcl_mushroom:stripped_warped_hyphae_bark 3", + recipe = { + { "mcl_mushroom:stripped_warped_hyphae", "mcl_mushroom:stripped_warped_hyphae" }, + { "mcl_mushroom:stripped_warped_hyphae", "mcl_mushroom:stripped_warped_hyphae" }, + } + }) + +--Wood + minetest.register_node("mcl_mushroom:warped_hyphae_wood", { description = S("Warped Hyphae Wood"), tiles = {"warped_hyphae_wood.png"}, From 9010305df42868dc78e6279943093d6bafb78427 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 19 Apr 2022 22:55:48 +0000 Subject: [PATCH 03/21] Add stripped warped stuff --- mods/ITEMS/mcl_mushroom/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 532d7f98d..a712740c8 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -240,10 +240,10 @@ minetest.register_craft({ }) minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { - description = description_stripped_trunk, - _doc_items_longdesc = longdesc, + description = S("Stripped Warped Hyphae"), + _doc_items_longdesc = S("The stripped stem of a warped hyphae"), _doc_items_hidden = false, - tiles = {tile_stripped_inner, tile_stripped_inner, tile_stripped_bark}, + tiles = {"stripped_warped_stem_top.png", "stripped_warped_stem_top.png", "stripped_warped_stem_side.png"}, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, @@ -255,9 +255,9 @@ minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { }) minetest.register_node("mcl_mushroom:stripped_warped_hyphae_bark", { - description = description_stripped_bark, - _doc_items_longdesc = longdesc_wood, - tiles = {tile_stripped_bark}, + description = S("Stripped Warped Hyphae Bark"), + _doc_items_longdesc = S("The stripped wood of a warped hyphae"), + tiles = {"stripped_warped_stem_side.png"}, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, From 1d331313d7fcec210f39d67ce2867110884fa57f Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 19 Apr 2022 23:25:21 +0000 Subject: [PATCH 04/21] Same for crimson hyphae --- mods/ITEMS/mcl_mushroom/init.lua | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index a712740c8..042a7b805 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -431,6 +431,72 @@ minetest.register_node("mcl_mushroom:crimson_hyphae", { _mcl_hardness = 2, }) +--Stem bark, stripped stem and bark + +minetest.register_node("mcl_mushroom:crimson_hyphae_bark", { + description = S("Crimson Hyphae"), + _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), + tiles = {"crimson_hyphae_side.png"}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + is_ground_content = false, + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + _mcl_stripped_variant = "mcl_mushroom:stripped_crimson_hyphae_bark", + }) + +minetest.register_craft({ + output = "mcl_mushroom:crimson_hyphae_bark 3", + recipe = { + { "mcl_mushroom:crimson_hyphae", "mcl_mushroom:crimson_hyphae" }, + { "mcl_mushroom:crimson_hyphae", "mcl_mushroom:crimson_hyphae" }, + } + }) + +minetest.register_node("mcl_mushroom:stripped_crimson_hyphae", { + description = S("Stripped Crimson Hyphae"), + _doc_items_longdesc = S("The stripped stem of a crimson hyphae"), + _doc_items_hidden = false, + tiles = {"stripped_crimson_stem_top.png", "stripped_crimson_stem_top.png", "stripped_crimson_stem_side.png"}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + +minetest.register_node("mcl_mushroom:stripped_crimson_hyphae_bark", { + description = S("Stripped Crimson Hyphae Bark"), + _doc_items_longdesc = S("The stripped wood of a crimson hyphae"), + tiles = {"stripped_crimson_stem_side.png"}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + is_ground_content = false, + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + +minetest.register_craft({ + output = "mcl_mushroom:stripped_crimson_hyphae_bark 3", + recipe = { + { "mcl_mushroom:stripped_crimson_hyphae", "mcl_mushroom:stripped_crimson_hyphae" }, + { "mcl_mushroom:stripped_crimson_hyphae", "mcl_mushroom:stripped_crimson_hyphae" }, + } + }) + +--Wood + minetest.register_node("mcl_mushroom:crimson_hyphae_wood", { description = S("Crimson Hyphae Wood"), tiles = {"crimson_hyphae_wood.png"}, From 4850b914a489ce4c1d34742249052e25a3e0ca62 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 00:29:44 +0000 Subject: [PATCH 05/21] Non flammable/modify by similiraty with trees --- mods/ITEMS/mcl_mushroom/init.lua | 42 +++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 042a7b805..923adcffa 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -160,6 +160,8 @@ minetest.register_node("mcl_mushroom:shroomlight", { minetest.register_node("mcl_mushroom:warped_hyphae", { description = S("Warped Hyphae"), + _doc_items_longdesc = S("The stem of a warped hyphae"), + _doc_items_hidden = false, tiles = { "warped_hyphae.png", "warped_hyphae.png", @@ -168,10 +170,15 @@ minetest.register_node("mcl_mushroom:warped_hyphae", { "warped_hyphae_side.png", "warped_hyphae_side.png", }, - groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,}, paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + groups = {handy=1,axey=1, tree=1, building_block=1, material_wood=1}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, stack_max = 64, _mcl_hardness = 2, + _mcl_stripped_variant = stripped_variant, }) minetest.register_node("mcl_mushroom:warped_nylium", { @@ -222,7 +229,7 @@ minetest.register_node("mcl_mushroom:warped_hyphae_bark", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1,axey=1, bark=1, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = false, on_rotate = on_rotate, @@ -247,7 +254,7 @@ minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, tree=1, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), on_rotate = on_rotate, _mcl_blast_resistance = 2, @@ -261,7 +268,7 @@ minetest.register_node("mcl_mushroom:stripped_warped_hyphae_bark", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, bark=1, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = false, on_rotate = on_rotate, @@ -282,7 +289,7 @@ minetest.register_craft({ minetest.register_node("mcl_mushroom:warped_hyphae_wood", { description = S("Warped Hyphae Wood"), tiles = {"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}, --paramtype2 = "facedir", stack_max = 64, _mcl_hardness = 2, @@ -417,18 +424,25 @@ minetest.register_node("mcl_mushroom:crimson_roots", { minetest.register_node("mcl_mushroom:crimson_hyphae", { description = S("Crimson Hyphae"), + _doc_items_longdesc = S("The stem of a crimson hyphae"), + _doc_items_hidden = false, tiles = { "crimson_hyphae.png", - "crimson_hyphae.png", - "crimson_hyphae_side.png", - "crimson_hyphae_side.png", - "crimson_hyphae_side.png", - "crimson_hyphae_side.png", + "crimson_hyphae.png", + "crimson_hyphae_side.png", + "crimson_hyphae_side.png", + "crimson_hyphae_side.png", + "crimson_hyphae_side.png", }, - groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,}, paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + groups = {handy=1,axey=1, tree=1, building_block=1, material_wood=1}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, stack_max = 64, _mcl_hardness = 2, + _mcl_stripped_variant = stripped_variant, }) --Stem bark, stripped stem and bark @@ -440,7 +454,7 @@ minetest.register_node("mcl_mushroom:crimson_hyphae_bark", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1,axey=1, bark=1, building_block=1, material_wood=1,}, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = false, on_rotate = on_rotate, @@ -465,7 +479,7 @@ minetest.register_node("mcl_mushroom:stripped_crimson_hyphae", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, tree=1, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), on_rotate = on_rotate, _mcl_blast_resistance = 2, @@ -479,7 +493,7 @@ minetest.register_node("mcl_mushroom:stripped_crimson_hyphae_bark", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, bark=1, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = false, on_rotate = on_rotate, From 44c2c26265446f30a9d64215f48ed5dde8297b96 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 01:35:48 +0000 Subject: [PATCH 06/21] make nether woods doors unflammable --- mods/ITEMS/mcl_doors/register.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index 8c8b7613f..f79d68e0a 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -149,7 +149,7 @@ mcl_doors:register_door("mcl_doors:crimson_door", { _doc_items_longdesc = wood_longdesc, _doc_items_usagehelp = wood_usagehelp, inventory_image = "mcl_doors_door_crimson.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_doors_door_crimson_lower.png", "mcl_doors_door_crimson_side_lower.png"}, @@ -172,7 +172,7 @@ mcl_doors:register_door("mcl_doors:warped_door", { _doc_items_longdesc = wood_longdesc, _doc_items_usagehelp = wood_usagehelp, inventory_image = "mcl_doors_door_warped.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_doors_door_warped_lower.png", "mcl_doors_door_warped_side_lower.png"}, From 04c62e475ee6391f4f9b30ecbf8b6f83465f63b7 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 01:42:50 +0000 Subject: [PATCH 07/21] makes nether wood trapdoors unflammable --- mods/ITEMS/mcl_doors/register.lua | 39 +++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index f79d68e0a..32601ee14 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -270,8 +270,6 @@ local woods = { { "spruce_trapdoor", S("Spruce Trapdoor"), "mcl_doors_trapdoor_spruce.png", "mcl_doors_trapdoor_spruce_side.png", "mcl_core:sprucewood" }, { "dark_oak_trapdoor", S("Dark Oak Trapdoor"), "mcl_doors_trapdoor_dark_oak.png", "mcl_doors_trapdoor_dark_oak_side.png", "mcl_core:darkwood" }, { "jungle_trapdoor", S("Jungle Trapdoor"), "mcl_doors_trapdoor_jungle.png", "mcl_doors_trapdoor_jungle_side.png", "mcl_core:junglewood" }, - { "crimson_trapdoor", S("Crimson Trapdoor"), "mcl_doors_trapdoor_crimson.png", "mcl_doors_trapdoor_crimson_side.png", "mcl_mushroom:crimson_hyphae_wood" }, - { "warped_trapdoor", S("Warped Trapdoor"), "mcl_doors_trapdoor_warped.png", "mcl_doors_trapdoor_warped_side.png", "mcl_mushroom:warped_hyphae_wood" }, } for w=1, #woods do @@ -303,6 +301,43 @@ for w=1, #woods do }) end +local woods_nether = { + -- id, desc, texture, craftitem + { "crimson_trapdoor", S("Crimson Trapdoor"), "mcl_doors_trapdoor_crimson.png", "mcl_doors_trapdoor_crimson_side.png", "mcl_mushroom:crimson_hyphae_wood" }, + { "warped_trapdoor", S("Warped Trapdoor"), "mcl_doors_trapdoor_warped.png", "mcl_doors_trapdoor_warped_side.png", "mcl_mushroom:warped_hyphae_wood" }, +} + +for w=1, #woods_nether do + mcl_doors:register_trapdoor("mcl_doors:"..woods[w][1], { + description = woods[w][2], + _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), + _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), + tile_front = woods[w][3], + tile_side = woods[w][4], + wield_image = woods[w][3], + 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(), + }) + + minetest.register_craft({ + output = "mcl_doors:"..woods[w][1].." 2", + recipe = { + {woods[w][5], woods[w][5], woods[w][5]}, + {woods[w][5], woods[w][5], woods[w][5]}, + } + }) + + minetest.register_craft({ + type = "fuel", + recipe = "mcl_doors:"..woods[w][1], + burntime = 15, + }) +end + +--Iron Trapdoor-- + mcl_doors:register_trapdoor("mcl_doors:iron_trapdoor", { description = S("Iron Trapdoor"), _doc_items_longdesc = S("Iron trapdoors are horizontal barriers which can only be opened and closed by redstone signals, but not by hand. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), From df8dab3fac34fec143359f4247dba98c7f56c1bc Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 01:47:39 +0000 Subject: [PATCH 08/21] Makes nether wood fences unflammable --- mods/ITEMS/mclx_fences/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mclx_fences/init.lua b/mods/ITEMS/mclx_fences/init.lua index 53aab68b2..a4fa0b169 100644 --- a/mods/ITEMS/mclx_fences/init.lua +++ b/mods/ITEMS/mclx_fences/init.lua @@ -30,7 +30,7 @@ mcl_fences.register_fence_and_fence_gate( "crimson_wood_fence", S("Crimson Hyphae Wood Fence"), S("Crimson Hyphae Wood Fence Gate"), "mcl_fences_fence_crimson.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_core:wood"]._mcl_hardness, minetest.registered_nodes["mcl_core:wood"]._mcl_blast_resistance, {"group:fence_wood"}, @@ -43,7 +43,7 @@ mcl_fences.register_fence_and_fence_gate( "warped_wood_fence", S("Warped Hyphae Wood Fence"), S("Warped Hyphae Wood Fence Gate"), "mcl_fences_fence_warped.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_core:wood"]._mcl_hardness, minetest.registered_nodes["mcl_core:wood"]._mcl_blast_resistance, {"group:fence_wood"}, From c3ef5e93af5ea8030c3ff0544422c226273b5e94 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 03:37:28 +0000 Subject: [PATCH 09/21] Put door registration into a loop to have less lines of code --- mods/ITEMS/mcl_doors/register.lua | 290 ++++++++---------------------- 1 file changed, 75 insertions(+), 215 deletions(-) diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index 32601ee14..6dd9dc1d2 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -5,232 +5,87 @@ local S = minetest.get_translator(minetest.get_current_modname()) local wood_longdesc = S("Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal.") local wood_usagehelp = S("To open or close a wooden door, rightclick it or supply its lower half with a redstone signal.") ---- Oak Door --- -mcl_doors:register_door("mcl_doors:wooden_door", { - description = S("Oak Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "doors_item_wood.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"}, - tiles_top = {"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) +--Register flammable doors-- -minetest.register_craft({ - output = "mcl_doors:wooden_door 3", - recipe = { - {"mcl_core:wood", "mcl_core:wood"}, - {"mcl_core:wood", "mcl_core:wood"}, - {"mcl_core:wood", "mcl_core:wood"} - } -}) +local woods = { + --id, desc, textures, craftitem + {"wooden_door",S("Oak Door"),"doors_item_wood.png",{"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"},{"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"},"mcl_core:wood"}, + {"acacia_door",S("Acacia Door"),"mcl_doors_door_acacia.png",{"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"},{"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"},"mcl_core:acaciawood"}, + {"birch_door",S("Birch Door"),"mcl_doors_door_birch.png",{"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"},{"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"},"mcl_core:birchwood"}, + {"dark_oak_door",S("Dark Oak Door"),"mcl_doors_door_dark_oak.png",{"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"},{"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"},"mcl_core:darkwood"}, + {"jungle_door",S("Jungle Door"),"mcl_doors_door_jungle.png",{"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"},{"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"},"mcl_core:junglewood"}, + {"spruce_door",S("Spruce Door"),"mcl_doors_door_spruce.png",{"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"},{"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"},"mcl_core:sprucewood"}, +} ---- Acacia Door -- -mcl_doors:register_door("mcl_doors:acacia_door", { - description = S("Acacia Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_acacia.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"}, - tiles_top = {"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) +for w=1 #woods do + mcl_doors:register_door("mcl_doors:"..woods[w][1], { + description = woods[w][2], + _doc_items_longdesc = wood_longdesc, + _doc_items_usagehelp = wood_usagehelp, + inventory_image = woods[w][3], + groups = {handy=1,axey=1, material_wood=1, flammable=-1}, + _mcl_hardness = 3, + _mcl_blast_resistance = 3, + tiles_bottom = woods[w][4], + tiles_top = woods[w][5], + sounds = mcl_sounds.node_sound_wood_defaults(), + }) -minetest.register_craft({ - output = "mcl_doors:acacia_door 3", - recipe = { - {"mcl_core:acaciawood", "mcl_core:acaciawood"}, - {"mcl_core:acaciawood", "mcl_core:acaciawood"}, - {"mcl_core:acaciawood", "mcl_core:acaciawood"} - } -}) + minetest.register_craft({ + output = "mcl_doors:"..woods[w][1].." 3", + recipe = { + {woods[w][6], woods[w][6]}, + {woods[w][6], woods[w][6]}, + {woods[w][6], woods[w][6]} + } + }) ---- Birch Door -- -mcl_doors:register_door("mcl_doors:birch_door", { - description = S("Birch Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_birch.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"}, - tiles_top = {"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) + minetest.register_craft({ + type = "fuel", + recipe = "mcl_doors:"..woods[w][1], + burntime = 10, + }) -minetest.register_craft({ - output = "mcl_doors:birch_door 3", - recipe = { - {"mcl_core:birchwood", "mcl_core:birchwood"}, - {"mcl_core:birchwood", "mcl_core:birchwood"}, - {"mcl_core:birchwood", "mcl_core:birchwood"}, - } -}) +end ---- Dark Oak Door -- -mcl_doors:register_door("mcl_doors:dark_oak_door", { - description = S("Dark Oak Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_dark_oak.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"}, - tiles_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) +--Register non-flammable doors-- -minetest.register_craft({ - output = "mcl_doors:dark_oak_door 3", - recipe = { - {"mcl_core:darkwood", "mcl_core:darkwood"}, - {"mcl_core:darkwood", "mcl_core:darkwood"}, - {"mcl_core:darkwood", "mcl_core:darkwood"}, - } -}) +local woods_nether = { + --id, desc, textures, craftitem + {"crimson_door",S("Crimson Door"),"mcl_doors_door_crimson.png",{"mcl_doors_door_crimson_lower.png", "mcl_doors_door_crimson_side_lower.png"},{"mcl_doors_door_crimson_upper.png", "mcl_doors_door_crimson_side_upper.png"},"mcl_mushroom:crimson_hyphae_wood"}, + {"warped_door",S("Warped Door"),"mcl_doors_door_warped.png",{"mcl_doors_door_warped_lower.png", "mcl_doors_door_warped_side_lower.png"},{"mcl_doors_door_warped_upper.png", "mcl_doors_door_warped_side_upper.png"},"mcl_mushroom:warped_hyphae_wood"}, +} ---- Jungle Door -- -mcl_doors:register_door("mcl_doors:jungle_door", { - description = S("Jungle Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_jungle.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"}, - tiles_top = {"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) +for w=1 #woods_nether do + mcl_doors:register_door("mcl_doors:"..woods[w][1], { + description = woods[w][2], + _doc_items_longdesc = wood_longdesc, + _doc_items_usagehelp = wood_usagehelp, + inventory_image = woods[w][3], + groups = {handy=1,axey=1, material_wood=1}, + _mcl_hardness = 3, + _mcl_blast_resistance = 3, + tiles_bottom = woods[w][4], + tiles_top = woods[w][5], + sounds = mcl_sounds.node_sound_wood_defaults(), + }) -minetest.register_craft({ - output = "mcl_doors:jungle_door 3", - recipe = { - {"mcl_core:junglewood", "mcl_core:junglewood"}, - {"mcl_core:junglewood", "mcl_core:junglewood"}, - {"mcl_core:junglewood", "mcl_core:junglewood"} - } -}) + minetest.register_craft({ + output = "mcl_doors:"..woods[w][1].." 3", + recipe = { + {woods[w][6], woods[w][6]}, + {woods[w][6], woods[w][6]}, + {woods[w][6], woods[w][6]} + } + }) ---- Spruce Door -- -mcl_doors:register_door("mcl_doors:spruce_door", { - description = S("Spruce Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_spruce.png", - groups = {handy=1,axey=1, material_wood=1, flammable=-1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"}, - tiles_top = {"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) + minetest.register_craft({ + type = "fuel", + recipe = "mcl_doors:"..woods[w][1], + burntime = 10, + }) -minetest.register_craft({ - output = "mcl_doors:spruce_door 3", - recipe = { - {"mcl_core:sprucewood", "mcl_core:sprucewood"}, - {"mcl_core:sprucewood", "mcl_core:sprucewood"}, - {"mcl_core:sprucewood", "mcl_core:sprucewood"} - } -}) - ---- Crimson Door -- -mcl_doors:register_door("mcl_doors:crimson_door", { - description = S("Crimson Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_crimson.png", - groups = {handy=1,axey=1, material_wood=1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_crimson_lower.png", "mcl_doors_door_crimson_side_lower.png"}, - tiles_top = {"mcl_doors_door_crimson_upper.png", "mcl_doors_door_crimson_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) - -minetest.register_craft({ - output = "mcl_doors:crimson_door 3", - recipe = { - {"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"}, - {"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"}, - {"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"} - } -}) - ---- Warped Door -- -mcl_doors:register_door("mcl_doors:warped_door", { - description = S("Warped Door"), - _doc_items_longdesc = wood_longdesc, - _doc_items_usagehelp = wood_usagehelp, - inventory_image = "mcl_doors_door_warped.png", - groups = {handy=1,axey=1, material_wood=1}, - _mcl_hardness = 3, - _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_warped_lower.png", "mcl_doors_door_warped_side_lower.png"}, - tiles_top = {"mcl_doors_door_warped_upper.png", "mcl_doors_door_warped_side_upper.png"}, - sounds = mcl_sounds.node_sound_wood_defaults(), -}) - -minetest.register_craft({ - output = "mcl_doors:warped_door 3", - recipe = { - {"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"}, - {"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"}, - {"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"} - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:wooden_door", - burntime = 10, -}) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:jungle_door", - burntime = 10, -}) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:dark_oak_door", - burntime = 10, -}) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:birch_door", - burntime = 10, -}) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:acacia_door", - burntime = 10, -}) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:spruce_door", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:crimson_door", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "mcl_doors:warped_door", - burntime = 10, -}) +end --- Iron Door --- mcl_doors:register_door("mcl_doors:iron_door", { @@ -262,6 +117,9 @@ minetest.register_craft({ --[[ Trapdoors ]] + +--Register flammable trapdoors-- + local woods = { -- id, desc, texture, craftitem { "trapdoor", S("Oak Trapdoor"), "doors_trapdoor.png", "doors_trapdoor_side.png", "mcl_core:wood" }, @@ -301,6 +159,8 @@ for w=1, #woods do }) end +--Register non-flammable trapdoors-- + local woods_nether = { -- id, desc, texture, craftitem { "crimson_trapdoor", S("Crimson Trapdoor"), "mcl_doors_trapdoor_crimson.png", "mcl_doors_trapdoor_crimson_side.png", "mcl_mushroom:crimson_hyphae_wood" }, From f57135259c5ca5aa7fecf2153f02615b0aa1e519 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 03:42:54 +0000 Subject: [PATCH 10/21] fix --- mods/ITEMS/mcl_doors/register.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index 6dd9dc1d2..f4ea6abe1 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -17,7 +17,7 @@ local woods = { {"spruce_door",S("Spruce Door"),"mcl_doors_door_spruce.png",{"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"},{"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"},"mcl_core:sprucewood"}, } -for w=1 #woods do +for w=1, #woods do mcl_doors:register_door("mcl_doors:"..woods[w][1], { description = woods[w][2], _doc_items_longdesc = wood_longdesc, @@ -56,7 +56,7 @@ local woods_nether = { {"warped_door",S("Warped Door"),"mcl_doors_door_warped.png",{"mcl_doors_door_warped_lower.png", "mcl_doors_door_warped_side_lower.png"},{"mcl_doors_door_warped_upper.png", "mcl_doors_door_warped_side_upper.png"},"mcl_mushroom:warped_hyphae_wood"}, } -for w=1 #woods_nether do +for w=1, #woods_nether do mcl_doors:register_door("mcl_doors:"..woods[w][1], { description = woods[w][2], _doc_items_longdesc = wood_longdesc, From ed29cd687bea3c3c467bc814a2fd89814128cd0d Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 04:07:22 +0000 Subject: [PATCH 11/21] fix --- mods/ITEMS/mcl_doors/register.lua | 38 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index f4ea6abe1..4d30fcc31 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -57,31 +57,31 @@ local woods_nether = { } for w=1, #woods_nether do - mcl_doors:register_door("mcl_doors:"..woods[w][1], { - description = woods[w][2], + mcl_doors:register_door("mcl_doors:"..woods_nether[w][1], { + description = woods_nether[w][2], _doc_items_longdesc = wood_longdesc, _doc_items_usagehelp = wood_usagehelp, - inventory_image = woods[w][3], + inventory_image = woods_nether[w][3], groups = {handy=1,axey=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = woods[w][4], - tiles_top = woods[w][5], + tiles_bottom = woods_nether[w][4], + tiles_top = woods_nether[w][5], sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ - output = "mcl_doors:"..woods[w][1].." 3", + output = "mcl_doors:"..woods_nether[w][1].." 3", recipe = { - {woods[w][6], woods[w][6]}, - {woods[w][6], woods[w][6]}, - {woods[w][6], woods[w][6]} + {woods_nether[w][6], woods_nether[w][6]}, + {woods_nether[w][6], woods_nether[w][6]}, + {woods_nether[w][6], woods_nether[w][6]} } }) minetest.register_craft({ type = "fuel", - recipe = "mcl_doors:"..woods[w][1], + recipe = "mcl_doors:"..woods_nether[w][1], burntime = 10, }) @@ -168,13 +168,13 @@ local woods_nether = { } for w=1, #woods_nether do - mcl_doors:register_trapdoor("mcl_doors:"..woods[w][1], { - description = woods[w][2], + mcl_doors:register_trapdoor("mcl_doors:"..woods_nether[w][1], { + description = woods_nether[w][2], _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), - tile_front = woods[w][3], - tile_side = woods[w][4], - wield_image = woods[w][3], + tile_front = woods_nether[w][3], + tile_side = woods_nether[w][4], + wield_image = woods_nether[w][3], groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, @@ -182,16 +182,16 @@ for w=1, #woods_nether do }) minetest.register_craft({ - output = "mcl_doors:"..woods[w][1].." 2", + output = "mcl_doors:"..woods_nether[w][1].." 2", recipe = { - {woods[w][5], woods[w][5], woods[w][5]}, - {woods[w][5], woods[w][5], woods[w][5]}, + {woods_nether[w][5], woods_nether[w][5], woods_nether[w][5]}, + {woods_nether[w][5], woods_nether[w][5], woods_nether[w][5]}, } }) minetest.register_craft({ type = "fuel", - recipe = "mcl_doors:"..woods[w][1], + recipe = "mcl_doors:"..woods_nether[w][1], burntime = 15, }) end From 3dcb969d7543c4ea73bad3c6fbc350974d8f1058 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 04:32:13 +0000 Subject: [PATCH 12/21] fix --- mods/ITEMS/mcl_mushroom/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 923adcffa..8757d1e94 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -178,7 +178,7 @@ minetest.register_node("mcl_mushroom:warped_hyphae", { _mcl_blast_resistance = 2, stack_max = 64, _mcl_hardness = 2, - _mcl_stripped_variant = stripped_variant, + _mcl_stripped_variant = "mcl_mushroom:stripped_warped_hyphae", }) minetest.register_node("mcl_mushroom:warped_nylium", { @@ -442,7 +442,7 @@ minetest.register_node("mcl_mushroom:crimson_hyphae", { _mcl_blast_resistance = 2, stack_max = 64, _mcl_hardness = 2, - _mcl_stripped_variant = stripped_variant, + _mcl_stripped_variant = "mcl_mushroom:stripped_crimson_hyphae", }) --Stem bark, stripped stem and bark From 9367c74e71e00edbaafb7387bf676997e480f60a Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 05:06:07 +0000 Subject: [PATCH 13/21] Add bark stairs and slab --- mods/ITEMS/mcl_mushroom/init.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 8757d1e94..684582b80 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -246,6 +246,8 @@ minetest.register_craft({ } }) +mcl_stairs.register_stair_and_slab_simple("warped_hyphae_bark", "mcl_mushroom:warped_hyphae_bark", S("Warped Bark Stair"), S("Warped Bark Slab"), S("Double Warped Bark Slab"), "woodlike") + minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { description = S("Stripped Warped Hyphae"), _doc_items_longdesc = S("The stripped stem of a warped hyphae"), @@ -471,6 +473,8 @@ minetest.register_craft({ } }) +mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_bark", "mcl_mushroom:crimson_hyphae_bark", S("Crimson Bark Stair"), S("Crimson Bark Slab"), S("Double Crimson Bark Slab"), "woodlike") + minetest.register_node("mcl_mushroom:stripped_crimson_hyphae", { description = S("Stripped Crimson Hyphae"), _doc_items_longdesc = S("The stripped stem of a crimson hyphae"), From fec258cb9959ea03af4101a7ede9108a79ae2c08 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 22:05:57 +0000 Subject: [PATCH 14/21] Wrong recipe --- mods/ITEMS/mcl_mushroom/init.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index 684582b80..b818efceb 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -246,7 +246,6 @@ minetest.register_craft({ } }) -mcl_stairs.register_stair_and_slab_simple("warped_hyphae_bark", "mcl_mushroom:warped_hyphae_bark", S("Warped Bark Stair"), S("Warped Bark Slab"), S("Double Warped Bark Slab"), "woodlike") minetest.register_node("mcl_mushroom:stripped_warped_hyphae", { description = S("Stripped Warped Hyphae"), @@ -473,7 +472,6 @@ minetest.register_craft({ } }) -mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_bark", "mcl_mushroom:crimson_hyphae_bark", S("Crimson Bark Stair"), S("Crimson Bark Slab"), S("Double Crimson Bark Slab"), "woodlike") minetest.register_node("mcl_mushroom:stripped_crimson_hyphae", { description = S("Stripped Crimson Hyphae"), From 01737dd551bacc4d3583fbabd5a31d47a1fb40cc Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 22:15:01 +0000 Subject: [PATCH 15/21] Add Bark stairs and slab --- mods/ITEMS/mcl_mushroom/init.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index b818efceb..bf909b9dc 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -904,3 +904,31 @@ minetest.register_decoration({ y_min = -29065, decoration = "mcl_mushroom:crimson_fungus", }) + +--Hyphae Stairs and slabs + +local barks = { + { "warped", S("Warped Bark Stairs"), S("Warped Bark Slab"), S("Double Warped Bark Slab") }, + { "crimson", S("Crimson Bark Stairs"), S("Crimson Oak Bark Slab"), S("Double Crimson Bark Slab") }, +} + +for b=1, #barks do + local bark = barks[b] + local sub = bark[1].."hyphae_bark" + local id = "mcl_mushroom:hyphae" + if bark[1] ~= "" then + id = "mcl_mushroom:"..bark[1].."hyphae" + end + mcl_stairs.register_stair(sub, id, + {handy=1,axey=1, bark_stairs=1, material_wood=1}, + {minetest.registered_nodes[id].tiles[3]}, + bark[2], + mcl_sounds.node_sound_wood_defaults(), 3, 2, + "woodlike") + mcl_stairs.register_slab(sub, id, + {handy=1,axey=1, bark_slab=1, material_wood=1}, + {minetest.registered_nodes[id].tiles[3]}, + bark[3], + mcl_sounds.node_sound_wood_defaults(), 3, 2, + bark[4]) +end \ No newline at end of file From 85a6f216f09c2fb3288ecfd69e326b2a1f450709 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 22:32:07 +0000 Subject: [PATCH 16/21] fix --- mods/ITEMS/mcl_mushroom/init.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index bf909b9dc..cbf84dd50 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -914,11 +914,9 @@ local barks = { for b=1, #barks do local bark = barks[b] - local sub = bark[1].."hyphae_bark" - local id = "mcl_mushroom:hyphae" - if bark[1] ~= "" then - id = "mcl_mushroom:"..bark[1].."hyphae" - end + local sub = bark[1].."_hyphae_bark" + local id = "mcl_mushroom:"..bark[1].."_hyphae" + mcl_stairs.register_stair(sub, id, {handy=1,axey=1, bark_stairs=1, material_wood=1}, {minetest.registered_nodes[id].tiles[3]}, From 84320db3b7bf20ff96e3f440531fe5bd2ffa6882 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 22:50:40 +0000 Subject: [PATCH 17/21] Rangement --- mods/ITEMS/mcl_mushroom/init.lua | 336 ++++++++++++++++--------------- 1 file changed, 170 insertions(+), 166 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index cbf84dd50..acfbae62d 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -19,6 +19,7 @@ end -- Warped fungus -- Crimson fungus +-- Nether woods -- Functions and Biomes -- WARNING: The most comments are in german. Please Translate with an translater if you don't speak good german @@ -158,29 +159,6 @@ minetest.register_node("mcl_mushroom:shroomlight", { light_source = 14, }) -minetest.register_node("mcl_mushroom:warped_hyphae", { - description = S("Warped Hyphae"), - _doc_items_longdesc = S("The stem of a warped hyphae"), - _doc_items_hidden = false, - tiles = { - "warped_hyphae.png", - "warped_hyphae.png", - "warped_hyphae_side.png", - "warped_hyphae_side.png", - "warped_hyphae_side.png", - "warped_hyphae_side.png", - }, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, tree=1, building_block=1, material_wood=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - on_rotate = on_rotate, - _mcl_blast_resistance = 2, - stack_max = 64, - _mcl_hardness = 2, - _mcl_stripped_variant = "mcl_mushroom:stripped_warped_hyphae", -}) - minetest.register_node("mcl_mushroom:warped_nylium", { description = S("Warped Nylium"), tiles = { @@ -220,6 +198,149 @@ minetest.register_node("mcl_mushroom:warped_checknode", { drop = "mcl_nether:netherrack" }) + + +minetest.register_craft({ + output = "mcl_mushroom:warped_nylium 2", + recipe = { + {"mcl_mushroom:warped_wart_block"}, + {"mcl_nether:netherrack"}, + } +}) + +minetest.register_abm({ + label = "mcl_mushroom:warped_fungus", + nodenames = {"mcl_mushroom:warped_fungus"}, + interval = 11, + chance = 128, + action = function(pos) + local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) + if nodepos.name == "mcl_mushroom:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then + if pos.y < -28400 then + generate_warped_tree(pos) + end + end + end +}) + +minetest.register_abm({ + label = "mcl_mushroom:warped_checknode", + nodenames = {"mcl_mushroom:warped_checknode"}, + interval = 0.1, + chance = 1, + action = function(pos) + local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}) + if nodepos.name == "air" then + minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:warped_nylium" }) + local randomg = math.random(1, 400) + if randomg <= 5 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" }) + elseif randomg > 5 and randomg <= 15 then + local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z } + generate_warped_tree(pos1) + elseif randomg > 15 and randomg <= 45 then + grow_twisting_vines({ x = pos.x, y = pos.y, z = pos.z } ,math.random(1, 4)) + elseif randomg > 45 and randomg <= 50 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" }) + elseif randomg > 50 and randomg <= 150 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:nether_sprouts" }) + elseif randomg > 150 and randomg <= 250 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_roots" }) + end + else + minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" }) + end + end +}) + + +--[[ FIXME mobs:spawn({ + name = "mobs_mc:enderman", + nodes = {"mcl_mushroom:warped_nylium"}, + --min_light = 14, + interval = 5, + chance = 10, + --min_height = 3, + --max_height = 200, +})]] + + +minetest.register_node("mcl_mushroom:crimson_fungus", { + description = S("Crimson Fungus Mushroom"), + drawtype = "plantlike", + tiles = { "farming_crimson_fungus.png" }, + inventory_image = "farming_crimson_fungus.png", + wield_image = "farming_crimson_fungus.png", + sunlight_propagates = true, + paramtype = "light", + walkable = false, + groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1, compostability=65}, + light_source = 1, + selection_box = { + type = "fixed", + fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 }, + }, + node_placement_prediction = "", + on_rightclick = function(pos, node, pointed_thing, itemstack) + if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then + itemstack:take_item() + local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) + if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then + local random = math.random(1, 5) + if random == 1 then + generate_crimson_tree(pos) + end + end + end + end, + _mcl_blast_resistance = 0, + stack_max = 64, +}) + +minetest.register_node("mcl_mushroom:crimson_roots", { + description = S("Crimson Roots"), + drawtype = "plantlike", + tiles = { "crimson_roots.png" }, + inventory_image = "crimson_roots.png", + sunlight_propagates = true, + paramtype = "light", + walkable = false, + buildable_to = true, + groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1, compostability=65}, + selection_box = { + type = "fixed", + fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 }, + }, + node_placement_prediction = "", + _mcl_silk_touch_drop = false, + _mcl_blast_resistance = 0, + stack_max = 64, +}) + +---Nether Woods + +minetest.register_node("mcl_mushroom:warped_hyphae", { + description = S("Warped Hyphae"), + _doc_items_longdesc = S("The stem of a warped hyphae"), + _doc_items_hidden = false, + tiles = { + "warped_hyphae.png", + "warped_hyphae.png", + "warped_hyphae_side.png", + "warped_hyphae_side.png", + "warped_hyphae_side.png", + "warped_hyphae_side.png", + }, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + groups = {handy=1,axey=1, tree=1, building_block=1, material_wood=1}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + stack_max = 64, + _mcl_hardness = 2, + _mcl_stripped_variant = "mcl_mushroom:stripped_warped_hyphae", +}) --Stem bark, stripped stem and bark minetest.register_node("mcl_mushroom:warped_hyphae_bark", { @@ -305,124 +426,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "mcl_mushroom:warped_nylium 2", - recipe = { - {"mcl_mushroom:warped_wart_block"}, - {"mcl_nether:netherrack"}, - } -}) - -minetest.register_abm({ - label = "mcl_mushroom:warped_fungus", - nodenames = {"mcl_mushroom:warped_fungus"}, - interval = 11, - chance = 128, - action = function(pos) - local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) - if nodepos.name == "mcl_mushroom:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then - if pos.y < -28400 then - generate_warped_tree(pos) - end - end - end -}) - -minetest.register_abm({ - label = "mcl_mushroom:warped_checknode", - nodenames = {"mcl_mushroom:warped_checknode"}, - interval = 0.1, - chance = 1, - action = function(pos) - local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}) - if nodepos.name == "air" then - minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:warped_nylium" }) - local randomg = math.random(1, 400) - if randomg <= 5 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" }) - elseif randomg > 5 and randomg <= 15 then - local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z } - generate_warped_tree(pos1) - elseif randomg > 15 and randomg <= 45 then - grow_twisting_vines({ x = pos.x, y = pos.y, z = pos.z } ,math.random(1, 4)) - elseif randomg > 45 and randomg <= 50 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" }) - elseif randomg > 50 and randomg <= 150 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:nether_sprouts" }) - elseif randomg > 150 and randomg <= 250 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_roots" }) - end - else - minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" }) - end - end -}) - - ---[[ FIXME mobs:spawn({ - name = "mobs_mc:enderman", - nodes = {"mcl_mushroom:warped_nylium"}, - --min_light = 14, - interval = 5, - chance = 10, - --min_height = 3, - --max_height = 200, -})]] - - - -minetest.register_node("mcl_mushroom:crimson_fungus", { - description = S("Crimson Fungus Mushroom"), - drawtype = "plantlike", - tiles = { "farming_crimson_fungus.png" }, - inventory_image = "farming_crimson_fungus.png", - wield_image = "farming_crimson_fungus.png", - sunlight_propagates = true, - paramtype = "light", - walkable = false, - groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1, compostability=65}, - light_source = 1, - selection_box = { - type = "fixed", - fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 }, - }, - node_placement_prediction = "", - on_rightclick = function(pos, node, pointed_thing, itemstack) - if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then - itemstack:take_item() - local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) - if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then - local random = math.random(1, 5) - if random == 1 then - generate_crimson_tree(pos) - end - end - end - end, - _mcl_blast_resistance = 0, - stack_max = 64, -}) - -minetest.register_node("mcl_mushroom:crimson_roots", { - description = S("Crimson Roots"), - drawtype = "plantlike", - tiles = { "crimson_roots.png" }, - inventory_image = "crimson_roots.png", - sunlight_propagates = true, - paramtype = "light", - walkable = false, - buildable_to = true, - groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1, compostability=65}, - selection_box = { - type = "fixed", - fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 }, - }, - node_placement_prediction = "", - _mcl_silk_touch_drop = false, - _mcl_blast_resistance = 0, - stack_max = 64, -}) - minetest.register_node("mcl_mushroom:crimson_hyphae", { description = S("Crimson Hyphae"), _doc_items_longdesc = S("The stem of a crimson hyphae"), @@ -522,6 +525,32 @@ minetest.register_node("mcl_mushroom:crimson_hyphae_wood", { _mcl_hardness = 2, }) +--Hyphae Stairs and slabs + +local barks = { + { "warped", S("Warped Bark Stairs"), S("Warped Bark Slab"), S("Double Warped Bark Slab") }, + { "crimson", S("Crimson Bark Stairs"), S("Crimson Oak Bark Slab"), S("Double Crimson Bark Slab") }, +} + +for b=1, #barks do + local bark = barks[b] + local sub = bark[1].."_hyphae_bark" + local id = "mcl_mushroom:"..bark[1].."_hyphae" + + mcl_stairs.register_stair(sub, id, + {handy=1,axey=1, bark_stairs=1, material_wood=1}, + {minetest.registered_nodes[id].tiles[3]}, + bark[2], + mcl_sounds.node_sound_wood_defaults(), 3, 2, + "woodlike") + mcl_stairs.register_slab(sub, id, + {handy=1,axey=1, bark_slab=1, material_wood=1}, + {minetest.registered_nodes[id].tiles[3]}, + bark[3], + mcl_sounds.node_sound_wood_defaults(), 3, 2, + bark[4]) +end + minetest.register_node("mcl_mushroom:crimson_nylium", { description = S("Crimson Nylium"), tiles = { @@ -905,28 +934,3 @@ minetest.register_decoration({ decoration = "mcl_mushroom:crimson_fungus", }) ---Hyphae Stairs and slabs - -local barks = { - { "warped", S("Warped Bark Stairs"), S("Warped Bark Slab"), S("Double Warped Bark Slab") }, - { "crimson", S("Crimson Bark Stairs"), S("Crimson Oak Bark Slab"), S("Double Crimson Bark Slab") }, -} - -for b=1, #barks do - local bark = barks[b] - local sub = bark[1].."_hyphae_bark" - local id = "mcl_mushroom:"..bark[1].."_hyphae" - - mcl_stairs.register_stair(sub, id, - {handy=1,axey=1, bark_stairs=1, material_wood=1}, - {minetest.registered_nodes[id].tiles[3]}, - bark[2], - mcl_sounds.node_sound_wood_defaults(), 3, 2, - "woodlike") - mcl_stairs.register_slab(sub, id, - {handy=1,axey=1, bark_slab=1, material_wood=1}, - {minetest.registered_nodes[id].tiles[3]}, - bark[3], - mcl_sounds.node_sound_wood_defaults(), 3, 2, - bark[4]) -end \ No newline at end of file From a8be87f88d7c7f6f3c6f70c18c3300b87a94a939 Mon Sep 17 00:00:00 2001 From: 3raven Date: Wed, 20 Apr 2022 22:57:27 +0000 Subject: [PATCH 18/21] Rangement --- mods/ITEMS/mcl_mushroom/init.lua | 199 ++++++++++++++++--------------- 1 file changed, 102 insertions(+), 97 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index acfbae62d..db74e1027 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -24,6 +24,7 @@ end -- WARNING: The most comments are in german. Please Translate with an translater if you don't speak good german +---Warped fungus minetest.register_node("mcl_mushroom:warped_fungus", { description = S("Warped Fungus Mushroom"), drawtype = "plantlike", @@ -264,7 +265,7 @@ minetest.register_abm({ --max_height = 200, })]] - +--- Crimson Fungus minetest.register_node("mcl_mushroom:crimson_fungus", { description = S("Crimson Fungus Mushroom"), drawtype = "plantlike", @@ -317,6 +318,96 @@ minetest.register_node("mcl_mushroom:crimson_roots", { stack_max = 64, }) +minetest.register_node("mcl_mushroom:crimson_nylium", { + description = S("Crimson Nylium"), + tiles = { + "crimson_nylium.png", + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png^crimson_nylium_side.png", + "mcl_nether_netherrack.png^crimson_nylium_side.png", + "mcl_nether_netherrack.png^crimson_nylium_side.png", + "mcl_nether_netherrack.png^crimson_nylium_side.png", + }, + groups = {pickaxey=1, building_block=1, material_stone=1}, + paramtype2 = "facedir", + stack_max = 64, + _mcl_hardness = 0.4, + _mcl_blast_resistance = 0.4, + is_ground_content = true, + drop = "mcl_nether:netherrack", + _mcl_silk_touch_drop = true, +}) + +minetest.register_node("mcl_mushroom:crimson_checknode", { + description = S("Crimson Checknode - only to check!"), + tiles = { + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png", + "mcl_nether_netherrack.png", + }, + groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1}, + paramtype2 = "facedir", + stack_max = 64, + _mcl_hardness = 0.4, + _mcl_blast_resistance = 0.4, + is_ground_content = true, + drop = "mcl_nether:netherrack" +}) + + +minetest.register_craft({ + output = "mcl_mushroom:crimson_nylium 2", + recipe = { + {"mcl_nether:nether_wart"}, + {"mcl_nether:netherrack"}, + } +}) + +minetest.register_abm({ + label = "mcl_mushroom:crimson_fungus", + nodenames = {"mcl_mushroom:crimson_fungus"}, + interval = 11, + chance = 128, + action = function(pos) + local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) + if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then + if pos.y < -28400 then + generate_crimson_tree(pos) + end + end + end +}) + +minetest.register_abm({ + label = "mcl_mushroom:crimson_checknode", + nodenames = {"mcl_mushroom:crimson_checknode"}, + interval = 0.1, + chance = 1, + action = function(pos) + local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}) + if nodepos.name == "air" then + minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:crimson_nylium" }) + local randomg = math.random(1, 400) + if randomg <= 10 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" }) + elseif randomg > 10 and randomg <= 25 then + local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z } + generate_crimson_tree(pos1) + elseif randomg > 25 and randomg <= 30 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" }) + elseif randomg > 30 and randomg <= 130 then + minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_roots" }) + end + else + minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" }) + end + end +}) + + ---Nether Woods minetest.register_node("mcl_mushroom:warped_hyphae", { @@ -525,6 +616,15 @@ minetest.register_node("mcl_mushroom:crimson_hyphae_wood", { _mcl_hardness = 2, }) +minetest.register_craft({ + output = "mcl_mushroom:crimson_hyphae_wood 4", + recipe = { + {"mcl_mushroom:crimson_hyphae"}, + } +}) + +mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab", "woodlike") + --Hyphae Stairs and slabs local barks = { @@ -551,102 +651,7 @@ for b=1, #barks do bark[4]) end -minetest.register_node("mcl_mushroom:crimson_nylium", { - description = S("Crimson Nylium"), - tiles = { - "crimson_nylium.png", - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - }, - groups = {pickaxey=1, building_block=1, material_stone=1}, - paramtype2 = "facedir", - stack_max = 64, - _mcl_hardness = 0.4, - _mcl_blast_resistance = 0.4, - is_ground_content = true, - drop = "mcl_nether:netherrack", - _mcl_silk_touch_drop = true, -}) - -minetest.register_node("mcl_mushroom:crimson_checknode", { - description = S("Crimson Checknode - only to check!"), - tiles = { - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png", - }, - groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1}, - paramtype2 = "facedir", - stack_max = 64, - _mcl_hardness = 0.4, - _mcl_blast_resistance = 0.4, - is_ground_content = true, - drop = "mcl_nether:netherrack" -}) - -minetest.register_craft({ - output = "mcl_mushroom:crimson_hyphae_wood 4", - recipe = { - {"mcl_mushroom:crimson_hyphae"}, - } -}) - -minetest.register_craft({ - output = "mcl_mushroom:crimson_nylium 2", - recipe = { - {"mcl_nether:nether_wart"}, - {"mcl_nether:netherrack"}, - } -}) - -mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab", "woodlike") - -minetest.register_abm({ - label = "mcl_mushroom:crimson_fungus", - nodenames = {"mcl_mushroom:crimson_fungus"}, - interval = 11, - chance = 128, - action = function(pos) - local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) - if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then - if pos.y < -28400 then - generate_crimson_tree(pos) - end - end - end -}) - -minetest.register_abm({ - label = "mcl_mushroom:crimson_checknode", - nodenames = {"mcl_mushroom:crimson_checknode"}, - interval = 0.1, - chance = 1, - action = function(pos) - local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}) - if nodepos.name == "air" then - minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:crimson_nylium" }) - local randomg = math.random(1, 400) - if randomg <= 10 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" }) - elseif randomg > 10 and randomg <= 25 then - local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z } - generate_crimson_tree(pos1) - elseif randomg > 25 and randomg <= 30 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" }) - elseif randomg > 30 and randomg <= 130 then - minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_roots" }) - end - else - minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" }) - end - end -}) +---Mapgen and fungus tree function generate_warped_tree(pos) local breakgrow = false From 2f0351fe6d64e4c8be962a5c5c275f604928caca Mon Sep 17 00:00:00 2001 From: 3raven Date: Sun, 24 Apr 2022 16:16:33 +0000 Subject: [PATCH 19/21] Correct name --- mods/ITEMS/mcl_mushroom/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_mushroom/init.lua b/mods/ITEMS/mcl_mushroom/init.lua index db74e1027..d6b6b97ba 100644 --- a/mods/ITEMS/mcl_mushroom/init.lua +++ b/mods/ITEMS/mcl_mushroom/init.lua @@ -435,7 +435,7 @@ minetest.register_node("mcl_mushroom:warped_hyphae", { --Stem bark, stripped stem and bark minetest.register_node("mcl_mushroom:warped_hyphae_bark", { - description = S("Warped Hyphae"), + description = S("Warped Hyphae Bark"), _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), tiles = {"warped_hyphae_side.png"}, paramtype2 = "facedir", @@ -543,7 +543,7 @@ minetest.register_node("mcl_mushroom:crimson_hyphae", { --Stem bark, stripped stem and bark minetest.register_node("mcl_mushroom:crimson_hyphae_bark", { - description = S("Crimson Hyphae"), + description = S("Crimson Hyphae Bark"), _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), tiles = {"crimson_hyphae_side.png"}, paramtype2 = "facedir", From 6ffa01cac6a7900ee4642479af060b2907f081f4 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sun, 24 Apr 2022 16:17:18 +0000 Subject: [PATCH 20/21] Update translation list - TO-DO: complete translations --- mods/ITEMS/mcl_mushroom/locale/template.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_mushroom/locale/template.txt b/mods/ITEMS/mcl_mushroom/locale/template.txt index 67d53d790..3df53c94c 100644 --- a/mods/ITEMS/mcl_mushroom/locale/template.txt +++ b/mods/ITEMS/mcl_mushroom/locale/template.txt @@ -7,6 +7,12 @@ Warped Roots= Warped Wart Block= Shroomlight= Warped Hyphae= +Warped Hyphae Bark= +Stripped Warped Hyphae= +Stripped Warped Hyphae Bark= +Warped Hyphae Wood= +Warped Bark Slab= +Double Warped Bark Slab= Warped Nylium= Warped Checknode - only to check!= Warped Hyphae Wood= @@ -15,9 +21,14 @@ Warped Slab= Crimson Fungus Mushroom= Crimson Roots= Crimson Hyphae= +Crimson Hyphae Bark= +Stripped Crimson Hyphae= +Stripped Crimson Hyphae Bark= +Crimson Oak Bark Slab= +Double Crimson Bark Slab= Crimson Hyphae Wood= Crimson Stair= Crimson Slab= Double Crimson Slab= Crimson Nylium= -Crimson Checknode - only to check!= +Crimson Checknode - only to check!= \ No newline at end of file From 010ffd695f09bb32bbbb21dd971d9e4143d571bd Mon Sep 17 00:00:00 2001 From: 3raven Date: Sun, 24 Apr 2022 16:49:20 +0000 Subject: [PATCH 21/21] Update translation template - TODO complete translation --- mods/ITEMS/mcl_mushroom/locale/template.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mods/ITEMS/mcl_mushroom/locale/template.txt b/mods/ITEMS/mcl_mushroom/locale/template.txt index 3df53c94c..85613b033 100644 --- a/mods/ITEMS/mcl_mushroom/locale/template.txt +++ b/mods/ITEMS/mcl_mushroom/locale/template.txt @@ -7,9 +7,13 @@ Warped Roots= Warped Wart Block= Shroomlight= Warped Hyphae= +The stem of a warped hyphae= Warped Hyphae Bark= +This is a decorative block surrounded by the bark of an hyphae.= Stripped Warped Hyphae= +The stripped stem of a warped hyphae= Stripped Warped Hyphae Bark= +The stripped wood of a warped hyphae= Warped Hyphae Wood= Warped Bark Slab= Double Warped Bark Slab= @@ -21,9 +25,12 @@ Warped Slab= Crimson Fungus Mushroom= Crimson Roots= Crimson Hyphae= +The stem of a crimson hyphae= Crimson Hyphae Bark= Stripped Crimson Hyphae= +The stripped stem of a crimson hyphae= Stripped Crimson Hyphae Bark= +The stripped wood of a warped hyphae= Crimson Oak Bark Slab= Double Crimson Bark Slab= Crimson Hyphae Wood=