Add Russian translation

Multiple improvements and add new supported mods

.travis.yml

@@ -0,0 +1,5 @@
+language: lua
+before_install: sh travis_install.sh
+script: cd minetest && ./bin/minetestserver --gameid minetest_game --worldname world --port 31234
+notifications:
+  email: false

README.md

@@ -1,6 +1,8 @@
 Food
 ====
 
+[![Build Status](https://travis-ci.org/rubenwardy/food.svg?branch=master)](https://travis-ci.org/rubenwardy/food)
+
 This is the main mod in the food mod collection.
 
 Version 2.3

food/init.lua

@@ -10,7 +10,9 @@ food = {
 	modules = {},
 	disabled_modules = {},
 	debug = false,
-	version = 2.3
+	version = 2.3,
+	disable_fallbacks =
+		minetest.setting_getbool("food.disable_fallbacks")
 }
 
 -- Checks for external content, and adds support
@@ -77,42 +79,108 @@ function food.disable_if(mod, name)
 	end
 end
 
+local mtreg_item = minetest.register_item
+function minetest.register_item(name, def)
+	if food._reg_items then
+		local iname = food.strip_name(name)
+		food._reg_items[iname] = true
+	end
+	return mtreg_item(name, def)
+end
+
+local mtreg_node = minetest.register_node
+function minetest.register_node(name, def)
+	if food._reg_items then
+		local iname = food.strip_name(name)
+		food._reg_items[iname] = true
+	end
+	return mtreg_node(name, def)
+end
+
+function food.strip_name(name)
+	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)}
+	end
+	for str in string.gmatch(res, "([^ ]+)") do
+		if str ~= " " and str ~= nil then
+			res = str
+			break
+		end
+	end
+	if not res then
+		res = ""
+	end
+	return res
+end
+
+local mtreg_craft = minetest.register_craft
+function minetest.register_craft(def)
+	if food._reg_items and food._cur_module and def.output then
+		local name = food.strip_name(def.output)
+		if not food._reg_items[name] then
+			print("[Food] (Error) Modules should only define recipes for the items they create!")
+			print("Output: " .. name .. " in module " .. food._cur_module)
+		end
+	end
+
+	return mtreg_craft(def)
+end
+
 -- Adds a module
 function food.module(name, func, ingred)
 	if food.disabled_modules[name] then
 		return
 	end
+
 	if ingred then
 		for name, def in pairs(minetest.registered_items) do
 			local g = def.groups and def.groups["food_"..name] or 0
 			if g > 0 then
-				print("cancelled")
 				return
 			end
 		end
 
+		if food.disable_fallbacks then
+			print("Warning: Fallbacks are disabled, and no item for " .. name .. " registered!")
+			return
+		end
+
 		if food.debug then
 			print("[Food Debug] Registering " .. name .. " fallback definition")
 		end
 	elseif food.debug then
 		print("[Food Debug] Module " .. name)
 	end
+
+	food._cur_module = name
+	food._reg_items = {}
+
 	func()
+
+	food._reg_items = nil
+	food._cur_module = nil
+end
+
+local global_exists = minetest.global_exists or function(name)
+	return (_G[name] ~= nil)
 end
 
 -- Checks for hunger mods to register food on
 function food.item_eat(amt)
-	if minetest.get_modpath("diet") and diet and diet.item_eat then
+	if minetest.get_modpath("diet") and global_exists("diet") and diet.item_eat then
 		return diet.item_eat(amt)
-	elseif minetest.get_modpath("hud") and hud and hud.item_eat then
+	elseif minetest.get_modpath("hud") and global_exists("hud") and hud.item_eat then
 		return hud.item_eat(amt)
 	elseif minetest.get_modpath("hbhunger") then
-		if hbhunger and hbhunger.item_eat then -- hbhunger is nil when world is loaded with damage disabled
+		if global_exists("hbhunger") and hbhunger.item_eat then
 			return hbhunger.item_eat(amt)
+		elseif global_exists("hunger") and hunger.item_eat then
+			-- For backwards compatibility
+			-- It used to be called `hunger` rather than `hbhunger`
+			return hunger.item_eat(amt)
 		end
-		return function(...) end
-	elseif minetest.get_modpath("hunger") and hunger and hunger.item_eat then
-		return hunger.item_eat(amt)
 	else
 		return minetest.item_eat(amt)
 	end
@@ -150,4 +218,3 @@ end
 function food.craft(craft)
 	minetest.register_craft(craft)
 end
-

food_basic/depends.txt

@@ -1,8 +1,10 @@
 food
 animalmaterials?
+bushes?
 bushes_classic?
 default?
 docfarming?
+ethereal?
 farming?
 farming_plus?
 intllib?
@@ -10,7 +12,9 @@ jkanimals?
 jkfarming?
 my_mobs?
 mobs?
+mobs_animal?
 mobfcooking?
+mtfoods?
 plantlib?
 veggies?
 vessels?

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
@@ -43,6 +42,13 @@ food.module("flour", function()
 			{"group:food_wheat"}
 		}
 	})
