nalc/plantlife_modpack
1
0
Fork 0
forked from mtcontrib/plantlife_modpack
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #66 from sys4-fr/master

Browse Source 
Add support of raspberries and blueberries from farming redo
This commit is contained in:
Vanessa Ezekowitz 2016-07-31 14:18:51 -04:00 committed by GitHub
commit e801716f57
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bushes_classic/cooking.lua
View File

@ -3,27 +3,27 @@ local S = biome_lib.intllib
-- Basket -- Basket
minetest.register_craft({ minetest.register_craft({
output = "bushes:basket_empty", output = "bushes:basket_empty",
recipe = { recipe = {
{ "default:stick", "default:stick", "default:stick" }, { "default:stick", "default:stick", "default:stick" },
{ "", "default:stick", "" }, { "", "default:stick", "" },
}, },
}) })
-- Sugar -- Sugar
minetest.register_craftitem(":bushes:sugar", { minetest.register_craftitem(":bushes:sugar", {
description = S("Sugar"), description = S("Sugar"),
inventory_image = "bushes_sugar.png", inventory_image = "bushes_sugar.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = {food_sugar=1} groups = {food_sugar=1}
}) })
minetest.register_craft({ minetest.register_craft({
output = "bushes:sugar 1", output = "bushes:sugar 1",
recipe = { recipe = {
{ "default:papyrus", "default:papyrus" }, { "default:papyrus", "default:papyrus" },
}, },
}) })
for i, berry in ipairs(bushes_classic.bushes) do for i, berry in ipairs(bushes_classic.bushes) do
@ -37,10 +37,12 @@ for i, berry in ipairs(bushes_classic.bushes) do
if berry ~= "mixed_berry" then if berry ~= "mixed_berry" then
-- Special case for strawberries, blueberries and raspberries
-- when farming_plus or farming redo is in use. Use items
-- from these mods, but redefine there so they has the right
-- groups and does't look so ugly!
if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
-- Special case for strawberries, when farming_plus is in use. Use
-- the item from that mod, but redefine it so it has the right
-- groups and does't look so ugly!
minetest.register_craftitem(":farming_plus:strawberry_item", { minetest.register_craftitem(":farming_plus:strawberry_item", {
description = S("Strawberry"), description = S("Strawberry"),
inventory_image = "bushes_"..berry..".png", inventory_image = "bushes_"..berry..".png",
@ -48,6 +50,25 @@ for i, berry in ipairs(bushes_classic.bushes) do
groups = {berry=1, strawberry=1} groups = {berry=1, strawberry=1}
}) })
minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item") minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
elseif berry == "blueberry" and minetest.registered_items["farming:blueberries"] then
minetest.register_craftitem(":farming:blueberries", {
description = S("Blueberry"),
inventory_image = "bushes_"..berry..".png",
on_use = minetest.item_eat(1),
groups = {berry=1, blueberry=1}
})
minetest.register_alias("bushes:blueberry", "farming:blueberries")
elseif berry == "raspberry" and minetest.registered_items["farming:raspberries"] then
minetest.register_craftitem(":farming:raspberries", {
description = S("Raspberry"),
inventory_image = "bushes_"..berry..".png",
on_use = minetest.item_eat(1),
groups = {berry=1, raspberry=1}
})
minetest.register_alias("bushes:raspberry", "farming:raspberries")
else else
minetest.register_craftitem(":bushes:"..berry, { minetest.register_craftitem(":bushes:"..berry, {
description = desc, description = desc,
@ -56,6 +77,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
}) })
end end
minetest.register_craft({ minetest.register_craft({
output = "bushes:"..berry.."_pie_raw 1", output = "bushes:"..berry.."_pie_raw 1",
recipe = { recipe = {