diff --git a/building_blocks/init.lua b/building_blocks/init.lua index 69e560a..253e2d4 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,5 +1,3 @@ -minetest.get_modpath("darkage") -minetest.get_modpath("moreblocks") local S = homedecor_i18n.gettext @@ -65,8 +63,8 @@ minetest.register_craft({ minetest.register_craft({ output = 'building_blocks:BWtile 10', recipe = { - {"darkage:marble", "group:tar_block"}, - {"group:tar_block", "darkage:marble"}, + {"group:marble", "group:tar_block"}, + {"group:tar_block", "group:marble"}, } }) minetest.register_craft({ @@ -165,15 +163,15 @@ minetest.register_node("building_blocks:smoothglass", { sounds = default.node_sound_glass_defaults(), }) - register_stair_slab_panel_micro("smoothglass", "block", "building_blocks:smoothglass", - {cracky=3}, - {"building_blocks_sglass.png"}, - "Streak Free Glass", - "block", - 0 - ) +register_stair_slab_panel_micro("smoothglass", "block", "building_blocks:smoothglass", +{cracky=3}, +{"building_blocks_sglass.png"}, +"Streak Free Glass", +"block", +0 +) - table.insert(circular_saw.known_stairs, "building_blocks:smoothglass") +table.insert(circular_saw.known_stairs, "building_blocks:smoothglass") minetest.register_node("building_blocks:grate", { drawtype = "glasslike", @@ -319,10 +317,10 @@ if minetest.get_modpath("moreblocks") then stairsplus:register_all( "building_blocks", "marble", - "building_blocks:Marble", + "darkage:marble", { description = S("Marble"), - tiles = {"building_blocks_marble.png"}, + tiles = {"darkage_marble.png"}, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), } @@ -481,10 +479,9 @@ else bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair) bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab) end - - bb_stairs.register_stair_and_slab("marble","building_blocks:Marble", + bb_stairs.register_stair_and_slab("marble","darkage:Marble", {cracky=3}, - {"building_blocks_marble.png"}, + {"darkage_marble.png"}, S("Marble stair"), S("Marble slab") ) @@ -571,6 +568,7 @@ minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") minetest.register_alias("hardwood", "building_blocks:hardwood") minetest.register_alias("sticks", "building_blocks:sticks") minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") +minetest.register_alias("marble", "darkage:Marble") minetest.register_node("building_blocks:Tar", { description = S("Tar"), @@ -579,13 +577,15 @@ minetest.register_node("building_blocks:Tar", { groups = {crumbly=1, tar_block = 1}, sounds = default.node_sound_stone_defaults(), }) - -minetest.register_alias("building_blocks:Marble", "darkage:marble") -minetest.register_alias("marble", "darkage:marble") -minetest.register_alias("building_blocks:slab_marble", "stairs:slab_marble") -minetest.register_alias("stairs:slab_Marble", "stairs:slab_marble") -minetest.register_alias("stairs:stair_Marble", "stairs:stair_marble") - +--[[ +minetest.register_node("building_blocks:Marble", { + description = S("Marble"), + tiles = {"building_blocks_marble.png"}, + is_ground_content = true, + groups = {cracky=3, marble = 1}, + sounds = default.node_sound_stone_defaults(), +}) +]] minetest.register_craft({ type = "fuel", recipe = "building_blocks:sticks", @@ -614,7 +614,7 @@ minetest.register_tool("building_blocks:knife", { } }, }) - +--[[ minetest.register_craft({ output = "building_blocks:Marble 9", recipe = { @@ -623,7 +623,7 @@ minetest.register_craft({ {"default:clay", "group:tar_block","default:clay"}, } }) - +]] if not minetest.get_modpath("technic") then minetest.register_node( ":technic:granite", { description = S("Granite"), @@ -636,9 +636,9 @@ if not minetest.get_modpath("technic") then minetest.register_craft({ output = "technic:granite 9", recipe = { - { "group:tar_block", "darkage:marble", "group:tar_block" }, - { "darkage:marble", "group:tar_block", "darkage:marble" }, - { "group:tar_block", "darkage:marble", "group:tar_block" } + { "group:tar_block", "group:marble", "group:tar_block" }, + { "group:marble", "group:tar_block", "group:marble" }, + { "group:tar_block", "group:marble", "group:tar_block" } }, })