Merge branch 'crabman77-translation'

* Add customizable settings for changing basic ingredients from
  Minetest settings,
* Rework item replacements in some crafting recipes,
* Disable some redundant items when farming or mobs mod is loaded,
* Improve recent version of farming_redo support,
* Some crafting recipes are slightly changed,
* Fix warnings at load time.

Tested with minetest_game, farming_redo and mobs_animal.

food/depends.txt

@@ -1,4 +0,0 @@
-diet?
-hud?
-intllib?
-hbhunger?

food/description.txt

@@ -1 +0,0 @@
-(API framework) The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices.

food/init.lua

@@ -10,13 +10,13 @@ food = {
 	modules = {},
 	disabled_modules = {},
 	debug = false,
-	version = 2.3,
+	version = 2.4,
 	disable_fallbacks =
-		minetest.setting_getbool("food.disable_fallbacks")
+		minetest.settings:get_bool("food.disable_fallbacks")
 }
 
 -- Checks for external content, and adds support
-function food.support(group, item)
+function food.support(group, item, add_it)
 	if type(group) == "table" then
 		for i = 1, #group do
 			food.support(group[i], item)
@@ -49,8 +49,7 @@ function food.support(group, item)
 		return
 	end
 
-
+	if not add_it then food.disable(group) end
-	food.disable(group)
 
 	-- Add group
 	local g = {}
@@ -168,9 +167,9 @@ local global_exists = minetest.global_exists or function(name)
 end
 
 -- Checks for hunger mods to register food on
-function food.item_eat(amt)
+function food.item_eat(amt, repl_item)
 	if minetest.get_modpath("diet") and global_exists("diet") and diet.item_eat then
-		return diet.item_eat(amt)
+		return diet.item_eat(amt, repl_item)
 	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
@@ -182,13 +181,14 @@ function food.item_eat(amt)
 			return hunger.item_eat(amt)
 		end
 	else
-		return minetest.item_eat(amt)
+		return minetest.item_eat(amt, repl_item)
 	end
 end
 
 -- Registers craft item or node depending on settings
 function food.register(name, data, mod)
-	if (minetest.setting_getbool("food_use_2d") or (mod ~= nil and minetest.setting_getbool("food_"..mod.."_use_2d"))) then
+	if (minetest.settings:get_bool("food_use_2d")
+		 or (mod and minetest.settings:get_bool("food_"..mod.."_use_2d"))) then
 		minetest.register_craftitem(name,{
 			description = data.description,
 			inventory_image = data.inventory_image,
@@ -207,7 +207,7 @@ function food.register(name, data, mod)
 			paramtype = "light",
 			node_box = data.node_box
 		}
-		if (minetest.setting_getbool("food_2d_inv_image")) then
+		if (minetest.settings:get_bool("food_2d_inv_image")) then
 			newdata.inventory_image = data.inventory_image
 		end
 		minetest.register_node(name,newdata)

food/mod.conf

@@ -0,0 +1,4 @@
+name = food
+title = Food
+description = (API framework) The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices.
+optional_depends = diet,hud,intllib,hbhunger

food_basic/README.md

@@ -3,7 +3,7 @@ The Food Mod
 
 This is the main mod in the food mod collection.
 
-Version 2.3
+Version 2.4
 
 The Aims
 --------

food_basic/depends.txt

@@ -1,20 +0,0 @@
-food
-animalmaterials?
-bushes?
-bushes_classic?
-default?
-docfarming?
-ethereal?
-farming?
-farming_plus?
-intllib?
-jkanimals?
-jkfarming?
-my_mobs?
-mobs?
-mobs_animal?
-mobfcooking?
-mtfoods?
-plantlib?
-veggies?
-vessels?

food_basic/description.txt

@@ -1 +0,0 @@
-The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices.

food_basic/ingredients.lua

@@ -6,26 +6,20 @@
 -- Fallback ingredients
 -- =====================================
 
--- Boilerplate to support localized strings if intllib mod is installed.
+-- Boilerplate to support localized strings.
-local S = 0
+local S = food_basic.get_translator
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function ( s ) return s end
-end
 
+if food.bing["dry_shrub"] ~= "none" then
 	food.module("wheat", function()
 		minetest.register_craftitem(":food:wheat", {
 			description = S("Wheat"),
 			inventory_image = "food_wheat.png",
 			groups = {food_wheat=1}
 		})
-
 		food.craft({
+			type = "shapeless",
 			output = "food:wheat",
-		recipe = {
+			recipe = {food.bing["dry_shrub"]}
-			{"default:dry_shrub"},
-		}
 		})
 	end, true)
 
@@ -42,15 +36,10 @@ food.module("flour", function()
 				{"group:food_wheat"}
 			}
 		})
