diff options
| -rw-r--r-- | food/depends.txt | 3 | ||||
| -rw-r--r-- | food/init.lua | 17 | ||||
| -rw-r--r-- | food_basic/depends.txt | 2 | ||||
| -rw-r--r-- | food_basic/ingredients.lua | 9 | ||||
| -rw-r--r-- | food_basic/init.lua | 8 |
5 files changed, 24 insertions, 15 deletions
diff --git a/food/depends.txt b/food/depends.txt new file mode 100644 index 0000000..c6a2153 --- /dev/null +++ b/food/depends.txt @@ -0,0 +1,3 @@ +diet? +hud? +intllib? diff --git a/food/init.lua b/food/init.lua index 0cfc4e8..0fa4123 100644 --- a/food/init.lua +++ b/food/init.lua @@ -6,15 +6,6 @@ -- The supporting api for the mod -- ===================================== --- Boilerplate to support localized strings if intllib mod is installed. -S = 0 -if (intllib) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end - food = { modules = {}, disabled_modules = {}, @@ -70,7 +61,7 @@ function food.support(group, item) minetest.override_item(item, {groups = g}) end -function food.disable(name) +function food.disable(name) if type(name) == "table" then for i = 1, #name do food.disable(name[i]) @@ -99,7 +90,7 @@ function food.module(name, func, ingred) return end end - + if food.debug then print("[Food Debug] Registering " .. name .. " fallback definition") end @@ -111,9 +102,9 @@ end -- Checks for hunger mods to register food on function food.item_eat(amt) - if minetest.get_modpath("diet") then + if minetest.get_modpath("diet") and diet and diet.item_eat then return diet.item_eat(amt) - elseif minetest.get_modpath("hud") then + elseif minetest.get_modpath("hud") and hud and hud.item_eat then return hud.item_eat(amt) else return minetest.item_eat(amt) diff --git a/food_basic/depends.txt b/food_basic/depends.txt index 974ed7c..bb93f51 100644 --- a/food_basic/depends.txt +++ b/food_basic/depends.txt @@ -3,10 +3,8 @@ animalmaterials? bushes_classic? default? docfarming? -diet? farming? farming_plus? -hud? intllib? jkanimals? jkfarming? diff --git a/food_basic/ingredients.lua b/food_basic/ingredients.lua index 5d30ff1..cd33fb3 100644 --- a/food_basic/ingredients.lua +++ b/food_basic/ingredients.lua @@ -6,6 +6,15 @@ -- Fallback ingredients -- ===================================== +-- Boilerplate to support localized strings if intllib mod is installed. +local S = 0 +if (intllib) then + dofile(minetest.get_modpath("intllib").."/intllib.lua") + S = intllib.Getter(minetest.get_current_modname()) +else + S = function ( s ) return s end +end + food.module("wheat", function() minetest.register_craftitem(":food:wheat", { description = S("Wheat"), diff --git a/food_basic/init.lua b/food_basic/init.lua index 8e1aa8e..5e84fd4 100644 --- a/food_basic/init.lua +++ b/food_basic/init.lua @@ -11,6 +11,14 @@ print("Food Mod - Version 2.3") dofile(minetest.get_modpath("food_basic").."/support.lua") dofile(minetest.get_modpath("food_basic").."/ingredients.lua") +-- Boilerplate to support localized strings if intllib mod is installed. +local S = 0 +if (intllib) then + dofile(minetest.get_modpath("intllib").."/intllib.lua") + S = intllib.Getter(minetest.get_current_modname()) +else + S = function ( s ) return s end +end -- Register dark chocolate food.module("dark_chocolate", function() |