From 93ea79653f416ada90159f90431ab36dc0d55a01 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 29 Jul 2016 16:49:46 +0200 Subject: [PATCH 1/5] Update support of farming redo and mobs redo Add support of ethereal --- food_basic/init.lua | 6 +++++- food_basic/support.lua | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) 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..13019a2 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -16,7 +16,13 @@ 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("strawberry", "ethereal:strawberry") +food.support("orange", { + "farming_plus:orange_item", + "ethereal:orange" +}) +food.disable_if("ethereal", "orange") + food.support("potato", { "docfarming:potato", "veggies:potato", @@ -68,6 +74,8 @@ if farming and farming.mod == "redo" then food.support("dark_chocolate", "farming:chocolate_dark") food.support("sugar", "farming:sugar") food.support("cup", "farming:drinking_cup") + food.support("rhubarb", "farming:rhubarb") + food.support("blueberry", "farming:blueberries") food.disable_if("farming", "baked_potato") else food.support("wheat", "farming:wheat") @@ -81,3 +89,6 @@ if minetest.get_modpath("mtfoods") then food.support("rhubarb", "farming_plus:rhubarb_item") end +if minetest.get_modpath("mobs") and mobs.mod == "redo" then + food.support("chicken", "mobs:chicken_cooked") +end From b392b415c8f62fe03cbe67807ead28e3207c943f Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 29 Jul 2016 16:52:08 +0200 Subject: [PATCH 2/5] Add ethereal? in depends.txt --- food_basic/depends.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/food_basic/depends.txt b/food_basic/depends.txt index bb93f51..ff5dbdd 100644 --- a/food_basic/depends.txt +++ b/food_basic/depends.txt @@ -3,6 +3,7 @@ animalmaterials? bushes_classic? default? docfarming? +ethereal? farming? farming_plus? intllib? From dbb7b9bb65f40906c53afa2f6a4ce29b006b5c24 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Sat, 30 Jul 2016 12:44:58 +0200 Subject: [PATCH 3/5] Update mtfoods support Remove unneeded bushes_classic support Remove unneeded strawberries and rhubarb support (Moved to food_sweet) --- food_basic/depends.txt | 3 ++- food_basic/support.lua | 16 ++++------------ food_basic/textures/food_strawberry.png | Bin 250 -> 0 bytes 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 food_basic/textures/food_strawberry.png diff --git a/food_basic/depends.txt b/food_basic/depends.txt index ff5dbdd..90225e1 100644 --- a/food_basic/depends.txt +++ b/food_basic/depends.txt @@ -1,6 +1,6 @@ food animalmaterials? -bushes_classic? +bushes? default? docfarming? ethereal? @@ -12,6 +12,7 @@ jkfarming? my_mobs? mobs? mobfcooking? +mtfoods? plantlib? veggies? vessels? diff --git a/food_basic/support.lua b/food_basic/support.lua index 13019a2..be7d067 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -16,7 +16,6 @@ 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("strawberry", "ethereal:strawberry") food.support("orange", { "farming_plus:orange_item", "ethereal:orange" @@ -42,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", @@ -61,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,21 +75,12 @@ if farming and farming.mod == "redo" then food.support("dark_chocolate", "farming:chocolate_dark") food.support("sugar", "farming:sugar") food.support("cup", "farming:drinking_cup") - food.support("rhubarb", "farming:rhubarb") - food.support("blueberry", "farming:blueberries") food.disable_if("farming", "baked_potato") else food.support("wheat", "farming:wheat") 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") -end - 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 0a80f45ddf486546c7eb9556b86503843eaa5183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^RlY zSq#SNHJ^bLXMsm#F$061G6*wPEVVBK3bL1Y`ns~;;gILCv Date: Sat, 30 Jul 2016 22:19:40 +0200 Subject: [PATCH 4/5] Fix a warning triggered by a variable which was not declared as local. --- food/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)} From 55273495226a20d701b9857071f1efca7d0ef278 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Sat, 30 Jul 2016 23:22:06 +0200 Subject: [PATCH 5/5] Fix bushes_classic support (for sugar) --- food_basic/depends.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/food_basic/depends.txt b/food_basic/depends.txt index 90225e1..05df110 100644 --- a/food_basic/depends.txt +++ b/food_basic/depends.txt @@ -1,6 +1,7 @@ food animalmaterials? bushes? +bushes_classic? default? docfarming? ethereal?