-	food.craft({
-		output = "food:flour",
-		recipe = {
-			{"default:sand"},
-			{"default:sand"}
-		}
-	})
 	end, true)
+end
 
+if food.bing["dirt"] ~= "none" and food.bing["apple"] ~= "none" then
 	food.module("potato", function()
 		minetest.register_craftitem(":food:potato", {
 			description = S("Potato"),
@@ -60,13 +49,31 @@ food.module("potato", function()
 		food.craft({
 			output = "food:potato",
 			recipe = {
-			{"default:dirt"},
+				{food.bing["dirt"]},
-			{"default:apple"}
+				{food.bing["apple"]}
-
 			}
 		})
 	end, true)
 
+	food.module("meat_raw", function()
+		minetest.register_craftitem(":food:meat_raw", {
+			description = S("Raw meat"),
+			image = "food_meat_raw.png",
+			on_use = food.item_eat(1),
+			groups = { meat=1, eatable=1, food_meat=1, food_meat_raw=1 },
+			stack_max=25
+		})
+		food.craft({
+			output = "food:meat_raw",
+			recipe = {
+				{food.bing["apple"]},
+				{food.bing["dirt"]}
+			}
+		})
+	end, true)
+end
+
+if food.bing["desert_sand"] ~= "none" then
 	food.module("orange", function()
 		minetest.register_craftitem(":food:orange", {
 			description = S("Orange"),
@@ -76,9 +83,9 @@ food.module("orange", function()
 		food.craft({
 			output = "food:orange",
 			recipe = {
-			{"", "default:desert_sand", ""},
+				{"", food.bing["desert_sand"], ""},
-			{"default:desert_sand", "default:desert_sand", "default:desert_sand"},
+				{food.bing["desert_sand"], food.bing["desert_sand"], food.bing["desert_sand"]},
-			{"", "default:desert_sand", ""}
+				{"", food.bing["desert_sand"], ""}
 			}
 		})
 	end, true)
@@ -92,13 +99,15 @@ food.module("tomato", function()
 		food.craft({
 			output = "food:tomato",
 			recipe = {
-			{"", "default:desert_sand", ""},
+				{"", food.bing["desert_sand"], ""},
-			{"default:desert_sand", "", "default:desert_sand"},
+				{food.bing["desert_sand"], "", food.bing["desert_sand"]},
-			{"", "default:desert_sand", ""}
+				{"", food.bing["desert_sand"], ""}
 			}
 		})
 	end, true)
+end
 
+if food.bing["apple"] ~= "none" then
 	food.module("carrot", function()
 		minetest.register_craftitem(":food:carrot", {
 			description = S("Carrot"),
@@ -109,41 +118,7 @@ food.module("carrot", function()
 		food.craft({
 			output = "food:carrot",
 			recipe = {
-			{"default:apple", "default:apple", "default:apple"},
+				{food.bing["apple"], food.bing["apple"], food.bing["apple"]},
-		}
-	})
-end, true)
-
-food.module("milk", function()
-	minetest.register_craftitem(":food:milk", {
-		description = S("Milk"),
-		image = "food_milk.png",
-		on_use = food.item_eat(1),
-		groups = { eatable=1, food_milk = 1 },
-		stack_max=10
-	})
-	food.craft({
-		output = "food:milk",
-		recipe = {
-			{"default:sand"},
-			{"bucket:bucket_water"}
-		},
-		replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}},
-	})
-end, true)
-
-food.module("egg", function()
-	minetest.register_craftitem(":food:egg", {
-		description = S("Egg"),
-		inventory_image = "food_egg.png",
-		groups = {food_egg=1}
-	})
-	food.craft({
-		output = "food:egg",
-		recipe = {
-			{"", "default:sand", ""},
-			{"default:sand", "", "default:sand"},
-			{"", "default:sand", ""}
 			}
 		})
 	end, true)
@@ -157,44 +132,57 @@ food.module("cocoa", function()
 		food.craft({
 			output = "food:cocoa",
 			recipe = {
-			{"", "default:apple", ""},
+				{"", food.bing["apple"], ""},
-			{"default:apple", "", "default:apple"},
+				{food.bing["apple"], "", food.bing["apple"]},
-			{"", "default:apple", ""}
+				{"", food.bing["apple"], ""}
 			}
 		})
 	end, true)
-
-food.module("meat", function()
-	minetest.register_craftitem(":food:meat", {
-		description = S("Venison"),
-		inventory_image = "food_meat.png",
-		groups = {food_meat=1, food_chicken=1}
-	})
-	food.craft({
-		type = "cooking",
-		output = "food:meat",
-		recipe = "group:food_meat_raw",
-		cooktime = 30
-	})
-
-	if not minetest.get_modpath("animalmaterials") then
-		minetest.register_craftitem(":food:meat_raw", {
-			description = S("Raw meat"),
-			image = "food_meat_raw.png",
-			on_use = food.item_eat(1),
-			groups = { meat=1, eatable=1, food_meat_raw=1 },
-			stack_max=25
-		})
-		food.craft({
-			output = "food:meat_raw",
-			recipe = {
-				{"default:apple"},
-				{"default:dirt"}
-			}
-		})
 end
-end, true)
 
+if (food.bing["bucket_water"] ~= "none" or food.bing["bucket_river_water"] ~= "none" )
+and food.bing["sand"] ~= "none" then
+	local repl_bucket = food.bing["bucket_empty"] ~= "none" and
+		{{"group:food_water_bucket", food.bing["bucket_empty"]}} or nil
+	
+	food.module("milk", function()
+		minetest.register_craftitem(":food:milk", {
+			description = S("Milk"),
+			image = "food_milk.png",
+			on_use = food.item_eat(1),
+			groups = { eatable=1, food_milk = 1 },
+			stack_max=10
+		})
+		food.craft({
+			output = "food:milk",
+			recipe = {
+				{"group:food_wheat"},
+				{"group:food_water_bucket"}
+			},
+			replacements = repl_bucket
+		})
+	end, true)
+end
+
+if food.bing["sand"] ~= "none" then
+	food.module("egg", function()
+		minetest.register_craftitem(":food:egg", {
+			description = S("Egg"),
+			inventory_image = "food_egg.png",
+			groups = {food_egg=1}
+		})
+		food.craft({
+			output = "food:egg",
+			recipe = {
+				{"", food.bing["sand"], ""},
+				{food.bing["sand"], "", food.bing["sand"]},
+				{"", food.bing["sand"], ""}
+			}
+		})
+	end, true)
+end
+
+if food.bing["papyrus"] ~= "none" then
 	food.module("sugar", function()
 		minetest.register_craftitem(":food:sugar", {
 			description = S("Sugar"),
@@ -203,12 +191,29 @@ food.module("sugar", function()
 		})
 
 		minetest.register_craft({
-		output = "food:sugar 20",
+			type = "shapeless",
+			output = "food:sugar",
+			recipe = {food.bing["papyrus"]},
+		})
+	end, true)
+end
+
+if food.bing["clay"] ~= "none" then
+	food.module("bowl", function()
+		minetest.register_craftitem(":food:bowl",{
+			description = S("Bowl"),
+			inventory_image = "food_bowl.png",
+			groups = {food_bowl=1}
+		})
+		food.craft({
+			output = "food:bowl",
 			recipe = {
-			{"default:papyrus"},
+				{food.bing["clay"],"",food.bing["clay"]},
+				{"",food.bing["clay"],""}
 			}
 		})
 	end, true)
+end
 
 food.module("chocolate_powder", function()
 	minetest.register_craftitem(":food:chocolate_powder", {
@@ -239,50 +244,25 @@ food.module("pasta", function()
 	})
 end, true)
 
-food.module("bowl", function()
-	minetest.register_craftitem(":food:bowl",{
-		description = S("Bowl"),
-		inventory_image = "food_bowl.png",
-		groups = {food_bowl=1}
-	})
-	food.craft({
-		output = "food:bowl",
-		recipe = {
-			{"default:clay_lump","","default:clay_lump"},
-			{"","default:clay_lump",""}
-		}
-	})
-end, true)
-
 food.module("butter", function()
 	minetest.register_craftitem(":food:butter", {
 		description = S("Butter"),
 		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 = {
 			{"group:food_milk","group:food_milk"},
 		}
 	})
+	local replacements = food.bing["bucket_empty"] ~= "none" and {{"group:food_milkbucket", food.bing["bucket_empty"].." 2"}}
+		or nil
+	food.craft({
+		output = "food:butter 2",
+		recipe = {{"group:food_milkbucket","group:food_milkbucket"}},
+		replacements = replacements
+	})
 end, true)
 
 food.module("cheese", function()
@@ -299,12 +279,3 @@ food.module("cheese", function()
 		}
 	})
 end, true)
-
-if (minetest.get_modpath("animalmaterials") and not minetest.get_modpath("mobfcooking")) then
-	food.craft({
-		type = "cooking",
-		output = "food:meat",
-		recipe = "animalmaterials:meat_raw",
-		cooktime = 30
-	})
-end

food_basic/init.lua

@@ -6,18 +6,31 @@
 -- Some basic foods
 -- =====================================
 
-print("Food Mod - Version 2.3")
+print("Food Mod - Version 2.4")
 
+-- Boilerplate to support localized strings.
+food_basic = {}
+local S = minetest.get_translator("food_basic")
+food_basic.get_translator = S
+
+dofile(minetest.get_modpath("food_basic").."/settings.lua")
 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.
+-- Register Venison
-local S = 0
+food.module("meat_cooked", function()
-if minetest.get_modpath("intllib") then
+	minetest.register_craftitem(":food:meat", {
-	S = intllib.Getter()
+		description = S("Venison"),
-else
+		inventory_image = "food_meat.png",
-	S = function ( s ) return s end
+		groups = {food_meat=1, food_meat_cooked=1}
-end
+	})
+	food.craft({
+		type = "cooking",
+		output = "food:meat",
+		recipe = "group:food_meat_raw",
+		cooktime = 30
+	})
+end)
 
 -- Register dark chocolate
 food.module("dark_chocolate", function()
@@ -48,7 +61,10 @@ food.module("milk_chocolate", function()
 		recipe = {
 				{"","group:food_milk",""},
 				{"group:food_cocoa","group:food_cocoa","group:food_cocoa"}
-		}
+		},
+		replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"},
+			{"mobs:glass_milk", "vessels:drinking_glass"},
+			{"farming:soy_milk", "vessels:drinking_glass"}}
 	})
 end)
 
@@ -89,19 +105,17 @@ food.module("pasta_bake", function()
 			{"group:food_cheese"},
 			{"group:food_pasta"},
 			{"group:food_bowl"}
-		}
+		},
 	})
 end)
 
 -- Register Soups
