diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 7841b48d..de1ef072 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -1,10 +1,10 @@ local S = homedecor_i18n.gettext if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then - minetest.register_alias("building_blocks:slab_marble", "stairs:slab_Marble") - minetest.register_alias("building_blocks:stair_marble", "stairs:stair_Marble") minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar") minetest.register_alias("building_blocks:stair_tar", "stairs:stair_Tar") + minetest.register_alias("building_blocks:slab_marble", "stairs:slab_Marble") + minetest.register_alias("building_blocks:stair_marble", "stairs:stair_Marble") end if minetest.get_modpath("moreblocks") then @@ -20,15 +20,15 @@ if minetest.get_modpath("moreblocks") then minetest.register_alias("moreblocks:tar", "building_blocks:Tar") end -minetest.register_alias("tar", "building_blocks:Tar") -minetest.register_alias("fakegrass", "building_blocks:fakegrass") -minetest.register_alias("tar_knife", "building_blocks:knife") minetest.register_alias("adobe", "building_blocks:Adobe") -minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") +minetest.register_alias("fakegrass", "building_blocks:fakegrass") minetest.register_alias("hardwood", "building_blocks:hardwood") +minetest.register_alias("tar_knife", "building_blocks:knife") +minetest.register_alias("marble", "building_blocks:Marble") +minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") minetest.register_alias("sticks", "building_blocks:sticks") minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") -minetest.register_alias("marble", "building_blocks:Marble") +minetest.register_alias("tar", "building_blocks:Tar") if not minetest.get_modpath("technic") then minetest.register_node( ":technic:granite", { diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 0473948f..176172bb 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -15,7 +15,7 @@ local function building_blocks_stairs(nodename, def) then def.groups.groupname = nil end - end + end if minetest.get_modpath("moreblocks") then stairsplus:register_all( mod, @@ -47,22 +47,14 @@ building_blocks_stairs("building_blocks:Adobe", { groups = {crumbly=3}, sounds = default.node_sound_stone_defaults(), }) -building_blocks_stairs("building_blocks:Roofing", { - tiles = {"building_blocks_Roofing.png"}, +building_blocks_stairs("building_blocks:fakegrass", { + tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, + description = S("Fake Grass"), is_ground_content = true, - description = S("Roof block"), - groups = {snappy=3}, -}) -minetest.register_node("building_blocks:smoothglass", { - drawtype = "glasslike", - description = S("Streak Free Glass"), - tiles = {"building_blocks_sglass.png"}, - inventory_image = minetest.inventorycube("building_blocks_sglass.png"), - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), + groups = {crumbly=3}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.4}, + }), }) building_blocks_stairs("building_blocks:grate", { drawtype = "glasslike", @@ -74,37 +66,41 @@ building_blocks_stairs("building_blocks:grate", { is_ground_content = true, groups = {cracky=1}, }) -minetest.register_node("building_blocks:Fireplace", { - description = S("Fireplace"), - tiles = { - "building_blocks_cast_iron.png", - "building_blocks_cast_iron.png", - "building_blocks_cast_iron.png", - "building_blocks_cast_iron_fireplace.png" - }, - paramtype = "light", - paramtype2 = "facedir", - light_source = default.LIGHT_MAX, - sunlight_propagates = true, +building_blocks_stairs("building_blocks:hardwood", { + tiles = {"building_blocks_hardwood.png"}, is_ground_content = true, - groups = {cracky=2}, + description = S("Hardwood"), + groups = {choppy=1,flammable=1}, + sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("building_blocks:woodglass", { - drawtype = "glasslike", - description = S("Wood Framed Glass"), - tiles = {"building_blocks_wglass.png"}, - inventory_image = minetest.inventorycube("building_blocks_wglass.png"), - paramtype = "light", - sunlight_propagates = true, +building_blocks_stairs("building_blocks:Roofing", { + tiles = {"building_blocks_Roofing.png"}, is_ground_content = true, - groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), + description = S("Roof block"), + groups = {snappy=3}, }) -minetest.register_node("building_blocks:terrycloth_towel", { +building_blocks_stairs("building_blocks:Tar", { + description = S("Tar"), + tiles = {"building_blocks_tar.png"}, + is_ground_content = true, + groups = {crumbly=1, tar_block = 1}, + sounds = default.node_sound_stone_defaults(), +}) +building_blocks_stairs("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_node("building_blocks:brobble_spread", { drawtype = "raillike", - description = S("Terrycloth towel"), - tiles = {"building_blocks_towel.png"}, - inventory_image = "building_blocks_towel_inv.png", + -- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble". + -- Translate however you see fit. + description = S("Brobble Spread"), + tiles = {"building_blocks_brobble.png"}, + inventory_image = "building_blocks_brobble_spread_inv.png", paramtype = "light", walkable = false, selection_box = { @@ -116,23 +112,6 @@ minetest.register_node("building_blocks:terrycloth_towel", { is_ground_content = true, groups = {crumbly=3}, }) -minetest.register_node("building_blocks:Tarmac_spread", { - drawtype = "raillike", - description = S("Tarmac Spread"), - tiles = {"building_blocks_tar.png"}, - inventory_image = "building_blocks_tar_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 = {cracky=3}, - sounds = default.node_sound_dirt_defaults(), -}) minetest.register_node("building_blocks:BWtile", { drawtype = "nodebox", description = S("Chess board tiling"), @@ -155,23 +134,20 @@ minetest.register_node("building_blocks:BWtile", { is_ground_content = true, groups = {crumbly=3}, }) -minetest.register_node("building_blocks:brobble_spread", { - drawtype = "raillike", - -- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble". - -- Translate however you see fit. - description = S("Brobble Spread"), - tiles = {"building_blocks_brobble.png"}, - inventory_image = "building_blocks_brobble_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}, +minetest.register_node("building_blocks:Fireplace", { + description = S("Fireplace"), + tiles = { + "building_blocks_cast_iron.png", + "building_blocks_cast_iron.png", + "building_blocks_cast_iron.png", + "building_blocks_cast_iron_fireplace.png" }, + paramtype = "light", + paramtype2 = "facedir", + light_source = default.LIGHT_MAX, sunlight_propagates = true, is_ground_content = true, - groups = {crumbly=3}, + groups = {cracky=2}, }) minetest.register_node("building_blocks:gravel_spread", { drawtype = "raillike", @@ -193,34 +169,58 @@ minetest.register_node("building_blocks:gravel_spread", { dug = {name="default_gravel_footstep", gain=1.0}, }), }) -building_blocks_stairs("building_blocks:hardwood", { - tiles = {"building_blocks_hardwood.png"}, +minetest.register_node("building_blocks:smoothglass", { + drawtype = "glasslike", + description = S("Streak Free Glass"), + tiles = {"building_blocks_sglass.png"}, + inventory_image = minetest.inventorycube("building_blocks_sglass.png"), + paramtype = "light", + sunlight_propagates = true, is_ground_content = true, - description = S("Hardwood"), - groups = {choppy=1,flammable=1}, - sounds = default.node_sound_wood_defaults(), + groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), }) - -building_blocks_stairs("building_blocks:fakegrass", { - tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, - description = S("Fake Grass"), +minetest.register_node("building_blocks:Tarmac_spread", { + drawtype = "raillike", + description = S("Tarmac Spread"), + tiles = {"building_blocks_tar.png"}, + inventory_image = "building_blocks_tar_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 = {cracky=3}, + sounds = default.node_sound_dirt_defaults(), +}) +minetest.register_node("building_blocks:terrycloth_towel", { + drawtype = "raillike", + description = S("Terrycloth towel"), + tiles = {"building_blocks_towel.png"}, + inventory_image = "building_blocks_towel_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=3}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.4}, - }), }) -building_blocks_stairs("building_blocks:Tar", { - description = S("Tar"), - tiles = {"building_blocks_tar.png"}, +minetest.register_node("building_blocks:woodglass", { + drawtype = "glasslike", + description = S("Wood Framed Glass"), + tiles = {"building_blocks_wglass.png"}, + inventory_image = minetest.inventorycube("building_blocks_wglass.png"), + paramtype = "light", + sunlight_propagates = true, is_ground_content = true, - groups = {crumbly=1, tar_block = 1}, - sounds = default.node_sound_stone_defaults(), -}) -building_blocks_stairs("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(), + groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), }) \ No newline at end of file diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index 36911642..e8f810f7 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -1,85 +1,5 @@ local S = homedecor_i18n.gettext -minetest.register_craft({ - output = 'building_blocks:terrycloth_towel 2', - recipe = { - {"farming:string", "farming:string", "farming:string"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Tarmac_spread 4', - recipe = { - {"group:tar_block", "group:tar_block"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:brobble_spread 4', - recipe = { - {"default:brick", "default:cobble", "default:brick"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Fireplace 1', - recipe = { - {"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Adobe 3', - recipe = { - {"default:sand"}, - {"default:clay"}, - {"group:stick"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:Roofing 10', - recipe = { - {"building_blocks:Adobe", "building_blocks:Adobe"}, - {"building_blocks:Adobe", "building_blocks:Adobe"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:BWtile 10', - recipe = { - {"group:marble", "group:tar_block"}, - {"group:tar_block", "group:marble"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:grate 1', - recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"default:glass", "default:glass"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:woodglass 1', - recipe = { - {"default:wood"}, - {"default:glass"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:hardwood 2', - recipe = { - {"default:wood", "default:junglewood"}, - {"default:junglewood", "default:wood"}, - } -}) -minetest.register_craft({ - output = 'building_blocks:hardwood 2', - recipe = { - {"default:junglewood", "default:wood"}, - {"default:wood", "default:junglewood"}, - } -}) if minetest.get_modpath("moreblocks") then minetest.register_craft({ output = 'building_blocks:sticks 2', @@ -98,10 +18,26 @@ else } }) end + minetest.register_craft({ - output = 'default:stick 4', + output = 'building_blocks:Adobe 3', recipe = { - {'building_blocks:sticks'}, + {"default:sand"}, + {"default:clay"}, + {"group:stick"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:brobble_spread 4', + recipe = { + {"default:brick", "default:cobble", "default:brick"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:BWtile 10', + recipe = { + {"group:marble", "group:tar_block"}, + {"group:tar_block", "group:marble"}, } }) minetest.register_craft({ @@ -111,6 +47,67 @@ minetest.register_craft({ {"default:dirt"}, } }) +minetest.register_craft({ + output = 'building_blocks:Fireplace 1', + recipe = { + {"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:grate 1', + recipe = { + {"default:steel_ingot", "default:steel_ingot"}, + {"default:glass", "default:glass"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:gravel_spread 4', + recipe = { + {"default:gravel", "default:gravel", "default:gravel"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:hardwood 2', + recipe = { + {"default:wood", "default:junglewood"}, + {"default:junglewood", "default:wood"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:hardwood 2', + recipe = { + {"default:junglewood", "default:wood"}, + {"default:wood", "default:junglewood"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:knife 1', + recipe = { + {"group:tar_block"}, + {"group:stick"}, + } +}) +minetest.register_craft({ + output = "building_blocks:Marble 9", + recipe = { + {"default:clay", "group:tar_block", "default:clay"}, + {"group:tar_block","default:clay", "group:tar_block"}, + {"default:clay", "group:tar_block","default:clay"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:Roofing 10', + recipe = { + {"building_blocks:Adobe", "building_blocks:Adobe"}, + {"building_blocks:Adobe", "building_blocks:Adobe"}, + } +}) +minetest.register_craft({ + output = 'default:stick 4', + recipe = { + {'building_blocks:sticks'}, + } +}) minetest.register_craft({ output = 'building_blocks:tar_base 4', recipe = { @@ -125,23 +122,42 @@ minetest.register_craft({ {"default:coal_lump", "default:gravel"} } }) +minetest.register_craft({ + output = 'building_blocks:Tarmac_spread 4', + recipe = { + {"group:tar_block", "group:tar_block"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:terrycloth_towel 2', + recipe = { + {"farming:string", "farming:string", "farming:string"}, + } +}) +minetest.register_craft({ + output = 'building_blocks:woodglass 1', + recipe = { + {"default:wood"}, + {"default:glass"}, + } +}) + minetest.register_craft({ type = "cooking", output = "building_blocks:smoothglass", recipe = "default:glass" }) +minetest.register_craft({ + type = "cooking", + output = "building_blocks:Tar", + recipe = "building_blocks:tar_base", +}) + minetest.register_craft({ type = "fuel", recipe = "building_blocks:hardwood", burntime = 28, }) -minetest.register_craft({ - output = 'building_blocks:knife 1', - recipe = { - {"group:tar_block"}, - {"group:stick"}, - } -}) minetest.register_craft({ type = "fuel", recipe = "building_blocks:sticks", @@ -151,20 +167,4 @@ minetest.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, -}) - -minetest.register_craft({ - type = "cooking", - output = "building_blocks:Tar", - recipe = "building_blocks:tar_base", -}) -minetest.register_craft({ - output = "building_blocks:Marble 9", - recipe = { - {"default:clay", "group:tar_block", "default:clay"}, - {"group:tar_block","default:clay", "group:tar_block"}, - {"default:clay", "group:tar_block","default:clay"}, - } -}) - - +}) \ No newline at end of file