From 28a7d1cc43f028e7277d6d416f68322221c8aef7 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 7 Nov 2018 17:53:37 -0500 Subject: use basic_materials for concrete --- concretestairs/depends.txt | 3 +- concretestairs/init.lua | 2 +- streetsconcrete/depends.txt | 3 +- streetsconcrete/init.lua | 122 +++----------------------------------------- 4 files changed, 13 insertions(+), 117 deletions(-) diff --git a/concretestairs/depends.txt b/concretestairs/depends.txt index ad569e2..d373a7d 100644 --- a/concretestairs/depends.txt +++ b/concretestairs/depends.txt @@ -1,4 +1,5 @@ default streetsmod +basic_materials stairs? -moreblocks? \ No newline at end of file +moreblocks? diff --git a/concretestairs/init.lua b/concretestairs/init.lua index f6400c5..73a7985 100644 --- a/concretestairs/init.lua +++ b/concretestairs/init.lua @@ -3,7 +3,7 @@ ]] if rawget(_G, "register_stair_slab_panel_micro") and type(register_stair_slab_panel_micro) == "function" and streets.extendedBy.prefab == false then - register_stair_slab_panel_micro("streets", "concrete", "streets:concrete", {cracky=2}, {"streets_concrete.png"}, "Concrete", "concrete", nil) + register_stair_slab_panel_micro("streets", "concrete", "streets:concrete", {cracky=2}, {"basic_materials_concrete_block.png"}, "Concrete", "concrete", nil) table.insert(circular_saw.known_stairs,"streets:concrete") minetest.register_alias("stairs:stair_concrete","streets:stair_concrete") else diff --git a/streetsconcrete/depends.txt b/streetsconcrete/depends.txt index 48ef5e1..cc05de9 100644 --- a/streetsconcrete/depends.txt +++ b/streetsconcrete/depends.txt @@ -1,2 +1,3 @@ default -streetsmod \ No newline at end of file +streetsmod +basic_materials diff --git a/streetsconcrete/init.lua b/streetsconcrete/init.lua index cb29ee9..494157c 100644 --- a/streetsconcrete/init.lua +++ b/streetsconcrete/init.lua @@ -1,12 +1,11 @@ --[[ StreetsMod: Concrete, Concrete wall (flat), Concrete wall (full) ]] -if streets.extendedBy.technic == true then - minetest.register_alias("streets:concrete","technic:concrete") + minetest.register_alias("streets:concrete","basic_materials:concrete_block") -- Use technic's concrete block for the seperating wall minetest.register_node(":streets:concrete_wall",{ description = streets.S("Concrete wall"), - tiles = {"technic_concrete_block.png"}, + tiles = {"basic_materials_concrete_block.png"}, groups = {cracky=2}, drawtype = "nodebox", paramtype = "light", @@ -22,14 +21,14 @@ if streets.extendedBy.technic == true then minetest.register_craft({ output = "streets:concrete_wall 3", recipe = { - {"","technic:concrete",""}, - {"","technic:concrete",""}, - {"technic:concrete","technic:concrete","technic:concrete"} + {"","basic_materials:concrete_block",""}, + {"","basic_materials:concrete_block",""}, + {"basic_materials:concrete_block","basic_materials:concrete_block","basic_materials:concrete_block"} } }) minetest.register_node(":streets:concrete_wall_flat",{ description = streets.S("Concrete wall"), - tiles = {"technic_concrete_block.png"}, + tiles = {"basic_materials_concrete_block.png"}, groups = {cracky=2}, drawtype = "nodebox", paramtype = "light", @@ -44,113 +43,8 @@ if streets.extendedBy.technic == true then minetest.register_craft({ output = "streets:concrete_wall_flat 3", recipe = { - {"","technic:concrete",""}, - {"","technic:concrete",""}, + {"","basic_materials:concrete_block",""}, + {"","basic_materials:concrete_block",""}, {"","",""} } }) -elseif streets.extendedBy.prefab then - minetest.register_alias("streets:concrete","prefab:concrete") - minetest.register_node(":streets:concrete_wall",{ - description = streets.S("Concrete wall"), - tiles = {"prefab_concrete.png"}, - groups = {cracky=2}, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.4, -0.5, -0.5, 0.4, -0.4, 0.5}, - {-0.1, -0.4, -0.5, 0.1, 0.5, 0.5} - } - } - }) - minetest.register_craft({ - output = "streets:concrete_wall 3", - recipe = { - {"","streets:concrete",""}, - {"","streets:concrete",""}, - {"streets:concrete","streets:concrete","streets:concrete"} - } - }) - minetest.register_node(":streets:concrete_wall_flat",{ - description = streets.S("Concrete wall"), - tiles = {"prefab_concrete.png"}, - groups = {cracky=2}, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.1, -0.5, -0.5, 0.1, 0.5, 0.5} - } - } - }) - minetest.register_craft({ - output = "streets:concrete_wall_flat 3", - recipe = { - {"","streets:concrete",""}, - {"","streets:concrete",""}, - {"","",""} - } - }) -else - -- Register concrete block with streets' texture and then the seperating wall - minetest.register_node(":streets:concrete",{ - description = streets.S("Concrete"), - tiles = {"streets_concrete.png"}, - groups = {cracky=2} - }) - minetest.register_node(":streets:concrete_wall",{ - description = streets.S("Concrete wall"), - tiles = {"streets_concrete.png"}, - groups = {cracky=2}, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.4, -0.5, -0.5, 0.4, -0.4, 0.5}, - {-0.1, -0.4, -0.5, 0.1, 0.5, 0.5} - } - } - }) - minetest.register_craft({ - output = "streets:concrete_wall 3", - recipe = { - {"","streets:concrete",""}, - {"","streets:concrete",""}, - {"streets:concrete","streets:concrete","streets:concrete"} - } - }) - minetest.register_node(":streets:concrete_wall_flat",{ - description = streets.S("Concrete wall"), - tiles = {"streets_concrete.png"}, - groups = {cracky=2}, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.1, -0.5, -0.5, 0.1, 0.5, 0.5} - } - } - }) - minetest.register_craft({ - output = "streets:concrete_wall_flat 3", - recipe = { - {"","streets:concrete",""}, - {"","streets:concrete",""}, - {"","",""} - } - }) - minetest.register_craft({ - type = "shapeless", - output = "streets:concrete", - recipe = {"default:stone"} - }) -end -- cgit v1.2.3