-local chicken = "meat"
-if minetest.get_modpath("mobs") and mobs.mod == "redo" then
-	chicken = "chicken"
-end
 local soups = {
 	{"tomato", "tomato"},
-	{"chicken", chicken}
+	{"chicken", "meat_raw"}
 }
+local repl_bucket = food.bing["bucket_empty"] ~= "none" and
+	{{"group:food_water_bucket", food.bing["bucket_empty"].." 2"}} or nil
 for i=1, #soups do
 	local flav = soups[i]
 	food.module("soup_"..flav[1], function()
@@ -114,7 +128,6 @@ for i=1, #soups do
 		minetest.register_craftitem(":food:soup_"..flav[1].."_raw",{
 			description = S("Uncooked ".. flav[1].." Soup"),
 			inventory_image = "food_soup_"..flav[1].."_raw.png",
-
 		})
 		food.craft({
 			type = "cooking",
@@ -125,10 +138,10 @@ for i=1, #soups do
 			output = "food:soup_"..flav[1].."_raw",
 			recipe = {
 				{"", "", ""},
-				{"bucket:bucket_water", "group:food_"..flav[2], "bucket:bucket_water"},
+				{"group:food_water_bucket", "group:food_"..flav[2], "group:food_water_bucket"},
 				{"", "group:food_bowl", ""},
 			},
-			replacements = {{"bucket:bucket_water", "bucket:bucket_empty"},{"bucket:bucket_water", "bucket:bucket_empty"}}
+			replacements = repl_bucket
 		})
 	end)
 end
