diff --git a/depends.txt b/depends.txt index 0a3cc0b..0ac23d4 100644 --- a/depends.txt +++ b/depends.txt @@ -1,3 +1,3 @@ default -farming? -moreblocks? \ No newline at end of file +farming +moreblocks? diff --git a/init.lua b/init.lua index 6d26dc0..9fa897b 100644 --- a/init.lua +++ b/init.lua @@ -49,7 +49,7 @@ minetest.register_craft({ output = 'darkage:adobe 4', recipe = { {'default:sand','default:sand'}, - {'default:clay_lump','darkage:straw'}, + {'default:clay_lump','farming:straw'}, } }) @@ -143,40 +143,12 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = 'darkage:straw 2', - recipe = { - {'default:dry_shrub','default:dry_shrub'}, - {'default:dry_shrub','default:dry_shrub'}, - } -}) - -minetest.register_craft({ - output = 'darkage:straw 2', - recipe = { - {'darkage:dry_leaves','darkage:dry_leaves'}, - {'darkage:dry_leaves','darkage:dry_leaves'}, - } -}) - -if minetest.get_modpath("farming") then ---only if farming installed -minetest.register_craft({ - output = 'darkage:straw 4', - recipe = { - {'farming:wheat_harvested','farming:wheat_harvested'}, - {'farming:wheat_harvested','farming:wheat_harvested'}, - } -}) -else ---nothing else -end minetest.register_craft({ output = 'darkage:straw_bale', recipe = { - {'darkage:straw','darkage:straw'}, - {'darkage:straw','darkage:straw'}, + {'farming:straw','farming:straw'}, + {'farming:straw','farming:straw'}, } }) diff --git a/nodes.lua b/nodes.lua index 725713a..c0fc88e 100644 --- a/nodes.lua +++ b/nodes.lua @@ -198,13 +198,8 @@ minetest.register_node("darkage:slate_tile", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:straw", { - description = "Straw", - tiles = {"darkage_straw.png"}, - is_ground_content = true, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) +-- Removed straw, because its in minetst game. Registering alias for compatibility reasons +minetest.register_alias("darkage:straw", "farming:straw") minetest.register_node("darkage:stone_brick", { description = "Stone Brick", @@ -218,7 +213,7 @@ minetest.register_node("darkage:straw_bale", { description = "Straw Bale", tiles = {"darkage_straw_bale.png"}, is_ground_content = true, - drop = 'darkage:straw 4', + drop = 'farming:straw 4', groups = {snappy=2, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/stairsplus.lua b/stairsplus.lua index 7eb268a..7d2b1ff 100644 --- a/stairsplus.lua +++ b/stairsplus.lua @@ -39,9 +39,9 @@ sounds = default.node_sound_stone_defaults(), }) --straw -stairsplus:register_all("darkage", "straw", "darkage:straw", { +stairsplus:register_all("darkage", "straw", "farming:straw", { description = "Straw", -tiles = {"darkage_straw.png"}, +tiles = {"farming_straw.png"}, groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/textures/darkage_straw.png b/textures/darkage_straw.png deleted file mode 100644 index 9817316..0000000 Binary files a/textures/darkage_straw.png and /dev/null differ diff --git a/textures32/darkage_reinforced_chalk.png b/textures32/darkage_reinforced_chalk.png deleted file mode 100644 index dcf3707..0000000 Binary files a/textures32/darkage_reinforced_chalk.png and /dev/null differ diff --git a/textures32/darkage_reinforced_wood.png b/textures32/darkage_reinforced_wood.png deleted file mode 100644 index 8787129..0000000 Binary files a/textures32/darkage_reinforced_wood.png and /dev/null differ diff --git a/textures32/darkage_reinforced_wood_left.png b/textures32/darkage_reinforced_wood_left.png deleted file mode 100644 index 6a6243a..0000000 Binary files a/textures32/darkage_reinforced_wood_left.png and /dev/null differ diff --git a/textures32/darkage_reinforced_wood_right.png b/textures32/darkage_reinforced_wood_right.png deleted file mode 100644 index f4f28d0..0000000 Binary files a/textures32/darkage_reinforced_wood_right.png and /dev/null differ diff --git a/textures32/darkage_straw.png b/textures32/darkage_straw.png deleted file mode 100644 index aa539c7..0000000 Binary files a/textures32/darkage_straw.png and /dev/null differ