+	food.craft({
+		output = "food:flour",
+		recipe = {
+			{"default:sand"},
+			{"default:sand"}
+		}
+	})
 end, true)
 
 food.module("potato", function()
@@ -254,6 +260,23 @@ food.module("butter", function()
 		inventory_image = "food_butter.png",
 		groups = {food_butter=1}
 	})
+	food.craft({
+		output = "food:butter",
+		recipe = {{"group:food_milkbucket","group:food_milkbucket"}},
+		replacements = { 
+			{"group:food_milkbucket","bucket:bucket_empty"},
+			{"group:food_milkbucket","bucket:bucket_empty"} 
+		},
+	})
+	food.craft({
+		output = "food:butter",
+		recipe = {
+			{"group:food_milk","group:food_milkbucket"}
+		},
+		replacements = { 
+			{"group:food_milkbucket","bucket:bucket_empty"},
+		},
+	})
 	food.craft({
 		output = "food:butter",
 		recipe = {

food_basic/init.lua

@@ -6,16 +6,15 @@
 -- Some basic foods
 -- =====================================
 
-minetest.log("action", "Food Mod - Version 2.3")
+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 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
@@ -95,9 +94,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]

food_basic/locale/es.txt

@@ -0,0 +1,40 @@
+# template
+
+Wheat = Trigo
+Flour = Harina
+Potato = Patata
+Tomato = Tomate
+Carrot = Zanahoria
+Orange = Naranja
+Milk = Leche
+Egg = Huevo
+Cocoa Bean = Grano de Cacao
+Raw meat = Carne cruda
+Venison = Venado
+Sugar = Azúcar
+Chocolate Powder = Polvo de Chocolate
+Dark Chocolate = Chocolate Oscuro
+Milk Chocolate = Chocolate con Leche
+Pasta = Pasta
+Bowl = Cuenco
+Butter = Manteca
+Cheese = Queso
+Baked Potato = Patata al Horno
+Pasta Bake = Horneado de Pasta
+Raw Pasta Bake = Horneado de Pasta Crudo
+chicken Soup = Sopa de Pollo
+tomato Soup = Sopa de Tomate
+Uncooked tomato Soup = Sopa de tomate sin Cocer
+Uncooked chicken Soup = Sopa de pollo sin Cocer
+apple Juice = Jugo de manzana
+cactus Juice = Jugo de cácto
+Rainbow Juice = Jugo de arcoíris
+Orange Juice = Jugo de naranja
+Cake = Pastel
+Chocolate Cake = Pastel de Chocolate
+Carrot Cake = Pastel de Zanahoria
+Cheese cake = Pastel de Queso
+Cake Mix = Mezcla para Pastel
+Chocolate Cake Mix = Mezcla para Pastel de Chocolate
+Carrot Cake Mix = Mezcla para Pastel de Zanahoria
+Cheese Cake Mix = Mezcla para Pastel de Queso

food_basic/locale/ru.txt

@@ -0,0 +1,37 @@
+# Translation by Xanthin and hawkril
+
+Wheat = Пшеница
+Flour = Мука
+Potato = Картофель
+Tomato = Помидор
+Carrot = Морковь
+Orange = Апельсин
+Milk = Молоко
+Egg = Яйцо
+Cocoa Bean = Какао-Бобы
+Raw meat = Сырое мясо
+Venison = Оленина
+Sugar = Сахар
+Chocolate Powder = Шоколадный порошок
+Dark Chocolate = Чёрный шоколад
+Milk Chocolate = Молочный шоколад
+Pasta = Паста
+Bowl = Чашка
+Butter = Масло
+Cheese = Сыр
+Baked Potato = Печёный картофель
+Pasta Bake = Макаронные изделия
+Raw Pasta Bake = Сырая паста
+chicken Soup = Куриный суп
+tomato Soup = Томатный суп
+Uncooked tomato Soup = Сырой томатный суп
+Uncooked chicken Soup = Сырой куриный суп
+apple Juice = Яблочный сок
+cactus Juice = Кактусовый сок
+Rainbow Juice = Радужный сок
+Cake = Торт
+Chocolate Cake = Шоколадный торт
+Carrot Cake = Морковный торт
+Cake Mix = Полуфабрикат торта
+Chocolate Cake Mix = Полуфабрикат шоколадного торта
+Carrot Cake Mix = Полуфабрикат морковного торта

food_basic/locale/tr.txt

@@ -0,0 +1,40 @@
+# mahmutelmas06@gmail.com
+
+Wheat = Buğday	
+Flour = Un
+Potato = Patates
+Tomato = Domates
+Carrot = Havuç
+Orange = Portakal
+Milk = Süt
+Egg = Yumurta
+Cocoa Bean = Kakao Çekirdeği
+Raw meat = Çiğ et
+Venison = Geyik Eti
+Sugar = Şeker
+Chocolate Powder = Çikolata tozu
+Dark Chocolate = Bitter çikolata
+Milk Chocolate = Sütlü çikolata
+Pasta = Makarna
+Bowl = Kase
+Butter = Tereyağı
+Cheese = Peynir
+Baked Potato = Fırında Patates
+Pasta Bake = Fırında Makarna
+Raw Pasta Bake = Çiğ Makarna
+chicken Soup = Tavuk çorbası
+tomato Soup = Domates çorbası
+Uncooked tomato Soup = Pişmemiş domates çorbası
+Uncooked chicken Soup = Pişmemiş tavuk çorbası
+apple Juice = Elma suyu
+cactus Juice = Kaktüs suyu
+Rainbow Juice = Gökkuşağı suyu
+Orange Juice = Portakal suyu
+Cake = Kek
+Chocolate Cake = Çikolatalı kek
+Carrot Cake = Havuçlu kek
+Cheese cake = Peynirli kek
+Cake Mix = Pişmemiş kek
+Chocolate Cake Mix = Pişmemiş çikolatalı kek
+Carrot Cake Mix = Pişmemiş havuçlu kek
+Cheese Cake Mix = Pişmemiş peynirli kek

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",
@@ -35,8 +40,11 @@ food.support("carrot", {
 food.support("milk", {
 	"animalmaterials:milk",
 	"my_mobs:milk_glass_cup",
+	"mtfoods:dandelion_milk"
+})
+food.support("milkbucket", {
 	"jkanimals:bucket_milk",
-	"mobs:bucket_milk"
+	"mobs:bucket_milk",
 })
 food.support("egg", {
 	"animalmaterials:egg",
@@ -55,7 +63,8 @@ food.support("meat", {
 })
 food.support("sugar", {
 	"jkfarming:sugar",
-	"bushes:sugar"
+	"bushes:sugar",
+	"mtfoods:sugar"
 })
 
 if farming and farming.mod == "redo" then
@@ -65,6 +74,7 @@ if farming and farming.mod == "redo" then
 	food.support("potato", "farming:potato")
 	food.support("tomato", "farming:tomato")
 	food.support("cocoa", "farming:cocoa_beans")
+	food.support("coffee", "farming:coffee_beans")
 	food.support("dark_chocolate", "farming:chocolate_dark")
 	food.support("sugar", "farming:sugar")
 	food.support("cup", "farming:drinking_cup")
@@ -74,10 +84,10 @@ 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
+	if minetest.get_modpath("mobs_animal") then
+		food.support("chicken", "mobs:chicken_cooked")
+	else
+		food.support("chicken", "mobs:meat")
+	end
 end
-

requirements.txt

@@ -0,0 +1,7 @@
+docfarming?
+PilzAdam/farming_plus@github?
+JKMurray/JKFarming@github?
+my_mobs?
+PilzAdam/mobs@github
+sapier/animals_modpack@github?
+hawkril/mobfcooking@github?

travis_install.sh

@@ -0,0 +1,56 @@
+# Move the food modpack to a subfolder
+mkdir tmp1 && mv * tmp1
+mv tmp1 food
+
+# Install dependancies
+sudo apt-get update
+sudo apt-get install -y libirrlicht-dev libbz2-dev \
+	libpng12-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
+	libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev \
+	libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev wget \
+	lua5.1 luarocks libzzip-dev luajit
+sudo luarocks install luazip
+sudo luarocks install luafilesystem
+sudo luarocks install luajson
+
+# Get minetest
+wget https://www.dropbox.com/s/wtub256856vdclf/minetestserver.zip?dl=1 -O minetestserver.zip
+unzip minetestserver.zip -d minetest
+
+# Install the food modpack
+cp food minetest/mods -rf
+
+# Install and configure mtpm
+git clone https://github.com/rubenwardy/mtpm
+cd mtpm
+mkdir tmp
+./mtpm.lua config mod_location ../minetest/mods/
+
+# Install the food modpack's supported mods
+./mtpm.lua install -r ../food/requirements.txt -y
+
+# Configure Minetest
+echo "Configuring Minetest"
+cd ../minetest
+mkdir worlds/world
+echo "gameid = minetest" > worlds/world/world.mt
+echo "backend = sqlite3" >> worlds/world/world.mt
+echo "creative_mode = true" >> worlds/world/world.mt
+echo "enable_damage = true" >> worlds/world/world.mt
+cd mods
+for f in *
+		do
+	echo "load_mod_$f = true" >> ../worlds/world/world.mt
+done
+
+# Install test worldmod
+cd ../
+mkdir worlds/world/worldmods/
+mkdir worlds/world/worldmods/food_test/
+echo "minetest.after(0, function()" > worlds/world/worldmods/food_test/init.lua
+echo "	print(\"tests complete\")" >> worlds/world/worldmods/food_test/init.lua
+echo "	minetest.request_shutdown()" >> worlds/world/worldmods/food_test/init.lua
+echo "end)" >> worlds/world/worldmods/food_test/init.lua
+
+# Go pack to the right directory
+cd ../food