@@ -141,14 +154,15 @@ for i=1, #juices do
 		minetest.register_craftitem(":food:"..flav.."_juice", {
 			description = S(flav.." Juice"),
 			inventory_image = "food_"..flav.."_juice.png",
-			on_use = food.item_eat(2),
+			on_use = food.item_eat(2, food.bing["cup"]),
+			groups = {["food_"..flav.."_juice"] = 1, vessel = 1}
 		})
 		food.craft({
-			output = "food:"..flav.."_juice 4",
+			output = "food:"..flav.."_juice",
 			recipe = {
 				{"","",""},
 				{"","group:food_"..flav,""},
-				{"","group:food_cup",""},
+				{"",food.bing["cup"],""},
 			}
 		})
 	end)
@@ -158,15 +172,26 @@ food.module("rainbow_juice", function()
 	minetest.register_craftitem(":food:rainbow_juice", {
 		description = S("Rainbow Juice"),
 		inventory_image = "food_rainbow_juice.png",
-		on_use = food.item_eat(20),
+		on_use = food.item_eat(20, food.bing["cup"]),
+		groups = { vessel = 1 }
 	})
 
+	if minetest.registered_items["default:nyancat_rainbow"] then
 		food.craft({
 			output = "food:rainbow_juice 99",
 			recipe = {
 				{"","",""},
 				{"","default:nyancat_rainbow",""},
-			{"","group:food_cup",""},
+				{"",food.bing["cup"],""},
+			}
+		})
+	end
+	food.craft({
+			output = "food:rainbow_juice 3",
+			recipe = {
+				{"group:food_apple_juice","group:food_apple_juice","group:food_apple_juice"},
+				{"group:food_orange_juice","group:food_orange_juice","group:food_orange_juice"},
+				{"group:food_cactus_juice","group:food_cactus_juice","group:food_cactus_juice"}
 			}
 	})
 end)

