diff --git a/.gitmodules b/.gitmodules index 239bf813..ef37b892 100644 --- a/.gitmodules +++ b/.gitmodules @@ -91,10 +91,6 @@ path = mods/camera url = https://github.com/sys4-fr/camera.git branch = dev -[submodule "mods/mobs"] - path = mods/mobs - url = https://github.com/sys4-fr/mobs_redo.git - branch = nalc [submodule "mods/mob_horse"] path = mods/mob_horse url = https://github.com/tenplus1/mob_horse.git @@ -102,3 +98,19 @@ path = mods/kpgmobs url = https://github.com/sys4-fr/mod-kpgmobs.git branch = nalc +[submodule "mods/diet"] + path = mods/diet + url = https://github.com/sys4-fr/diet.git +[submodule "mods/food"] + path = mods/food + url = https://github.com/sys4-fr/food.git +[submodule "mods/food_sweet"] + path = mods/food_sweet + url = https://github.com/sys4-fr/food_sweet.git +[submodule "mods/mtfoods"] + path = mods/mtfoods + url = https://github.com/sys4-fr/mtfoods.git +[submodule "mods/mobs"] + path = mods/mobs + url = https://github.com/sys4-fr/mobs_redo.git + branch = nalc diff --git a/mods/diet b/mods/diet new file mode 160000 index 00000000..98576528 --- /dev/null +++ b/mods/diet @@ -0,0 +1 @@ +Subproject commit 985765280998c137683bfa18b203b2780cafad0c diff --git a/mods/food b/mods/food new file mode 160000 index 00000000..9838eb56 --- /dev/null +++ b/mods/food @@ -0,0 +1 @@ +Subproject commit 9838eb56c9cad5de3ecfbb1354b74c9f4e22aae3 diff --git a/mods/food/.gitignore b/mods/food/.gitignore deleted file mode 100755 index a89a5c65..00000000 --- a/mods/food/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~* diff --git a/mods/food/README.md b/mods/food/README.md deleted file mode 100755 index 2aabaaac..00000000 --- a/mods/food/README.md +++ /dev/null @@ -1,44 +0,0 @@ -Food -==== - -This is the main mod in the food mod collection. - -Version 2.3 - -The Aims --------- - -All content should follow these aims: -* Basis for expansion - supplies a framework of ingredients for other mods to build upon -* Mod support without dependancies - this allows flexibility for the user -* Minetest-game worthy - (Minimalism) This mod only contains traditional foods - such as cakes, soups and bread. - -Documentation -------------- - -Recipe guide: https://www.dropbox.com/s/tsvjmobv9n3isu0/food_crafting.pdf?dl=1 - -Expansion Packs ---------------- - -There are expansion mods available. Just install them in a mod folder, and everything should be fine. - -* Sweet Foods - https://github.com/rubenwardy/food_sweet -* Modern food (Needs updating) - burgers, soft drinks, pop corn, coffee, etc - -Licensing ---------- - -Created by rubenwardy -License for code: GPL 3.0 or later. -License for textures: CC-BY-SA - -Exceptions: - -* Baked potato texture by Doc, WTFPL -* Dough, flour and wheat textures from default farming mod, WTFPL -* Orange from farming_plus, WTFPL -* Egg and milk textures from Mobf, CC BY SA -* Orange juice texture by CiaranG (modified from rubenwardy's apple juice texture) - -Have I missed out credit? Please tell me. diff --git a/mods/food/description.txt b/mods/food/description.txt deleted file mode 100755 index eb392e01..00000000 --- a/mods/food/description.txt +++ /dev/null @@ -1 +0,0 @@ -The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices. diff --git a/mods/food/food/depends.txt b/mods/food/food/depends.txt deleted file mode 100755 index 7b8bb875..00000000 --- a/mods/food/food/depends.txt +++ /dev/null @@ -1,4 +0,0 @@ -diet? -hud? -intllib? -hbhunger? diff --git a/mods/food/food/description.txt b/mods/food/food/description.txt deleted file mode 100755 index 1c7469fa..00000000 --- a/mods/food/food/description.txt +++ /dev/null @@ -1 +0,0 @@ -(API framework) The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices. diff --git a/mods/food/food/init.lua b/mods/food/food/init.lua deleted file mode 100755 index 0106f3d9..00000000 --- a/mods/food/food/init.lua +++ /dev/null @@ -1,153 +0,0 @@ --- FOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> food/api.lua --- The supporting api for the mod --- ===================================== - -food = { - modules = {}, - disabled_modules = {}, - debug = false, - version = 2.3 -} - --- Checks for external content, and adds support -function food.support(group, item) - if type(group) == "table" then - for i = 1, #group do - food.support(group[i], item) - end - return - end - if type(item) == "table" then - for i = 1, #item do - food.support(group, item[i]) - end - return - end - - local idx = string.find(item, ":") - if idx <= 1 then - error("[Food Error] food.support - error in item name ('" .. item .. "')") - end - local mod = string.sub(item, 1, idx - 1) - - if not minetest.get_modpath(mod) then - if food.debug then - print("[Food Debug] Mod '"..mod.."' is not installed") - end - return - end - - local data = minetest.registered_items[item] - if not data then - print("[Food Warning] Item '"..item.."' not found") - return - end - - - food.disable(group) - - -- Add group - local g = {} - if data.groups then - for k, v in pairs(data.groups) do - g[k] = v - end - end - g["food_"..group] = 1 - minetest.override_item(item, {groups = g}) -end - -function food.disable(name) - if type(name) == "table" then - for i = 1, #name do - food.disable(name[i]) - end - return - end - food.disabled_modules[name] = true -end - -function food.disable_if(mod, name) - if minetest.get_modpath(mod) then - food.disable(name) - end -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.debug then - print("[Food Debug] Registering " .. name .. " fallback definition") - end - elseif food.debug then - print("[Food Debug] Module " .. name) - end - func() -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 - return diet.item_eat(amt) - elseif minetest.get_modpath("hud") and 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 - return hbhunger.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 -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 - minetest.register_craftitem(name,{ - description = data.description, - inventory_image = data.inventory_image, - groups = data.groups, - on_use = data.on_use - }) - else - local newdata = { - description = data.description, - tiles = data.tiles, - groups = data.groups, - on_use = data.on_use, - walkable = false, - sunlight_propagates = true, - drawtype = "nodebox", - paramtype = "light", - node_box = data.node_box - } - if (minetest.setting_getbool("food_2d_inv_image")) then - newdata.inventory_image = data.inventory_image - end - minetest.register_node(name,newdata) - end -end - --- Allows for overriding in the future -function food.craft(craft) - minetest.register_craft(craft) -end - diff --git a/mods/food/food_basic/README.md b/mods/food/food_basic/README.md deleted file mode 100755 index c5dcd0ca..00000000 --- a/mods/food/food_basic/README.md +++ /dev/null @@ -1,42 +0,0 @@ -The Food Mod -============ - -This is the main mod in the food mod collection. - -Version 2.3 - -The Aims --------- - -All content should follow these aims: -* Basis for expansion - supplies a framework of ingredients for other mods to build upon -* Mod support without dependancies - this allows flexibility for the user -* Minetest-game worthy - (Minimalism) This mod only contains traditional foods - such as cakes, soups and bread. - -Documentation -------------- - -Recipe guide: https://www.dropbox.com/s/tsvjmobv9n3isu0/food_crafting.pdf?dl=1 - -Expansion Packs ---------------- - -There are expansion mods available. Just install them in a mod folder, and everything should be fine. - -* Sweet Foods - https://github.com/rubenwardy/food_sweet -* Modern food (Needs updating) - burgers, soft drinks, pop corn, coffee, etc - -Licensing ---------- - -Created by rubenwardy -License for code: GPL 3.0 or later. -License for textures: CC-BY-SA - -Exceptions: - -* Baked potato texture by Doc, WTFPL -* Dough, flour and wheat textures from default farming mod, WTFPL -* Egg and milk textures from Mobf, CC BY SA - -Have I missed out credit? Please tell me. diff --git a/mods/food/food_basic/depends.txt b/mods/food/food_basic/depends.txt deleted file mode 100755 index bb93f511..00000000 --- a/mods/food/food_basic/depends.txt +++ /dev/null @@ -1,16 +0,0 @@ -food -animalmaterials? -bushes_classic? -default? -docfarming? -farming? -farming_plus? -intllib? -jkanimals? -jkfarming? -my_mobs? -mobs? -mobfcooking? -plantlib? -veggies? -vessels? diff --git a/mods/food/food_basic/description.txt b/mods/food/food_basic/description.txt deleted file mode 100755 index eb392e01..00000000 --- a/mods/food/food_basic/description.txt +++ /dev/null @@ -1 +0,0 @@ -The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices. diff --git a/mods/food/food_basic/ingredients.lua b/mods/food/food_basic/ingredients.lua deleted file mode 100755 index 61f2065e..00000000 --- a/mods/food/food_basic/ingredients.lua +++ /dev/null @@ -1,287 +0,0 @@ --- FOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> food_basic/ingredients.lua --- Fallback ingredients --- ===================================== - --- 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()) -else - S = function ( s ) return s end -end - -food.module("wheat", function() - minetest.register_craftitem(":food:wheat", { - description = S("Wheat"), - inventory_image = "food_wheat.png", - groups = {food_wheat=1} - }) - - food.craft({ - output = "food:wheat", - recipe = { - {"default:dry_shrub"}, - } - }) -end, true) - -food.module("flour", function() - minetest.register_craftitem(":food:flour", { - description = S("Flour"), - inventory_image = "food_flour.png", - groups = {food_flour = 1} - }) - food.craft({ - output = "food:flour", - recipe = { - {"group:food_wheat"}, - {"group:food_wheat"} - } - }) -end, true) - -food.module("potato", function() - minetest.register_craftitem(":food:potato", { - description = S("Potato"), - inventory_image = "food_potato.png", - groups = {food_potato = 1} - }) - food.craft({ - output = "food:potato", - recipe = { - {"default:dirt"}, - {"default:apple"} - - } - }) -end, true) - -food.module("orange", function() - minetest.register_craftitem(":food:orange", { - description = S("Orange"), - inventory_image = "food_orange.png", - groups = {food_orange = 1} - }) - food.craft({ - output = "food:orange", - recipe = { - {"", "default:desert_sand", ""}, - {"default:desert_sand", "default:desert_sand", "default:desert_sand"}, - {"", "default:desert_sand", ""} - } - }) -end, true) - -food.module("tomato", function() - minetest.register_craftitem(":food:tomato", { - description = S("Tomato"), - inventory_image = "food_tomato.png", - groups = {food_tomato = 1} - }) - food.craft({ - output = "food:tomato", - recipe = { - {"", "default:desert_sand", ""}, - {"default:desert_sand", "", "default:desert_sand"}, - {"", "default:desert_sand", ""} - } - }) -end, true) - -food.module("carrot", function() - minetest.register_craftitem(":food:carrot", { - description = S("Carrot"), - inventory_image = "food_carrot.png", - groups = {food_carrot=1}, - on_use = food.item_eat(3) - }) - food.craft({ - output = "food:carrot", - recipe = { - {"default:apple", "default:apple", "default: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) - -food.module("cocoa", function() - minetest.register_craftitem(":food:cocoa", { - description = S("Cocoa Bean"), - inventory_image = "food_cocoa.png", - groups = {food_cocoa=1} - }) - food.craft({ - output = "food:cocoa", - recipe = { - {"", "default:apple", ""}, - {"default:apple", "", "default:apple"}, - {"", "default: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) - -food.module("sugar", function() - minetest.register_craftitem(":food:sugar", { - description = S("Sugar"), - inventory_image = "food_sugar.png", - groups = {food_sugar=1} - }) - - minetest.register_craft({ - output = "food:sugar 20", - recipe = { - {"default:papyrus"}, - } - }) -end, true) - -food.module("chocolate_powder", function() - minetest.register_craftitem(":food:chocolate_powder", { - description = S("Chocolate Powder"), - inventory_image = "food_chocolate_powder.png", - groups = {food_choco_powder = 1} - }) - food.craft({ - output = "food:chocolate_powder 16", - recipe = { - {"group:food_cocoa","group:food_cocoa","group:food_cocoa"}, - {"group:food_cocoa","group:food_cocoa","group:food_cocoa"}, - {"group:food_cocoa","group:food_cocoa","group:food_cocoa"} - } - }) -end, true) - -food.module("pasta", function() - minetest.register_craftitem(":food:pasta",{ - description = S("Pasta"), - inventory_image = "food_pasta.png", - groups = {food_pasta=1} - }) - food.craft({ - output = "food:pasta 4", - type = "shapeless", - recipe = {"group:food_flour","group:food_egg","group:food_egg"} - }) -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_milk","group:food_milk"}, - } - }) -end, true) - -food.module("cheese", function() - minetest.register_craftitem(":food:cheese", { - description = S("Cheese"), - inventory_image = "food_cheese.png", - on_use = food.item_eat(4), - groups = {food_cheese=1} - }) - food.craft({ - output = "food:cheese", - recipe = { - {"group:food_butter","group:food_butter"}, - } - }) -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 diff --git a/mods/food/food_basic/init.lua b/mods/food/food_basic/init.lua deleted file mode 100755 index 453d2877..00000000 --- a/mods/food/food_basic/init.lua +++ /dev/null @@ -1,294 +0,0 @@ --- FOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> food_basic/init.lua --- Some basic foods --- ===================================== - -minetest.log("action", "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()) -else - S = function ( s ) return s end -end - --- Register dark chocolate -food.module("dark_chocolate", function() - minetest.register_craftitem(":food:dark_chocolate",{ - description = S("Dark Chocolate"), - inventory_image = "food_dark_chocolate.png", - on_use = food.item_eat(3), - groups = {food_dark_chocolate=1} - }) - food.craft({ - output = "food:dark_chocolate", - recipe = { - {"group:food_cocoa","group:food_cocoa","group:food_cocoa"} - } - }) -end) - --- Register milk chocolate -food.module("milk_chocolate", function() - minetest.register_craftitem(":food:milk_chocolate",{ - description = S("Milk Chocolate"), - inventory_image = "food_milk_chocolate.png", - on_use = food.item_eat(3), - groups = {food_milk_chocolate=1} - }) - food.craft({ - output = "food:milk_chocolate", - recipe = { - {"","group:food_milk",""}, - {"group:food_cocoa","group:food_cocoa","group:food_cocoa"} - } - }) -end) - --- Register baked potato -food.module("baked_potato", function() - minetest.register_craftitem(":food:baked_potato", { - description = S("Baked Potato"), - inventory_image = "food_baked_potato.png", - on_use = food.item_eat(6), - }) - food.craft({ - type = "cooking", - output = "food:baked_potato", - recipe = "group:food_potato", - }) -end) - --- Register pasta bake -food.module("pasta_bake", function() - minetest.register_craftitem(":food:pasta_bake",{ - description = S("Pasta Bake"), - inventory_image = "food_pasta_bake.png", - on_use = food.item_eat(4), - groups = {food=3} - }) - minetest.register_craftitem(":food:pasta_bake_raw",{ - description = S("Raw Pasta Bake"), - inventory_image = "food_pasta_bake_raw.png", - }) - food.craft({ - output = "food:pasta_bake", - type = "cooking", - recipe = "food:pasta_bake_raw" - }) - food.craft({ - output = "food:pasta_bake_raw", - recipe = { - {"group:food_cheese"}, - {"group:food_pasta"}, - {"group:food_bowl"} - } - }) -end) - --- Register Soups -local soups = { - {"tomato", "tomato"}, - {"chicken", "meat"} -} -for i=1, #soups do - local flav = soups[i] - food.module("soup_"..flav[1], function() - minetest.register_craftitem(":food:soup_"..flav[1],{ - description = S(flav[1].." Soup"), - inventory_image = "food_soup_"..flav[1]..".png", - on_use = food.item_eat(4), - groups = {food=3} - }) - 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", - output = "food:soup_"..flav[1], - recipe = "food:soup_"..flav[1].."_raw", - }) - food.craft({ - output = "food:soup_"..flav[1].."_raw", - recipe = { - {"", "", ""}, - {"bucket:bucket_water", "group:food_"..flav[2], "bucket:bucket_water"}, - {"", "group:food_bowl", ""}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"},{"bucket:bucket_water", "bucket:bucket_empty"}} - }) - end) -end - --- Juices -local juices = {"apple", "orange", "cactus"} -for i=1, #juices do - local flav = juices[i] - food.module(flav.."_juice", function() - minetest.register_craftitem(":food:"..flav.."_juice", { - description = S(flav.." Juice"), - inventory_image = "food_"..flav.."_juice.png", - on_use = food.item_eat(2), - }) - food.craft({ - output = "food:"..flav.."_juice 4", - recipe = { - {"","",""}, - {"","group:food_"..flav,""}, - {"","group:food_cup",""}, - } - }) - end) -end - -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), - }) - - food.craft({ - output = "food:rainbow_juice 99", - recipe = { - {"","",""}, - {"","default:nyancat_rainbow",""}, - {"","group:food_cup",""}, - } - }) -end) - -food.cake_box = { - type = "fixed", - fixed = { - {-0.250000,-0.500000,-0.296880,0.250000,-0.250000,0.312502}, - {-0.309375,-0.500000,-0.250000,0.309375,-0.250000,0.250000}, - {-0.250000,-0.250000,-0.250000,0.250000,-0.200000,0.250000} - } -} - --- Register cakes -food.module("cake", function() - minetest.register_node(":food:cake", { - description = S("Cake"), - on_use = food.item_eat(4), - groups={food=3,crumbly=3}, - tiles = { - "food_cake_texture.png", - "food_cake_texture.png", - "food_cake_texture_side.png", - "food_cake_texture_side.png", - "food_cake_texture_side.png", - "food_cake_texture_side.png" - }, - walkable = false, - sunlight_propagates = true, - drawtype="nodebox", - paramtype = "light", - node_box = food.cake_box - }) - food.craft({ - type = "cooking", - output = "food:cake", - recipe = "food:cakemix_plain", - cooktime = 10, - }) - minetest.register_craftitem(":food:cakemix_plain",{ - description = S("Cake Mix"), - inventory_image = "food_cakemix_plain.png", - }) - minetest.register_craft({ - output = "food:cakemix_plain", - recipe = { - {"group:food_flour","group:food_sugar","group:food_egg"}, - } - }) -end) - - -food.module("cake_choco", function() - minetest.register_node(":food:cake_choco", { - description = S("Chocolate Cake"), - on_use = food.item_eat(4), - groups={food=3,crumbly=3}, - tiles = { - "food_cake_choco_texture.png", - "food_cake_choco_texture.png", - "food_cake_choco_texture_side.png", - "food_cake_choco_texture_side.png", - "food_cake_choco_texture_side.png", - "food_cake_choco_texture_side.png" - }, - walkable = false, - sunlight_propagates = true, - drawtype="nodebox", - paramtype = "light", - node_box = food.cake_box - }) - food.craft({ - type = "cooking", - output = "food:cake_choco", - recipe = "food:cakemix_choco", - cooktime = 10, - }) - minetest.register_craftitem(":food:cakemix_choco",{ - description = S("Chocolate Cake Mix"), - inventory_image = "food_cakemix_choco.png", - }) - food.craft({ - output = "food:cakemix_choco", - recipe = { - {"","group:food_choco_powder",""}, - {"group:food_flour","group:food_sugar","group:food_egg"}, - } - }) -end) - -food.module("cake_carrot", function() - minetest.register_node(":food:cake_carrot", { - description = S("Carrot Cake"), - on_use = food.item_eat(4), - groups={food=3,crumbly=3}, - walkable = false, - sunlight_propagates = true, - tiles = { - "food_cake_carrot_texture.png", - "food_cake_carrot_texture.png", - "food_cake_carrot_texture_side.png", - "food_cake_carrot_texture_side.png", - "food_cake_carrot_texture_side.png", - "food_cake_carrot_texture_side.png" - }, - drawtype="nodebox", - paramtype = "light", - node_box = food.cake_box - }) - food.craft({ - type = "cooking", - output = "food:cake_carrot", - recipe = "food:cakemix_carrot", - cooktime = 10, - }) - minetest.register_craftitem(":food:cakemix_carrot",{ - description = S("Carrot Cake Mix"), - inventory_image = "food_cakemix_carrot.png", - }) - food.craft({ - output = "food:cakemix_carrot", - recipe = { - {"","group:food_carrot",""}, - {"group:food_flour","group:food_sugar","group:food_egg"}, - } - }) -end) - diff --git a/mods/food/food_basic/locale/de.txt b/mods/food/food_basic/locale/de.txt deleted file mode 100755 index 7b19a7a2..00000000 --- a/mods/food/food_basic/locale/de.txt +++ /dev/null @@ -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 diff --git a/mods/food/food_basic/locale/fr.txt b/mods/food/food_basic/locale/fr.txt deleted file mode 100755 index 3b5a13a5..00000000 --- a/mods/food/food_basic/locale/fr.txt +++ /dev/null @@ -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 diff --git a/mods/food/food_basic/locale/template.txt b/mods/food/food_basic/locale/template.txt deleted file mode 100755 index 150e9e8f..00000000 --- a/mods/food/food_basic/locale/template.txt +++ /dev/null @@ -1,40 +0,0 @@ -# template - -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 = -Orange Juice = -Cake = -Chocolate Cake = -Carrot Cake = -Cheese cake = -Cake Mix = -Chocolate Cake Mix = -Carrot Cake Mix = -Cheese Cake Mix = diff --git a/mods/food/food_basic/support.lua b/mods/food/food_basic/support.lua deleted file mode 100755 index 4f4366ce..00000000 --- a/mods/food/food_basic/support.lua +++ /dev/null @@ -1,83 +0,0 @@ --- FOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> food/support.lua --- Support external mods --- ===================================== - --- The following ingredient list is licensed under WTFPL --- You may use the list in your mod. I am doing this to --- make it easier for mods to support lots of others - --- good for the end user - --- Add support for other mods -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("potato", { - "docfarming:potato", - "veggies:potato", - "farming_plus:potato_item" -}) -food.support("tomato", { - "farming_plus:tomato_item", - "plantlib:tomato" -}) -food.support("carrot", { - "farming_plus:carrot_item", - "docfarming:carrot", - "plantlib:carrot", - "jkfarming:carrot" -}) -food.support("milk", { - "animalmaterials:milk", - "my_mobs:milk_glass_cup", - "jkanimals:bucket_milk", - "mobs:bucket_milk" -}) -food.support("egg", { - "animalmaterials:egg", - "animalmaterials:egg_big", - "jkanimals:egg", - "mobs:egg" -}) -food.support("meat", { - "mobs:meat", - "jkanimals:meat", - "mobfcooking:cooked_pork", - "mobfcooking:cooked_beef", - "mobfcooking:cooked_chicken", - "mobfcooking:cooked_lamb", - "mobfcooking:cooked_venison" -}) -food.support("sugar", { - "jkfarming:sugar", - "bushes:sugar" -}) - -if farming and farming.mod == "redo" then - food.support("wheat", "farming:wheat") - 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("dark_chocolate", "farming:chocolate_dark") - food.support("sugar", "farming:sugar") - food.support("cup", "farming:drinking_cup") - food.disable_if("farming", "baked_potato") -else - food.support("wheat", "farming:wheat") - 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") -end - diff --git a/mods/food/food_basic/textures/food_apple_juice.png b/mods/food/food_basic/textures/food_apple_juice.png deleted file mode 100755 index d1915173..00000000 Binary files a/mods/food/food_basic/textures/food_apple_juice.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_baked_potato.png b/mods/food/food_basic/textures/food_baked_potato.png deleted file mode 100755 index fa06937c..00000000 Binary files a/mods/food/food_basic/textures/food_baked_potato.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_baking_bread_slice.png b/mods/food/food_basic/textures/food_baking_bread_slice.png deleted file mode 100755 index dea3a644..00000000 Binary files a/mods/food/food_basic/textures/food_baking_bread_slice.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_baking_bun_mix.png b/mods/food/food_basic/textures/food_baking_bun_mix.png deleted file mode 100755 index e97ad816..00000000 Binary files a/mods/food/food_basic/textures/food_baking_bun_mix.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_baking_dough.png b/mods/food/food_basic/textures/food_baking_dough.png deleted file mode 100755 index 86fa6695..00000000 Binary files a/mods/food/food_basic/textures/food_baking_dough.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_bowl.png b/mods/food/food_basic/textures/food_bowl.png deleted file mode 100755 index c5bf9e8b..00000000 Binary files a/mods/food/food_basic/textures/food_bowl.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_butter.png b/mods/food/food_basic/textures/food_butter.png deleted file mode 100755 index 645c057f..00000000 Binary files a/mods/food/food_basic/textures/food_butter.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cactus_juice.png b/mods/food/food_basic/textures/food_cactus_juice.png deleted file mode 100755 index 7d6cd672..00000000 Binary files a/mods/food/food_basic/textures/food_cactus_juice.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_carrot_texture.png b/mods/food/food_basic/textures/food_cake_carrot_texture.png deleted file mode 100755 index 1acfccd4..00000000 Binary files a/mods/food/food_basic/textures/food_cake_carrot_texture.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_carrot_texture_side.png b/mods/food/food_basic/textures/food_cake_carrot_texture_side.png deleted file mode 100755 index ef961d09..00000000 Binary files a/mods/food/food_basic/textures/food_cake_carrot_texture_side.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_choco_texture.png b/mods/food/food_basic/textures/food_cake_choco_texture.png deleted file mode 100755 index 20ae8b58..00000000 Binary files a/mods/food/food_basic/textures/food_cake_choco_texture.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_choco_texture_side.png b/mods/food/food_basic/textures/food_cake_choco_texture_side.png deleted file mode 100755 index 35aa9bff..00000000 Binary files a/mods/food/food_basic/textures/food_cake_choco_texture_side.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_texture.png b/mods/food/food_basic/textures/food_cake_texture.png deleted file mode 100755 index f4e9b272..00000000 Binary files a/mods/food/food_basic/textures/food_cake_texture.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cake_texture_side.png b/mods/food/food_basic/textures/food_cake_texture_side.png deleted file mode 100755 index 314ed393..00000000 Binary files a/mods/food/food_basic/textures/food_cake_texture_side.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cakemix_carrot.png b/mods/food/food_basic/textures/food_cakemix_carrot.png deleted file mode 100755 index eaddc476..00000000 Binary files a/mods/food/food_basic/textures/food_cakemix_carrot.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cakemix_choco.png b/mods/food/food_basic/textures/food_cakemix_choco.png deleted file mode 100755 index b34d552a..00000000 Binary files a/mods/food/food_basic/textures/food_cakemix_choco.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cakemix_plain.png b/mods/food/food_basic/textures/food_cakemix_plain.png deleted file mode 100755 index 6df78ddc..00000000 Binary files a/mods/food/food_basic/textures/food_cakemix_plain.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_carrot.png b/mods/food/food_basic/textures/food_carrot.png deleted file mode 100755 index 4d3a8fdb..00000000 Binary files a/mods/food/food_basic/textures/food_carrot.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cheese.png b/mods/food/food_basic/textures/food_cheese.png deleted file mode 100755 index eec185c9..00000000 Binary files a/mods/food/food_basic/textures/food_cheese.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_chocolate_powder.png b/mods/food/food_basic/textures/food_chocolate_powder.png deleted file mode 100755 index 55738351..00000000 Binary files a/mods/food/food_basic/textures/food_chocolate_powder.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_cocoa.png b/mods/food/food_basic/textures/food_cocoa.png deleted file mode 100755 index 8860b4b3..00000000 Binary files a/mods/food/food_basic/textures/food_cocoa.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_dark_chocolate.png b/mods/food/food_basic/textures/food_dark_chocolate.png deleted file mode 100755 index 07b82e6c..00000000 Binary files a/mods/food/food_basic/textures/food_dark_chocolate.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_egg.png b/mods/food/food_basic/textures/food_egg.png deleted file mode 100755 index 50010de8..00000000 Binary files a/mods/food/food_basic/textures/food_egg.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_flour.png b/mods/food/food_basic/textures/food_flour.png deleted file mode 100755 index e6160c45..00000000 Binary files a/mods/food/food_basic/textures/food_flour.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_meat.png b/mods/food/food_basic/textures/food_meat.png deleted file mode 100755 index 4251e297..00000000 Binary files a/mods/food/food_basic/textures/food_meat.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_meat_raw.png b/mods/food/food_basic/textures/food_meat_raw.png deleted file mode 100755 index b18d1be6..00000000 Binary files a/mods/food/food_basic/textures/food_meat_raw.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_milk.png b/mods/food/food_basic/textures/food_milk.png deleted file mode 100755 index e5352645..00000000 Binary files a/mods/food/food_basic/textures/food_milk.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_milk_chocolate.png b/mods/food/food_basic/textures/food_milk_chocolate.png deleted file mode 100755 index f1c07a57..00000000 Binary files a/mods/food/food_basic/textures/food_milk_chocolate.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_orange.png b/mods/food/food_basic/textures/food_orange.png deleted file mode 100755 index ac74d840..00000000 Binary files a/mods/food/food_basic/textures/food_orange.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_orange_juice.png b/mods/food/food_basic/textures/food_orange_juice.png deleted file mode 100755 index 76165316..00000000 Binary files a/mods/food/food_basic/textures/food_orange_juice.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_pasta.png b/mods/food/food_basic/textures/food_pasta.png deleted file mode 100755 index 53a0bb2f..00000000 Binary files a/mods/food/food_basic/textures/food_pasta.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_pasta_bake.png b/mods/food/food_basic/textures/food_pasta_bake.png deleted file mode 100755 index b06da417..00000000 Binary files a/mods/food/food_basic/textures/food_pasta_bake.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_pasta_bake_raw.png b/mods/food/food_basic/textures/food_pasta_bake_raw.png deleted file mode 100755 index 7d02ea85..00000000 Binary files a/mods/food/food_basic/textures/food_pasta_bake_raw.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_potato.png b/mods/food/food_basic/textures/food_potato.png deleted file mode 100755 index 9fe29706..00000000 Binary files a/mods/food/food_basic/textures/food_potato.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_rainbow_juice.png b/mods/food/food_basic/textures/food_rainbow_juice.png deleted file mode 100755 index 159f020f..00000000 Binary files a/mods/food/food_basic/textures/food_rainbow_juice.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_soup_chicken.png b/mods/food/food_basic/textures/food_soup_chicken.png deleted file mode 100755 index b1c1ddad..00000000 Binary files a/mods/food/food_basic/textures/food_soup_chicken.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_soup_chicken_raw.png b/mods/food/food_basic/textures/food_soup_chicken_raw.png deleted file mode 100755 index 2bb88713..00000000 Binary files a/mods/food/food_basic/textures/food_soup_chicken_raw.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_soup_tomato.png b/mods/food/food_basic/textures/food_soup_tomato.png deleted file mode 100755 index 3eeb431f..00000000 Binary files a/mods/food/food_basic/textures/food_soup_tomato.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_soup_tomato_raw.png b/mods/food/food_basic/textures/food_soup_tomato_raw.png deleted file mode 100755 index 81f8fed2..00000000 Binary files a/mods/food/food_basic/textures/food_soup_tomato_raw.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_strawberry.png b/mods/food/food_basic/textures/food_strawberry.png deleted file mode 100755 index 11118cd0..00000000 Binary files a/mods/food/food_basic/textures/food_strawberry.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_sugar.png b/mods/food/food_basic/textures/food_sugar.png deleted file mode 100755 index ceda6a0d..00000000 Binary files a/mods/food/food_basic/textures/food_sugar.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_tomato.png b/mods/food/food_basic/textures/food_tomato.png deleted file mode 100755 index d44037d1..00000000 Binary files a/mods/food/food_basic/textures/food_tomato.png and /dev/null differ diff --git a/mods/food/food_basic/textures/food_wheat.png b/mods/food/food_basic/textures/food_wheat.png deleted file mode 100755 index a2f0dc04..00000000 Binary files a/mods/food/food_basic/textures/food_wheat.png and /dev/null differ diff --git a/mods/food/modpack.txt b/mods/food/modpack.txt deleted file mode 100755 index e69de29b..00000000 diff --git a/mods/food_sweet b/mods/food_sweet new file mode 160000 index 00000000..8fb756b2 --- /dev/null +++ b/mods/food_sweet @@ -0,0 +1 @@ +Subproject commit 8fb756b233e41927fec0a3e3d71b47b886f26660 diff --git a/mods/mtfoods b/mods/mtfoods new file mode 160000 index 00000000..4aac3afb --- /dev/null +++ b/mods/mtfoods @@ -0,0 +1 @@ +Subproject commit 4aac3afbada69b681d4432956de0587e33ec10e0 diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt index 1c728038..1a6a42e0 100644 --- a/worlds/minetestforfun/world.mt +++ b/worlds/minetestforfun/world.mt @@ -155,6 +155,9 @@ load_mod_chesttools = true load_mod_food = true load_mod_food_basic = true +load_mod_food_sweet = true +load_mod_mtfoods = true +load_mod_diet = true load_mod_fishing = true load_mod_hbarmor = true