From d4a6f54488042f10ee09d9b28fa80f4e0b210889 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 25 Nov 2016 05:57:04 +0100 Subject: [PATCH 1/4] Fix intllib boilerplate code --- food_basic/ingredients.lua | 5 ++--- food_basic/init.lua | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/food_basic/ingredients.lua b/food_basic/ingredients.lua index 27c5feb..c1a7283 100644 --- a/food_basic/ingredients.lua +++ b/food_basic/ingredients.lua @@ -8,9 +8,8 @@ -- Boilerplate to support localized strings if intllib mod is installed. local S = 0 -if rawget(_G, "intllib") then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) +if minetest.get_modpath("intllib") then + S = intllib.Getter() else S = function ( s ) return s end end diff --git a/food_basic/init.lua b/food_basic/init.lua index f00048d..e240efa 100644 --- a/food_basic/init.lua +++ b/food_basic/init.lua @@ -13,9 +13,8 @@ dofile(minetest.get_modpath("food_basic").."/ingredients.lua") -- Boilerplate to support localized strings if intllib mod is installed. local S = 0 -if rawget(_G, "intllib") then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) +if minetest.get_modpath("intllib") then + S = intllib.Getter() else S = function ( s ) return s end end From 597f544e8943821da499e24a8e9a97777e1d94ae Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 25 Nov 2016 08:01:42 +0100 Subject: [PATCH 2/4] Fix orange item with farming_redo support --- food_basic/support.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/food_basic/support.lua b/food_basic/support.lua index be7d067..a2a48b3 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -16,11 +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") +minetest.register_alias("farming:orange", "ethereal:orange") food.support("orange", { "farming_plus:orange_item", - "ethereal:orange" + "ethereal:orange", + "farming:orange" }) -food.disable_if("ethereal", "orange") +--food.disable_if("ethereal", "orange") food.support("potato", { "docfarming:potato", From 2fcea7f29d6b93fd2acfb094bd19171303c71714 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 25 Nov 2016 15:19:02 +0100 Subject: [PATCH 3/4] undo last commit (there is no oranges with farming_redo) --- food_basic/support.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/food_basic/support.lua b/food_basic/support.lua index a2a48b3..9bb8e6d 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -16,13 +16,11 @@ food.support("cocoa", "farming_plus:cocoa_bean") food.support("cup", "vessels:drinking_glass") food.support("cactus", "default:cactus") food.support("apple", "default:apple") -minetest.register_alias("farming:orange", "ethereal:orange") food.support("orange", { "farming_plus:orange_item", "ethereal:orange", - "farming:orange" }) ---food.disable_if("ethereal", "orange") +food.disable_if("ethereal", "orange") food.support("potato", { "docfarming:potato", From 80cf6b3799360690af92e5ed8a00313cd4c1ea31 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 25 Nov 2016 21:33:59 +0100 Subject: [PATCH 4/4] food_basic : Update support of mobs_redo with mobs_animal. If mobs is loaded without mobs_animal then food:soup_chicken_raw cannot be crafted. --- food_basic/depends.txt | 1 + food_basic/support.lua | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/food_basic/depends.txt b/food_basic/depends.txt index 05df110..222b93e 100644 --- a/food_basic/depends.txt +++ b/food_basic/depends.txt @@ -12,6 +12,7 @@ jkanimals? jkfarming? my_mobs? mobs? +mobs_animal? mobfcooking? mtfoods? plantlib? diff --git a/food_basic/support.lua b/food_basic/support.lua index 9bb8e6d..0161259 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -82,5 +82,9 @@ else end if minetest.get_modpath("mobs") and mobs.mod == "redo" then - food.support("chicken", "mobs:chicken_cooked") + if minetest.get_modpath("mobs_animal") then + food.support("chicken", "mobs:chicken_cooked") + else + food.support("chicken", "mobs:meat") + end end