diff options
| author | sys4-fr <sys4@free.fr> | 2017-04-03 01:50:59 +0200 |
|---|---|---|
| committer | rubenwardy <rubenwardy@gmail.com> | 2017-04-03 00:50:59 +0100 |
| commit | 93de17fdc30dcdd498aa20c065a9d068933190d4 (patch) | |
| tree | 0d7d7439d5818b43e40c596b7b097bcb1b931dcc | |
| parent | 54e7fa3b8117fa61da84b1a6d68dc912591d3da0 (diff) | |
Fix intllib boilerplate code
| -rw-r--r-- | food_basic/depends.txt | 1 | ||||
| -rw-r--r-- | food_basic/ingredients.lua | 5 | ||||
| -rw-r--r-- | food_basic/init.lua | 5 | ||||
| -rw-r--r-- | food_basic/support.lua | 8 |
4 files changed, 11 insertions, 8 deletions
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/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 diff --git a/food_basic/support.lua b/food_basic/support.lua index be7d067..0161259 100644 --- a/food_basic/support.lua +++ b/food_basic/support.lua @@ -18,7 +18,7 @@ food.support("cactus", "default:cactus") food.support("apple", "default:apple") food.support("orange", { "farming_plus:orange_item", - "ethereal:orange" + "ethereal:orange", }) food.disable_if("ethereal", "orange") @@ -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 |