From bf79c7d4301d0b396aa83210538da6c42849b766 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Oct 2018 13:03:25 -0400 Subject: [PATCH] if both gloopblocks and moreblocks present, don't register "gravel spread" alias it to gloopblocks:slab_gravel_1 --- building_blocks/alias.lua | 4 +++ building_blocks/depends.txt | 1 + building_blocks/node_stairs.lua | 44 ++++++++++++++++++--------------- building_blocks/recipes.lua | 18 ++++++++------ 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 3ce0cd43..8d6520b0 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -19,6 +19,10 @@ if minetest.get_modpath("moreblocks") then minetest.unregister_item("moreblocks:tar") minetest.register_alias("moreblocks:tar", "building_blocks:Tar") stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar") + + if minetest.get_modpath("gloopblocks") then + minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1") + end end minetest.register_alias("adobe", "building_blocks:Adobe") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index f5cd549f..641d412a 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,4 +1,5 @@ default homedecor_i18n moreblocks? +gloopblocks? stairs? diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 9781293c..b0fecb4c 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -131,26 +131,30 @@ minetest.register_node("building_blocks:brobble_spread", { is_ground_content = true, groups = {crumbly=3}, }) -minetest.register_node("building_blocks:gravel_spread", { - drawtype = "raillike", - description = S("Gravel Spread"), - tiles = {"default_gravel.png"}, - inventory_image = "building_blocks_gravel_spread_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=2}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_gravel_footstep", gain=0.5}, - dug = {name="default_gravel_footstep", gain=1.0}, - }), -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_node("building_blocks:gravel_spread", { + drawtype = "raillike", + description = S("Gravel Spread"), + tiles = {"default_gravel.png"}, + inventory_image = "building_blocks_gravel_spread_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=2}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_gravel_footstep", gain=0.5}, + dug = {name="default_gravel_footstep", gain=1.0}, + }), + }) +end + minetest.register_node("building_blocks:Tarmac_spread", { drawtype = "raillike", description = S("Tarmac Spread"), diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index e8f810f7..42ac0a8b 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -60,12 +60,16 @@ minetest.register_craft({ {"default:glass", "default:glass"}, } }) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_craft({ + output = 'building_blocks:gravel_spread 4', + recipe = { + {"default:gravel", "default:gravel", "default:gravel"}, + } + }) +end + minetest.register_craft({ output = 'building_blocks:hardwood 2', recipe = { @@ -167,4 +171,4 @@ minetest.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, -}) \ No newline at end of file +})