food_basic/locale/de.txt

@@ -1,37 +0,0 @@
-# Translation by Xanthin and hawkril
-
-Wheat = Weizen
-Flour = Mehl
-Potato = Kartoffel
-Tomato = Tomate
-Carrot = Karotte
-Orange =
-Milk = Milch
-Egg = Ei
-Cocoa Bean = Kakaobohne
-Raw meat = rohes Fleisch
-Venison = Wildbret
-Sugar = Zucker
-Chocolate Powder = Schokoladenpulver
-Dark Chocolate = Dunkle Schokolade
-Milk Chocolate = Vollmilchschokolade
-Pasta = Nudeln
-Bowl = Schuessel
-Butter = Butter
-Cheese = Kaese
-Baked Potato = Ofenkartoffel
-Pasta Bake = Nudelauflauf
-Raw Pasta Bake = Ungekochter Nudelauflauf
-chicken Soup = Huehnersuppe
-tomato Soup = Tomatensuppe
-Uncooked tomato Soup = Ungekochte Tomatensuppe
-Uncooked chicken Soup = Ungekochte Huehnersuppe
-apple Juice = Apfelsaft
-cactus Juice = Kaktussaft
-Rainbow Juice = Regenbogensaft
-Cake = Kuchen
-Chocolate Cake = Schokoladenkuchen
-Carrot Cake = Karottenkuchen
-Cake Mix = Backmischung
-Chocolate Cake Mix = Backmischung fuer Schokoladenkuchen
-Carrot Cake Mix = Backmischung fuer Karottenkuchen

food_basic/locale/es.txt

@@ -1,40 +0,0 @@
-# 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/food_basic.de.tr

@@ -0,0 +1,45 @@
+# textdomain: food_basic
+# Translation by Xanthin and hawkril
+
+### init.lua ###
+Venison=Wildbret
+Dark Chocolate=Dunkle Schokolade
+Milk Chocolate=Vollmilchschokolade
+Baked Potato=Ofenkartoffel
+Pasta Bake=Nudelauflauf
+Raw Pasta Bake=Ungekochter Nudelauflauf
+chicken Soup=Huehnersuppe
+tomato Soup=Tomatensuppe
+Uncooked tomato Soup=Ungekochte Tomatensuppe
+Uncooked chicken Soup=Ungekochte Huehnersuppe
+apple Juice=Apfelsaft
+orange Juice=Orangensaft
+cactus Juice=Kaktussaft
+Rainbow Juice=Regenbogensaft
+Cake=Kuchen
+Cake Mix=Backmischung
+Chocolate Cake=Schokoladenkuchen
+Chocolate Cake Mix=Backmischung fuer Schokoladenkuchen
+Carrot Cake=Karottenkuchen
+Carrot Cake Mix=Backmischung fuer Karottenkuchen
+Cheese cake=Käsekuchen
+Cheese Cake Mix=Käsekuchen-Mix
+
+
+### ingredients.lua ###
+Wheat=Weizen
+Flour=Mehl
+Potato=Kartoffel
+Raw meat=rohes Fleisch
+Orange=Orange
+Tomato=Tomate
+Carrot=Karotte
+Cocoa Bean=Kakaobohne
+Milk=Milch
+Egg=Ei
+Sugar=Zucker
+Bowl=Schuessel
+Chocolate Powder=Schokoladenpulver
+Pasta=Nudeln
+Butter=Butter
+Cheese=Kaese

food_basic/locale/food_basic.es.tr

@@ -0,0 +1,44 @@
+# textdomain: food_basic
+
+### init.lua ###
+Venison=Venado
+Dark Chocolate=Chocolate Oscuro
+Milk Chocolate=Chocolate con Leche
+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
+orange Juice=Jugo de naranja
+cactus Juice=Jugo de cácto
+Rainbow Juice=Jugo de arcoíris
+Cake=Pastel
+Cake Mix=Mezcla para Pastel
+Chocolate Cake=Pastel de Chocolate
+Chocolate Cake Mix=Mezcla para Pastel de Chocolate
+Carrot Cake=Pastel de Zanahoria
+Carrot Cake Mix=Mezcla para Pastel de Zanahoria
+Cheese cake=Pastel de Queso
+Cheese Cake Mix=Mezcla para Pastel de Queso
+
+
+### ingredients.lua ###
+Wheat=Trigo
+Flour=Harina
+Potato=Patata
+Raw meat=Carne cruda
+Orange=Naranja
+Tomato=Tomate
+Carrot=Zanahoria
+Cocoa Bean=Grano de Cacao
+Milk=Leche
+Egg=Huevo
+Sugar=Azúcar
+Bowl=Cuenco
+Chocolate Powder=Polvo de Chocolate
+Pasta=Pasta
+Butter=Manteca
+Cheese=Queso

