diff --git a/mods/3d_armor/3d_armor/armor.conf b/mods/3d_armor/3d_armor/armor.conf index bbbef9f0..c496564d 100644 --- a/mods/3d_armor/3d_armor/armor.conf +++ b/mods/3d_armor/3d_armor/armor.conf @@ -1,6 +1,6 @@ -- Armor Configuration ARMOR_MATERIALS = { - leather = "group:wood", + leather = "mobs:leather", iron = "default:steel_ingot", chain = nil, gold = "default:gold_ingot", diff --git a/mods/3d_armor/3d_armor/init.lua b/mods/3d_armor/3d_armor/init.lua index 0ac7ea68..fde2fef7 100644 --- a/mods/3d_armor/3d_armor/init.lua +++ b/mods/3d_armor/3d_armor/init.lua @@ -150,8 +150,7 @@ minetest.register_tool("3d_armor:boots_chain", { -- Register Craft Recipies local craft_ingreds = { - -- FIXME: Replace with leather - leather = { "default:wood" }, + leather = { "mobs:leather" }, steel = { "default:steel_ingot", "default:iron_nugget" }, gold = { "default:gold_ingot", "default:gold_nugget" }, diamond = { "default:diamond" }, diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 37781d21..3ae613c6 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -634,19 +634,12 @@ minetest.register_craft({ } }) --- TODO: Remove helper recipe minetest.register_craft({ type = 'shapeless', output = 'default:book', recipe = { 'default:paper', 'default:paper', 'default:paper', 'mobs:leather', } }) -minetest.register_craft({ - type = 'shapeless', - output = 'default:book', - recipe = { 'default:paper', 'default:paper', 'default:paper', 'default:paper', - } -}) minetest.register_craft({ output = 'default:bookshelf', @@ -1081,8 +1074,9 @@ minetest.register_craft({ -- --Temporary --- +-- TODO: Remove when string is ready minetest.register_craft({ output = "default:string", - recipe = {{"default:paper", "default:paper"}}, + recipe = {{"default:paper",}, + {"default:paper"}}, }) diff --git a/mods/itemframes/init.lua b/mods/itemframes/init.lua index 038676f1..0f1a041c 100644 --- a/mods/itemframes/init.lua +++ b/mods/itemframes/init.lua @@ -138,12 +138,3 @@ minetest.register_craft({ {'default:stick', 'default:stick', 'default:stick'}, } }) --- FIXME: Remove helper recipe -minetest.register_craft({ - output = 'itemframes:frame', - recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'default:paper', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - } -}) diff --git a/mods/mobs/item.lua b/mods/mobs/item.lua index dd82f154..85598607 100644 --- a/mods/mobs/item.lua +++ b/mods/mobs/item.lua @@ -225,6 +225,13 @@ minetest.register_craftitem("mobs:leather", { stack_max = 64, }) +minetest.register_craftitem("mobs:feather", { + description = "Feather", + wield_image = "mobs_feather.png", + inventory_image = "mobs_feather.png", + stack_max = 64, +}) + minetest.register_craftitem("mobs:rabbit_hide", { description = "Rabbit Hide", wield_image = "mobs_rabbit_hide.png", @@ -296,3 +303,19 @@ minetest.register_craft({ burntime = 120, }) +-- Temporary helper recipes +-- TODO: Remove them +minetest.register_craft({ + type = "shapeless", + output = "mobs:leather", + recipe = { "default:paper", "default:paper" }, +}) +minetest.register_craft({ + output = "mobs:feather 3", + recipe = { + { "flowers:oxeye_daisy" }, + { "flowers:oxeye_daisy" }, + } +}) + + diff --git a/mods/throwing/arrow.lua b/mods/throwing/arrow.lua index 2f05f04d..52356765 100644 --- a/mods/throwing/arrow.lua +++ b/mods/throwing/arrow.lua @@ -88,12 +88,3 @@ minetest.register_craft({ {'mobs:feather'} } }) --- FIXME: Helper recipe -minetest.register_craft({ - output = 'throwing:arrow 4', - recipe = { - {'default:flint'}, - {'default:stick'}, - {'default:paper'} - } -})