1
0
mirror of https://github.com/rubenwardy/food.git synced 2024-12-23 00:10:18 +01:00

Merge pull request #29 from sys4-fr/master

Multiple improvements and add new supported mods
This commit is contained in:
rubenwardy 2016-11-01 23:23:40 +00:00 committed by GitHub
commit 54e7fa3b81
5 changed files with 21 additions and 11 deletions

View File

@ -98,7 +98,7 @@ function minetest.register_node(name, def)
end end
function food.strip_name(name) function food.strip_name(name)
res = name:gsub('%"', '') local res = name:gsub('%"', '')
if res:sub(1, 1) == ":" then if res:sub(1, 1) == ":" then
res = res:sub(2, #res) res = res:sub(2, #res)
--table.concat{res:sub(1, 1-1), "", res:sub(1+1)} --table.concat{res:sub(1, 1-1), "", res:sub(1+1)}

View File

@ -1,8 +1,10 @@
food food
animalmaterials? animalmaterials?
bushes?
bushes_classic? bushes_classic?
default? default?
docfarming? docfarming?
ethereal?
farming? farming?
farming_plus? farming_plus?
intllib? intllib?
@ -11,6 +13,7 @@ jkfarming?
my_mobs? my_mobs?
mobs? mobs?
mobfcooking? mobfcooking?
mtfoods?
plantlib? plantlib?
veggies? veggies?
vessels? vessels?

View File

@ -95,9 +95,13 @@ food.module("pasta_bake", function()
end) end)
-- Register Soups -- Register Soups
local chicken = "meat"
if minetest.get_modpath("mobs") and mobs.mod == "redo" then
chicken = "chicken"
end
local soups = { local soups = {
{"tomato", "tomato"}, {"tomato", "tomato"},
{"chicken", "meat"} {"chicken", chicken}
} }
for i=1, #soups do for i=1, #soups do
local flav = soups[i] local flav = soups[i]

View File

@ -16,7 +16,12 @@ food.support("cocoa", "farming_plus:cocoa_bean")
food.support("cup", "vessels:drinking_glass") food.support("cup", "vessels:drinking_glass")
food.support("cactus", "default:cactus") food.support("cactus", "default:cactus")
food.support("apple", "default:apple") food.support("apple", "default:apple")
food.support("orange", "farming_plus:orange_item") food.support("orange", {
"farming_plus:orange_item",
"ethereal:orange"
})
food.disable_if("ethereal", "orange")
food.support("potato", { food.support("potato", {
"docfarming:potato", "docfarming:potato",
"veggies:potato", "veggies:potato",
@ -36,7 +41,8 @@ food.support("milk", {
"animalmaterials:milk", "animalmaterials:milk",
"my_mobs:milk_glass_cup", "my_mobs:milk_glass_cup",
"jkanimals:bucket_milk", "jkanimals:bucket_milk",
"mobs:bucket_milk" "mobs:bucket_milk",
"mtfoods:dandelion_milk"
}) })
food.support("egg", { food.support("egg", {
"animalmaterials:egg", "animalmaterials:egg",
@ -55,7 +61,8 @@ food.support("meat", {
}) })
food.support("sugar", { food.support("sugar", {
"jkfarming:sugar", "jkfarming:sugar",
"bushes:sugar" "bushes:sugar",
"mtfoods:sugar"
}) })
if farming and farming.mod == "redo" then if farming and farming.mod == "redo" then
@ -74,10 +81,6 @@ else
food.support("flour", "farming:flour") food.support("flour", "farming:flour")
end end
if minetest.get_modpath("mtfoods") then if minetest.get_modpath("mobs") and mobs.mod == "redo" then
food.support("strawberry", "farming_plus:strawberry_item") food.support("chicken", "mobs:chicken_cooked")
food.support("strawberry", "plantlib:strawberry")
food.support("strawberry", "bushes:strawberry")
food.support("rhubarb", "farming_plus:rhubarb_item")
end end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B