food_basic/locale/food_basic.fr.tr

@@ -0,0 +1,44 @@
+# textdomain: food_basic
+
+### init.lua ###
+Venison=Venaison
+Dark Chocolate=Chocolat noir
+Milk Chocolate=Chocolat au lait
+Baked Potato=Pomme de terre cuite
+Pasta Bake=Plat de pâtes
+Raw Pasta Bake=Plat de pâtes crues
+chicken Soup=Soupe de poulet
+tomato Soup=Soupe de tomate
+Uncooked tomato Soup=Soupe de tomate crue
+Uncooked chicken Soup=Soupe de poulet crue
+apple Juice=Jus de pomme
+orange Juice=Jus d'orange
+cactus Juice=Jus de cactus
+Rainbow Juice=Jus d'arc-en-ciel
+Cake=Gâteau
+Cake Mix=Pâte pour gâteau
+Chocolate Cake=Gâteau au chocolat
+Chocolate Cake Mix=Pâte pour gâteau au chocolat
+Carrot Cake=Gâteau à la carotte
+Carrot Cake Mix=Pâte pour gâteau à la carotte
+Cheese cake=Gâteau au fromage
+Cheese Cake Mix=Pâte pour gâteau au fromage
+
+
+### ingredients.lua ###
+Wheat=Blé
+Flour=Farine
+Potato=Pomme de terre
+Raw meat=Viande crue
+Orange=Orange
+Tomato=Tomate
+Carrot=Carotte
+Cocoa Bean=Fève de caco
+Milk=Lait
+Egg=Oeuf
+Sugar=Sucre
+Bowl=Bol
+Chocolate Powder=Poudre de chocolat
+Pasta=Pâtes
+Butter=Beurre
+Cheese=Fromage

food_basic/locale/food_basic.ru.tr

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

food_basic/locale/food_basic.tr.tr

@@ -0,0 +1,45 @@
+# textdomain: food_basic
+# mahmutelmas06@gmail.com
+
+### init.lua ###
+Venison=Geyik Eti
+Dark Chocolate=Bitter çikolata
+Milk Chocolate=Sütlü çikolata
+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
+orange Juice=Portakal suyu
+cactus Juice=Kaktüs suyu
+Rainbow Juice=Gökkuşağı suyu
+Cake=Kek
+Cake Mix=Pişmemiş kek
+Chocolate Cake=Çikolatalı kek
+Chocolate Cake Mix=Pişmemiş çikolatalı kek
+Carrot Cake=Havuçlu kek
+Carrot Cake Mix=Pişmemiş havuçlu kek
+Cheese cake=Peynirli kek
+Cheese Cake Mix=Pişmemiş peynirli kek
+
+
+### ingredients.lua ###
+Wheat=Buğday
+Flour=Un
+Potato=Patates
+Raw meat=Çiğ et
+Orange=Portakal
+Tomato=Domates
+Carrot=Havuç
+Cocoa Bean=Kakao Çekirdeği
+Milk=Süt
+Egg=Yumurta
+Sugar=Şeker
+Bowl=Kase
+Chocolate Powder=Çikolata tozu
+Pasta=Makarna
+Butter=Tereyağı
+Cheese=Peynir

food_basic/locale/fr.txt

@@ -1,40 +0,0 @@
-# Traduction française / French translation
-
-Wheat = Blé
-Flour = Farine
-Potato = Pomme de terre
-Tomato = Tomate
-Carrot = Carotte
-Orange = Orange
-Milk = Lait
-Egg = Oeuf
-Cocoa Bean = Fève de caco
-Raw meat = Viande crue
-Venison = Venaison
-Sugar = Sucre
-Chocolate Powder = Poudre de chocolat
-Dark Chocolate = Chocolat noir
-Milk Chocolate = Chocolat blanc
-Pasta = Pâtes
-Bowl = Bol
-Butter = Beurre
-Cheese = Fromage
-Baked Potato = Pomme de terre cuite
-Pasta Bake = Plat de pâtes
-Raw Pasta Bake = Plat de pâtes crues
-chicken Soup = Soupe de poulet
-tomato Soup = Soupe de tomate
-Uncooked tomato Soup = Soupe de tomate crue
-Uncooked chicken Soup = Soupe de poulet crue
-apple Juice = Jus de pomme
-cactus Juice = Jus de cactus
-Rainbow Juice = Jus d'arc-en-ciel
-Orange Juice = Jus d'orange
-Cake = Gâteau
-Chocolate Cake = Gâteau au chocolat
-Carrot Cake = Gâteau à la carotte
-Cheese cake = Gâteau au fromage
-Cake Mix = Pâte pour gâteau
-Chocolate Cake Mix = Pâte pour gâteau au chocolat
-Carrot Cake Mix = Pâte pour gâteau à la carotte
-Cheese Cake Mix = Pâte pour gâteau au fromage

