From 5bf25d25ef560a9fc4be9f474e7b687309ee9322 Mon Sep 17 00:00:00 2001 From: MT-Modder Date: Fri, 30 Jan 2015 14:43:28 -0500 Subject: [PATCH 1/2] Add reverse recipes for hoes while keeping def.recipe compatibility --- mods/farming/api.lua | 28 ++++++++++++++++++++++++---- mods/farming/hoes.lua | 36 ++++++------------------------------ 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/mods/farming/api.lua b/mods/farming/api.lua index 6ce996d8..a0ff2fa1 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -83,10 +83,30 @@ farming.register_hoe = function(name, def) end }) -- Register its recipe - minetest.register_craft({ - output = name:gsub(":", "", 1), - recipe = def.recipe - }) + if def.material == nil then + minetest.register_craft({ + output = name:gsub(":", "", 1), + recipe = def.recipe + }) + else + minetest.register_craft({ + output = name:gsub(":", "", 1), + recipe = { + {def.material, def.material, ""}, + {"", "group:stick", ""}, + {"", "group:stick", ""} + } + }) + -- Reverse Recipe + minetest.register_craft({ + output = name:gsub(":", "", 1), + recipe = { + {"", def.material, def.material}, + {"", "group:stick", ""}, + {"", "group:stick", ""} + } + }) + end end -- Seed placement diff --git a/mods/farming/hoes.lua b/mods/farming/hoes.lua index 084d586f..31da19ff 100644 --- a/mods/farming/hoes.lua +++ b/mods/farming/hoes.lua @@ -2,64 +2,40 @@ farming.register_hoe(":farming:hoe_wood", { description = "Wooden Hoe", inventory_image = "farming_tool_woodhoe.png", max_uses = 30, - recipe = { - {"group:wood", "group:wood"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "group:wood" }) farming.register_hoe(":farming:hoe_stone", { description = "Stone Hoe", inventory_image = "farming_tool_stonehoe.png", max_uses = 90, - recipe = { - {"group:stone", "group:stone"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "group:stone" }) farming.register_hoe(":farming:hoe_steel", { description = "Steel Hoe", inventory_image = "farming_tool_steelhoe.png", max_uses = 200, - recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "default:steel_ingot" }) farming.register_hoe(":farming:hoe_bronze", { description = "Bronze Hoe", inventory_image = "farming_tool_bronzehoe.png", max_uses = 220, - recipe = { - {"default:bronze_ingot", "default:bronze_ingot"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "default:bronze_ingot" }) farming.register_hoe(":farming:hoe_mese", { description = "Mese Hoe", inventory_image = "farming_tool_mesehoe.png", max_uses = 350, - recipe = { - {"default:mese_crystal", "default:mese_crystal"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "default:mese_crystal" }) farming.register_hoe(":farming:hoe_diamond", { description = "Diamond Hoe", inventory_image = "farming_tool_diamondhoe.png", max_uses = 500, - recipe = { - {"default:diamond", "default:diamond"}, - {"", "group:stick"}, - {"", "group:stick"}, - } + material = "default:diamond" }) From c7860e7acc06463ceb0c72334be4fef083641dec Mon Sep 17 00:00:00 2001 From: MT-Modder Date: Tue, 3 Feb 2015 16:53:03 -0500 Subject: [PATCH 2/2] shadowninja update --- mods/farming/api.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/farming/api.lua b/mods/farming/api.lua index a0ff2fa1..8c27233f 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -85,12 +85,12 @@ farming.register_hoe = function(name, def) -- Register its recipe if def.material == nil then minetest.register_craft({ - output = name:gsub(":", "", 1), + output = name:sub(2), recipe = def.recipe }) else minetest.register_craft({ - output = name:gsub(":", "", 1), + output = name:sub(2), recipe = { {def.material, def.material, ""}, {"", "group:stick", ""}, @@ -99,7 +99,7 @@ farming.register_hoe = function(name, def) }) -- Reverse Recipe minetest.register_craft({ - output = name:gsub(":", "", 1), + output = name:sub(2), recipe = { {"", def.material, def.material}, {"", "group:stick", ""},