Merge pull request #29 from sys4-fr/master

Multiple improvements and add new supported mods

5 files changed, 21 insertions, 11 deletions

diff --git a/food/init.lua b/food/init.lua
index 4afa950..220b25e 100644
--- a/food/init.lua
+++ b/food/init.lua
@@ -98,7 +98,7 @@ function minetest.register_node(name, def)
 end
 
 function food.strip_name(name)
-	res = name:gsub('%"', '')
+	local res = name:gsub('%"', '')
 	if res:sub(1, 1) == ":" then
 		res = res:sub(2, #res)
 		--table.concat{res:sub(1, 1-1), "", res:sub(1+1)}
diff --git a/food_basic/depends.txt b/food_basic/depends.txt
index bb93f51..05df110 100644
--- a/food_basic/depends.txt
+++ b/food_basic/depends.txt
@@ -1,8 +1,10 @@
 food
 animalmaterials?
+bushes?
 bushes_classic?
 default?
 docfarming?
+ethereal?
 farming?
 farming_plus?
 intllib?
@@ -11,6 +13,7 @@ jkfarming?
 my_mobs?
 mobs?
 mobfcooking?
+mtfoods?
 plantlib?
 veggies?
 vessels?
diff --git a/food_basic/init.lua b/food_basic/init.lua
index 9f035d4..f00048d 100644
--- a/food_basic/init.lua
+++ b/food_basic/init.lua
@@ -95,9 +95,13 @@ food.module("pasta_bake", function()
 end)
 
 -- Register Soups
+local chicken = "meat"
+if minetest.get_modpath("mobs") and mobs.mod == "redo" then
+	chicken = "chicken"
+end
 local soups = {
 	{"tomato", "tomato"},
-	{"chicken", "meat"}
+	{"chicken", chicken}
 }
 for i=1, #soups do
 	local flav = soups[i]
diff --git a/food_basic/support.lua b/food_basic/support.lua
index 4f4366c..be7d067 100644
--- a/food_basic/support.lua
+++ b/food_basic/support.lua
@@ -16,7 +16,12 @@ food.support("cocoa", "farming_plus:cocoa_bean")
 food.support("cup", "vessels:drinking_glass")
 food.support("cactus", "default:cactus")
 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", {
 	"docfarming:potato",
 	"veggies:potato",
@@ -36,7 +41,8 @@ food.support("milk", {
 	"animalmaterials:milk",
 	"my_mobs:milk_glass_cup",
 	"jkanimals:bucket_milk",
-	"mobs:bucket_milk"
+	"mobs:bucket_milk",
+	"mtfoods:dandelion_milk"
 })
 food.support("egg", {
 	"animalmaterials:egg",
@@ -55,7 +61,8 @@ food.support("meat", {
 })
 food.support("sugar", {
 	"jkfarming:sugar",
-	"bushes:sugar"
+	"bushes:sugar",
+	"mtfoods:sugar"
 })
 
 if farming and farming.mod == "redo" then
@@ -74,10 +81,6 @@ else
 	food.support("flour", "farming:flour")
 end
 
-if minetest.get_modpath("mtfoods") then
-	food.support("strawberry", "farming_plus:strawberry_item")
-	food.support("strawberry", "plantlib:strawberry")
-	food.support("strawberry", "bushes:strawberry")
-	food.support("rhubarb", "farming_plus:rhubarb_item")
+if minetest.get_modpath("mobs") and mobs.mod == "redo" then
+	food.support("chicken", "mobs:chicken_cooked")
 end
-
diff --git a/food_basic/textures/food_strawberry.png b/food_basic/textures/food_strawberry.png
deleted file mode 100644
index 0a80f45..0000000
--- a/food_basic/textures/food_strawberry.png
+++ /dev/null