food_basic/locale/ru.txt

@@ -1,37 +0,0 @@
-# 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/template.txt

@@ -1,24 +1,9 @@
-# template
+# textdomain: food_basic
 
-Wheat =
+### init.lua ###
-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=
@@ -27,14 +12,33 @@ tomato Soup =
 Uncooked tomato Soup=
 Uncooked chicken Soup=
 apple Juice=
+orange Juice=
 cactus Juice=
 Rainbow Juice=
-Orange Juice =
 Cake=
-Chocolate Cake =
-Carrot Cake =
-Cheese cake =
 Cake Mix=
+Chocolate Cake=
 Chocolate Cake Mix=
+Carrot Cake=
 Carrot Cake Mix=
+Cheese cake=
 Cheese Cake Mix=
+
+
+### ingredients.lua ###
+Wheat=
+Flour=
+Potato=
+Raw meat=
+Orange=
+Tomato=
+Carrot=
+Cocoa Bean=
+Milk=
+Egg=
+Sugar=
+Bowl=
+Chocolate Powder=
+Pasta=
+Butter=
+Cheese=

food_basic/locale/tr.txt

@@ -1,40 +0,0 @@
-# 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/mod.conf

@@ -0,0 +1,5 @@
+name = food_basic
+title = Food Basic
+description = The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices.
+depends = food
+optional_depends = animalmaterials,bucket,bushes,bushes_classic,default,docfarming,ethereal,farming,farming_plus,intllib,jkanimals,jkfarming,my_mobs,mobs,mobs_animal,mobfcooking,mtfoods,plantlib,veggies,vessels

food_basic/settings.lua

@@ -0,0 +1,16 @@
+food.bing = {} -- List of basic ingredients defined from Minetest settings
+
+local settings = minetest.settings
+
+food.bing["desert_sand"] = settings:get("basic_food_desert_sand") or "default:desert_sand"
+food.bing["sand"] = settings:get("basic_food_sand") or "default:sand"
+food.bing["dry_shrub"] = settings:get("basic_food_dry_shrub") or "default:dry_shrub"
+food.bing["dirt"] = settings:get("basic_food_dirt") or "default:dirt"
+food.bing["apple"] = settings:get("basic_food_apple") or "default:apple"
+food.bing["cactus"] = settings:get("basic_food_cactus") or "default:cactus"
+food.bing["bucket_water"] = settings:get("basic_food_bucket_water") or "bucket:bucket_water"
+food.bing["bucket_river_water"] = settings:get("basic_food_bucket_river_water") or "bucket:bucket_river_water"
+food.bing["bucket_empty"] = settings:get("basic_food_bucket_empty") or "bucket:bucket_empty"
+food.bing["papyrus"] = settings:get("basic_food_papyrus") or "default:papyrus"
+food.bing["clay"] = settings:get("basic_food_clay") or "default:clay_lump"
+food.bing["cup"] = settings:get("basic_food_cup") or "vessels:drinking_glass"

food_basic/settingtypes.txt

@@ -0,0 +1,49 @@
+[Basic Ingredients]
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:dirt".
+# If you want disable this ingredient you must write "none".
+basic_food_dirt (Ingredient for potato, raw meat) string default:dirt
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:sand".
+# If you want disable this ingredient you must write "none".
+basic_food_sand (Ingredient for egg) string default:sand
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:desert_sand".
+# If you want disable this ingredient you must write "none".
+basic_food_desert_sand (Ingredient for orange, tomato) string default:desert_sand
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:apple".
+# If you want disable this ingredient you must write "none".
+basic_food_apple (Ingredient for potato, cocoa bean, raw meat, carrot, apple juice) string default:apple
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:cactus".
+# If you want disable this ingredient you must write "none".
+basic_food_cactus (Ingredient for cactus juice) string default:cactus
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:dry_shrub".
+# If you want disable this ingredient you must write "none".
+basic_food_dry_shrub (Ingredient for wheat) string default:dry_shrub
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "bucket:bucket_water".
+# If you want disable this ingredient you must write "none".
+basic_food_bucket_water (Ingredient for milk, tomato soup, chicken soup) string bucket:bucket_water
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "bucket:bucket_river_water".
+# If you want disable this ingredient you must write "none".
+basic_food_bucket_river_water (In the same group as basic_food_bucket_water) string bucket:bucket_river_water
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "bucket:bucket_empty".
+# If you want disable this ingredient you must write "none".
+basic_food_bucket_empty (Item replacement when cooking with the above two ingredients) string bucket:bucket_empty
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:papyrus".
+# If you want disable this ingredient you must write "none".
+basic_food_papyrus (Ingredient for sugar) string default:papyrus
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "default:clay_lump".
+# If you want disable this ingredient you must write "none".
+basic_food_clay (Ingredient for bowl) string default:clay_lump
+# Basic ingredient you may use instead of the default one defined by the mod.
+# Default is "vessels:drinking_glass".
+# If you want disable this ingredient you must write "none".
+basic_food_cup (Ingredient for apple|orange|cactus juice) string vessels:drinking_glass

