diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua index 104846627e..25f0dd9cf4 100644 --- a/mods/ENTITIES/mcl_minecarts/init.lua +++ b/mods/ENTITIES/mcl_minecarts/init.lua @@ -639,7 +639,10 @@ register_minecart( "mcl_minecarts:furnace_minecart", "mcl_minecarts:furnace_minecart", S("Minecart with Furnace"), - nil, nil, + S("A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel."), + S("Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.") .. "\n" .. + S("To obtain the minecart and furnace, punch them while holding down the sneak key."), + "mcl_minecarts_minecart_block.b3d", { "default_furnace_top.png", @@ -728,7 +731,9 @@ register_minecart( "mcl_minecarts:tnt_minecart", "mcl_minecarts:tnt_minecart", S("Minecart with TNT"), - nil, nil, + S("A minecart with TNT is an explosive vehicle that travels on rail."), + S("Place it on rails. Punch it to move it. The TNT is ignited with a slint and steel or when the minecart is on an powered activator rail.") .. "\n" .. + S("To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited."), "mcl_minecarts_minecart_block.b3d", { "default_tnt_top.png", @@ -759,7 +764,7 @@ register_minecart( end activate_tnt_minecart(self) end - end, activate_tnt_minecart, false) + end, activate_tnt_minecart) minetest.register_craft({ @@ -770,8 +775,25 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "mcl_minecarts:tnt_minecart", + recipe = { + {"mcl_tnt:tnt"}, + {"mcl_minecarts:minecart"}, + }, +}) + -- TODO: Re-enable crafting of special minecarts when they have been implemented if false then + +minetest.register_craft({ + output = "mcl_minecarts:furnace_minecart", + recipe = { + {"mcl_furnaces:furnace"}, + {"mcl_minecarts:minecart"}, + }, +}) + minetest.register_craft({ output = "mcl_minecarts:hopper_minecart", recipe = { @@ -788,19 +810,4 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "mcl_minecarts:tnt_minecart", - recipe = { - {"mcl_tnt:tnt"}, - {"mcl_minecarts:minecart"}, - }, -}) - -minetest.register_craft({ - output = "mcl_minecarts:furnace_minecart", - recipe = { - {"mcl_furnaces:furnace"}, - {"mcl_minecarts:minecart"}, - }, -}) end diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua index bc94e54be2..4c0bcf8c54 100644 --- a/mods/ENTITIES/mcl_minecarts/rails.lua +++ b/mods/ENTITIES/mcl_minecarts/rails.lua @@ -132,10 +132,7 @@ register_rail("mcl_minecarts:activator_rail", }, }, - }, - -- Hidden from creative because no cart is using this rail so far. - -- TODO: Remove this when the activator rail has become useful. - false + } ) -- Activator rail (on) @@ -222,9 +219,6 @@ minetest.register_craft({ } }) --- Activator rail crafting is disabled until it becomes useful. --- TODO: Enable crafting as needed. -if false then minetest.register_craft({ output = "mcl_minecarts:activator_rail 6", recipe = { @@ -233,7 +227,6 @@ minetest.register_craft({ {"mcl_core:iron_ingot", "mcl_core:stick", "mcl_core:iron_ingot"}, } }) -end minetest.register_craft({ output = "mcl_minecarts:detector_rail 6", diff --git a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua index b0c255bacf..615abdc8b1 100644 --- a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua +++ b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua @@ -94,7 +94,7 @@ function tsm_railcorridors.get_treasures(pr) items = { { itemstring = "mcl_minecarts:rail", weight = 20, amount_min = 4, amount_max = 8 }, { itemstring = "mcl_torches:torch", weight = 15, amount_min = 1, amount_max = 16 }, - { itemstring = "mcl_minecarts:rail", weight = 5, amount_min = 1, amount_max = 4 }, -- TODO: Activator Rail + { itemstring = "mcl_minecarts:activator_rail", weight = 5, amount_min = 1, amount_max = 4 }, { itemstring = "mcl_minecarts:detector_rail", weight = 5, amount_min = 1, amount_max = 4 }, { itemstring = "mcl_minecarts:golden_rail", weight = 5, amount_min = 1, amount_max = 4 }, } diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua index 03d33849d7..062b5e489e 100644 --- a/mods/MISC/mcl_wip/init.lua +++ b/mods/MISC/mcl_wip/init.lua @@ -9,8 +9,6 @@ local wip_items = { "mcl_minecarts:command_block_minecart", "mcl_minecarts:chest_minecart", "mcl_minecarts:furnace_minecart", - "mcl_minecarts:tnt_minecart", - "mcl_minecarts:activator_rail", "mobs_mc:enderdragon", "mobs_mc:wither", "mobs_mc:parrot",