food_basic/support.lua

@@ -12,35 +12,52 @@
 -- good for the end user
 
 -- Add support for other mods
-food.support("cocoa", "farming_plus:cocoa_bean")
+food.support("flour", {
-food.support("cup", "vessels:drinking_glass")
+	"farming:flour",
-food.support("cactus", "default:cactus")
+	"farming:flour_multigrain",
-food.support("apple", "default:apple")
+})
+food.support("wheat", "farming:wheat")
+food.support("bowl", "farming:bowl")
+food.support("cocoa", {"farming_plus:cocoa_bean", "farming:cocoa_beans"})
+food.support("cup", food.bing["cup"])
+food.support("cactus", food.bing["cactus"])
+food.support("apple", food.bing["apple"])
 food.support("orange", {
 	"farming_plus:orange_item",
-	"ethereal:orange",
+	"ethereal:orange"
 })
 food.disable_if("ethereal", "orange")
 
 food.support("potato", {
 	"docfarming:potato",
 	"veggies:potato",
-	"farming_plus:potato_item"
+	"farming_plus:potato_item",
+	"farming:potato"
 })
 food.support("tomato", {
 	"farming_plus:tomato_item",
-	"plantlib:tomato"
+	"plantlib:tomato",
+	"farming:tomato"
 })
 food.support("carrot", {
 	"farming_plus:carrot_item",
 	"docfarming:carrot",
 	"plantlib:carrot",
-	"jkfarming:carrot"
+	"jkfarming:carrot",
+	"farming:carrot"
 })
 food.support("milk", {
 	"animalmaterials:milk",
 	"my_mobs:milk_glass_cup",
-	"mtfoods:dandelion_milk"
+	"mtfoods:dandelion_milk",
+	"mobs:glass_milk",
+	"farming:soy_milk"
+})
+food.support("butter", "mobs:butter")
+food.support("cheese", "mobs:cheese")
+food.support("water_bucket", {
+	food.bing["bucket_water"],
+	food.bing["bucket_river_water"]
 })
 food.support("milkbucket", {
 	"jkanimals:bucket_milk",
@@ -52,42 +69,33 @@ food.support("egg", {
 	"jkanimals:egg",
 	"mobs:egg"
 })
-food.support("meat", {
+food.support("meat_cooked", {
 	"mobs:meat",
 	"jkanimals:meat",
 	"mobfcooking:cooked_pork",
 	"mobfcooking:cooked_beef",
 	"mobfcooking:cooked_chicken",
 	"mobfcooking:cooked_lamb",
-	"mobfcooking:cooked_venison"
+	"mobfcooking:cooked_venison",
+	"farming:tofu_cooked"
+})
+food.support("meat_raw", {
+	"mobs:meat_raw",
+	"mobs:chicken_raw",
+	"farming:tofu"
 })
 food.support("sugar", {
 	"jkfarming:sugar",
 	"bushes:sugar",
-	"mtfoods:sugar"
+	"mtfoods:sugar",
+	"mobs:honey",
+	"farming:sugar"
 })
-
+food.support("cactus_juice", "farming:cactus_juice")
-if farming and farming.mod == "redo" then
+food.support("orange_juice", "farming:carrot_juice", true)
-	food.support("wheat", "farming:wheat")
+food.support("apple_juice", "farming:pineapple_juice", true)
-	food.support("flour", "farming:flour")
-	food.support("carrot", "farming:carrot")
-	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("baked_potato", "farming:baked_potato")
-	food.support("cup", "farming:drinking_cup")
+food.support("pasta", "farming:pasta")
-	food.disable_if("farming", "baked_potato")
+food.support("soup_tomato", "farming:tomato_soup")
-else
+minetest.register_alias("food:soup_tomato", "farming:tomato_soup")
-	food.support("wheat", "farming:wheat")
-	food.support("flour", "farming:flour")
-end
-
-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