diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5ebd21a..0000000 --- a/.gitignore +++ /dev/null @@ -1,163 +0,0 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store diff --git a/IDEAS.md b/IDEAS.md deleted file mode 100644 index 8f2f46d..0000000 --- a/IDEAS.md +++ /dev/null @@ -1,48 +0,0 @@ -Recipes coming on release of this mod. -Read Code to find recipes before then - -Items -* Cup / Glass -* Mug -* Oven - -Diary -* Butter -* Cheese - -Sandwiches -* Venison Sandwich -* Cheese Sandwich -* Burger - -Baking -* Bread -* Bread Slices -* Buns - -Cakes -* Plain Cake -* Chocolate Cake -* Carrot Cake - -Tarts -* Strawberry Tart -- Chocolate Tart - -Crumbles -* Rhubarb Crumble - -Drinks -* Apple Juice -* Cactus Juice -* Coffee -* Coffee Beans -* Hot Chocolate -- Chocolate Milk Shake -- Banana Milk Shake -- Strawberry Milk Shake - -Misc -* Cigerettes (takes 1 life away) -* Cooked Meat -* Sugar \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 962f7fe..0000000 --- a/README.md +++ /dev/null @@ -1,76 +0,0 @@ -Rubenwardy's Food Mod. -====================== - -This mod adds food for minetest and is an ideal companion for the Farming (by PilzAdam) and the Animal (by Sapier) Mods. - -1) List of Food - -2) License for Code - -In alpha development, but is still ok to use. - -Food -==== - -Recipes coming on release of this mod. -Read Code to find recipes before then - -Items -* Cup / Glass -* Mug -* Oven - -Diary -* Butter -* Cheese - -Sandwiches -* Venison Sandwich -* Cheese Sandwich -* Burger - -Baking -* Bread -* Bread Slices -* Buns - -Soups -* Tomato Soup -* Chicken Soup - -Cakes -* Plain Cake -* Chocolate Cake -* Carrot Cake - -Tarts -* Strawberry Tart - -Crumbles -* Rhubarb Crumble - -Drinks -* Apple Juice -* Cactus Juice -* Coffee -* Coffee Beans -* Hot Chocolate -* Chocolate Milkshake -* Banana Milkshake -* Strawberry Milkshake - -Misc -* Cigerettes (takes 1 life away) -* Cooked Meat -* Sugar - - - -License for Code and Images -=========================== - -License Holder: Andrew "Rubenwardy" Ward. - -CC BY SA 3.0 UNPORTED - -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/dairy.lua b/dairy.lua deleted file mode 100644 index 68c02db..0000000 --- a/dairy.lua +++ /dev/null @@ -1,99 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/diary.lua --- adds diary products --- ====================================== --- [regis-food] Cheese --- [craft] Cheese --- [regis-item] Butter --- [craft] Butter --- ====================================== - -minetest.register_craftitem("food:butter", { - description = "Butter", - inventory_image = "food_butter.png", -}) - -minetest.register_craftitem("food:cheese", { - description = "Cheese", - inventory_image = "food_cheese.png", - on_use = minetest.item_eat(4), -}) - - -minetest.register_craft({ - output = '"food:butter" 1', - recipe = { - {'"food:milk"','"food:milk"'}, - } -}) - -minetest.register_craft({ - output = '"food:cheese" 1', - recipe = { - {'"food:butter"','"food:butter"'}, - } -}) - - --- --- --- CHOCOLATE --- --- - - -minetest.register_craftitem("food:chocolate_dark", { - description = "Dark Chocolate", - inventory_image = "food_choco_dark.png", - on_use = minetest.item_eat(2), -}) - -minetest.register_craftitem("food:chocolate_milk", { - description = "Milk Chocolate", - inventory_image = "food_choco_milk.png", - on_use = minetest.item_eat(3), -}) - -minetest.register_craftitem("food:chocolate_powder", { - description = "Chocolate Powder", - inventory_image = "food_choco_powder.png", -}) - -minetest.register_craft({ - output = '"food:chocolate_dark" 1', - recipe = { - {'"food:cocoa"','"food:cocoa"','"food:cocoa"'}, - } -}) - -minetest.register_craft({ - output = '"food:chocolate_powder" 1', - recipe = { - {"food:cocoa","food:cocoa","food:cocoa"}, - {"food:cocoa","food:cocoa","food:cocoa"}, - {"food:cocoa","food:cocoa","food:cocoa"}, - } -}) - -minetest.register_craft({ - output = '"food:chocolate_milk" 1', - recipe = { - {"","food:milk",""}, - {"food:cocoa","food:cocoa","food:cocoa"}, - } -}) - -minetest.register_craft({ - output = '"food:chocolate_milk" 1', - recipe = { - {"","food:milk","food:chocolate_dark"}, - } -}) - - - - - diff --git a/depends.txt b/depends.txt index 331d858..4efe608 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,7 @@ -default \ No newline at end of file +default? +farming? +farming_plus? +plantlib? +docfarming? +animalmaterials? +my_mobs? diff --git a/drinks/hot.lua b/drinks/hot.lua deleted file mode 100644 index cfdd34f..0000000 --- a/drinks/hot.lua +++ /dev/null @@ -1,54 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/drinks/hot.lua --- adds hot drinks --- ===================================== --- [regis-food] Coffee --- [craft] Coffe --- [regis-food] Hot Chocolate --- [craft] Hot Chocolate --- ===================================== - -print ("Food [Master] - Loading Hot") - ------------------------------Coffee----------------------------- - -minetest.register_craftitem("food:coffeebean_cooked",{ - description = "Roasted Coffee Beans", - tiles = {"food_coffee_cooked.png"}, - inventory_image = "food_coffee_cooked.png", -}) - -minetest.register_craftitem("food:coffee", { - description = "Coffee", - inventory_image = "food_coffee_cup.png", - on_use = minetest.item_eat(10), - groups={food=1}, -}) - -minetest.register_craft({ - output = '"food:coffee" 1', - recipe = { - {'""','"food:coffeebean_cooked"','""'}, - {'""','"food:coffeebean_cooked"','""'}, - {'""','"food:cup"','""'}, - } -}) - -minetest.register_craft({ - output = '"food:coffee" 1', - recipe = { - {'""','"food:coffeebean_cooked"','""'}, - {'""','"food:coffeebean_cooked"','""'}, - {'""','"food:mug"','""'}, - } -}) - -minetest.register_craft({ - type = "cooking", - output = "food:coffeebean_cooked", - recipe = "food:coffeebean", - cooktime = 5, -}) diff --git a/drinks/juice.lua b/drinks/juice.lua deleted file mode 100644 index 9397570..0000000 --- a/drinks/juice.lua +++ /dev/null @@ -1,68 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/drinks/juice.lua --- adds juices --- ===================================== --- [regis-food] Apple Juice --- [craft] Cactus Juice --- [regis-food] Cactus Juice --- [craft] Cactus Juice --- ===================================== - -print ("Food [Master] - Loading Juices") - ---------------------------Apple Juice-------------------------- -minetest.register_craftitem("food:apple_juice", { - description = "Apple Juice", - inventory_image = "food_juice_apple.png", - on_use = minetest.item_eat(2) -}) - -minetest.register_craft({ - output = '"food:apple_juice" 4', - recipe = { - {"","",""}, - {"","default:apple",""}, - {"","food:cup",""}, - } -}) - - - - - -----------------------cactus juice---------------------------- -minetest.register_craftitem("food:cactus_juice", { - description = "Cactuz Juice", - inventory_image = "food_juice_cactus.png", - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = '"food:cactus_juice" 4', - recipe = { - {'""','""','""'}, - {'""','"default:cactus"','""'}, - {'""','"food:cup"','""'}, - } -}) - - - ---------------------------Apple Juice-------------------------- -minetest.register_craftitem("food:rainbow_juice", { - description = "Nyan Rainbow Juice", - inventory_image = "food_juice_rainbow.png", - on_use = minetest.item_eat(50) -}) - -minetest.register_craft({ - output = '"food:rainbow_juice" 99', - recipe = { - {"","",""}, - {"","default:nyancat_rainbow",""}, - {"","food:cup",""}, - } -}) diff --git a/food/baking.lua b/food/baking.lua deleted file mode 100644 index 21dbf0a..0000000 --- a/food/baking.lua +++ /dev/null @@ -1,69 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/food/baking.lua --- adds bread and pies --- ===================================== --- [regis-food] Bread --- [regis-food] Bread Slice --- [craft] Bread Slice --- [regis-food] Bun --- [craft] Bun --- [regis-item] Bun Dough --- [craft] Bun Dough --- ===================================== - -print "Food [Master] - Loading Bread" --- doughs -if not minetest.get_modpath("farming") then - -else -minetest.register_craftitem(":farming:cake_mix", { - description = "Dough", - inventory_image = "farming_cake_mix.png", -}) -end - -minetest.register_craft({ - output = '"food:bread_slice" 10', - recipe = { - {'"food:bread"'}, - } -}) - -minetest.register_craftitem("food:bread_slice", { - description = "Bread Slice", - inventory_image = "food_bread_slice.png", - on_use = minetest.item_eat(2), -}) - - - - -print "Food [Master] - Loading Buns" -minetest.register_craftitem("food:bun_mix", { - description = "Bun Mix", - inventory_image = "food_bun_mix.png", -}) - -minetest.register_craftitem("food:bun", { - description = "Bun", - inventory_image = "food_bun.png", - on_use = minetest.item_eat(4), - groups={food=2}, -}) - -minetest.register_craft({ - type = "cooking", - output = "food:bun", - recipe = "food:bun_mix", -}) - -minetest.register_craft({ - output = '"food:bun_mix" 5', - recipe = { - {"food:flour", "food:flour", "bucket:bucket_water"}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} -}) diff --git a/food/meats.lua b/food/meats.lua deleted file mode 100644 index 1167801..0000000 --- a/food/meats.lua +++ /dev/null @@ -1,11 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/food/meats.lua --- adds meat products --- ====================================== --- Nothing here yet --- ====================================== - - diff --git a/food/sandwich.lua b/food/sandwich.lua deleted file mode 100644 index 82dfd6d..0000000 --- a/food/sandwich.lua +++ /dev/null @@ -1,48 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/food/sandwich.lua --- adds sandwich --- ====================================== --- [regis-food] Cheese Sandwich --- [craft] Cheese Sandwich --- [regis-food] Venison Sandwich --- [craft] Venison Sandwich --- [regis-food] Burger --- [craft] Burger --- ====================================== - -print "Food [Master] - Loading Sandwiches" - -minetest.register_craftitem("food:sw_meat", { - description = "Venison Sandwich", - inventory_image = "food_sw_meat.png", - on_use = minetest.item_eat(10), - groups={food=2}, -}) - -minetest.register_craftitem("food:sw_cheese", { - description = "Cheese Sandwich", - inventory_image = "food_sw_cheese.png", - on_use = minetest.item_eat(8), - groups={food=2}, -}) - -minetest.register_craft({ - output = '"food:sw_meat" 1', - recipe = { - {"",'"food:bread_slice"',""}, - {"food:butter","food:meat",'"food:butter"'}, - {"",'"food:bread_slice"',""}, - } -}) - -minetest.register_craft({ - output = '"food:sw_cheese" 1', - recipe = { - {"",'"food:bread_slice"',""}, - {"food:butter","food:cheese",'"food:butter"'}, - {"",'"food:bread_slice"',""}, - } -}) diff --git a/food/soup.lua b/food/soup.lua deleted file mode 100644 index 017e176..0000000 --- a/food/soup.lua +++ /dev/null @@ -1,72 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/food/soup.lua --- adds soup and stews --- ===================================== --- --- ===================================== - -print "Food [Master] - Loading Soups and Stews" - -----------------------Tomato----------------------------- -minetest.register_craftitem("food:soup_tomato", { - description = "Tomato Soup", - inventory_image = "food_soup_tomato.png", - on_use = minetest.item_eat(4), - groups={food=2}, -}) - -minetest.register_craftitem("food:soup_tomato_raw", { - description = "Raw Tomato Soup", - inventory_image = "food_soup_tomato_raw.png", - groups={food=2}, -}) - -minetest.register_craft({ - type = "cooking", - output = "food:soup_tomato", - recipe = "food:soup_tomato_raw", -}) - -minetest.register_craft({ - output = '"food:soup_tomato_raw" 1', - recipe = { - {"", "", ""}, - {"bucket:bucket_water", "food:tomato", "bucket:bucket_water"}, - {"", "food:bowl", ""}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"},{"bucket:bucket_water", "bucket:bucket_empty"}} -}) - - -----------------------Chicken----------------------------- -minetest.register_craftitem("food:soup_chicken", { - description = "Chicken Soup", - inventory_image = "food_soup_chicken.png", - on_use = minetest.item_eat(4), - groups={food=2}, -}) - -minetest.register_craftitem("food:soup_chicken_raw", { - description = "Raw Chicken Soup", - inventory_image = "food_soup_chicken_raw.png", - groups={food=2}, -}) - -minetest.register_craft({ - type = "cooking", - output = "food:soup_chicken", - recipe = "food:soup_chicken_raw", -}) - -minetest.register_craft({ - output = '"food:soup_chicken_raw" 1', - recipe = { - {"", "", ""}, - {"bucket:bucket_water", "food:meat", "bucket:bucket_water"}, - {"", "food:bowl", ""}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"},{"bucket:bucket_water", "bucket:bucket_empty"}} -}) diff --git a/init.lua b/init.lua index c694b20..f44f02e 100644 --- a/init.lua +++ b/init.lua @@ -1,103 +1,475 @@ --- RUBENFOOD MOD +-- FOOD MOD -- A mod written by rubenwardy that adds -- food to the minetest game -- ===================================== --- >> rubenfood/init.lua --- inits the mod --- ===================================== --- [regis-item] Cup --- [craft] Cup --- [regis-food] Cigerette (-4) +-- >> food/init.lua +-- The support api for the mod, and some +-- basic foods -- ===================================== -print ("Food: Loading mainframe: [Master]") +food = { supported={} } +function food.support(group,mod,item) + if not minetest.get_modpath(mod) then + print("'"..mod.."' is not installed") + return + end -----------------------Load Files----------------------------- -dofile(minetest.get_modpath("food").."/support.lua") + local mtype = "item" -dofile(minetest.get_modpath("food").."/dairy.lua") -dofile(minetest.get_modpath("food").."/food/meats.lua") -dofile(minetest.get_modpath("food").."/food/sandwich.lua") -dofile(minetest.get_modpath("food").."/food/baking.lua") -dofile(minetest.get_modpath("food").."/food/soup.lua") + if minetest.registered_nodes[item] then + mtype = "node" + end -dofile(minetest.get_modpath("food").."/snacks/crumbles.lua") -dofile(minetest.get_modpath("food").."/snacks/cakes.lua") -dofile(minetest.get_modpath("food").."/snacks/tarts.lua") + local data = minetest.registered_items[item] -dofile(minetest.get_modpath("food").."/drinks/juice.lua") -dofile(minetest.get_modpath("food").."/drinks/hot.lua") + if not data then + print(item.." not found") + return + end + data.groups["food_"..group]=1 + if mtype == "item" then + minetest.register_craftitem(":"..item,data) + else + minetest.register_node(":"..item,data) + end + food.supported[group] = true +end +function food.asupport(group,add) + if food.supported[group] then + return + end -----------------------------Cup------------------------------ + for name, def in pairs(minetest.registered_items) do + local g = def.groups and def.groups[group] or 0 + if g > 0 then + return + end + end -minetest.register_craftitem("food:mug",{ - description = "Mug", - inventory_image = "food_mug.png", -}) + print("registering "..group.." inbuilt definition") + + add() +end -minetest.register_craftitem("food:clay_mug",{ - description = "Clay Mug", - inventory_image = "food_clay_mug.png", -}) +-- Add support for other mods +food.support("wheat","farming","farming:wheat") +food.support("flour","farming","farming:flour") +food.support("tomato","farming_plus","farming_plus:tomato_item") +food.support("tomato","plantlib","plantlib:tomato") +food.support("strawberry","farming_plus","farming_plus:strawberry_item") +food.support("strawberry","plantlib","plantlib:strawberry") +food.support("carrot","farming_plus","farming_plus:carrot_item") +food.support("carrot","docfarming","docfarming:carrot") +food.support("carrot","plantlib","plantlib:carrot") +food.support("cocoa","farming_plus","farming_plus:cocoa_bean") +food.support("milk","animalmaterials","animalmaterials:milk") +food.support("milk","my_mobs","my_mobs:milk_glass_cup") +food.support("egg","animalmaterials","animalmaterials:egg") -minetest.register_craft({ - output = '"food:clay_mug" 1', - recipe = { - {"default:clay_lump","","default:clay_lump"}, - {"default:clay_lump","","default:clay_lump"}, - {"default:clay_lump","default:clay_lump","default:clay_lump"}, - } -}) +-- Default inbuilt ingrediants +food.asupport("wheat",function() + minetest.register_craftitem("food:wheat", { + description = "Wheat", + inventory_image = "food_wheat.png", + groups = {food_wheat=1} + }) -minetest.register_craft({ - type = "cooking", - output = "food:mug", - recipe = "food:clay_mug", -}) + minetest.register_craft({ + output = "food:wheat", + recipe = { + {"default:dry_shrub"}, + } + }) +end) +food.asupport("flour",function() + minetest.register_craftitem("food:flour", { + description = "Flour", + inventory_image = "food_flour.png", + groups = {food_flour = 1} + }) + minetest.register_craft({ + output = "food:flour", + recipe = { + {"group:food_wheat"}, + {"group:food_wheat"} + } + }) + minetest.register_craft({ + output = "food:flour", + recipe = { + {"default:sand"}, + {"default:sand"} + } + }) +end) +food.asupport("tomato",function() + minetest.register_craftitem("food:tomato", { + description = "Tomato", + inventory_image = "food_tomato.png", + groups = {food_tomato = 1} + }) + minetest.register_craft({ + output = "food:tomato", + recipe = { + {"", "default:desert_sand", ""}, + {"default:desert_sand", "", "default:desert_sand"}, + {"", "default:desert_sand", ""} + } + }) +end) +food.asupport("strawberry",function() + minetest.register_craftitem("food:strawberry", { + description = "Strawberry", + inventory_image = "food_strawberry.png", + on_use = minetest.item_eat(2), + groups = {food_strawberry=1} + }) + minetest.register_craft({ + output = "food:strawberry", + recipe = { + {"default:apple"}, + } + }) +end) +food.asupport("carrot",function() + minetest.register_craftitem("food:carrot", { + description = "Carrot", + inventory_image = "food_carrot.png", + groups = {food_carrot=1}, + on_use = minetest.item_eat(3) + }) + minetest.register_craft({ + output = "food:carrot", + recipe = { + {"default:apple","default:apple","default:apple"}, + } + }) +end) +food.asupport("milk",function() + minetest.register_craftitem("food:milk", { + description = "Milk", + image = "food_milk.png", + on_use = minetest.item_eat(1), + groups = { eatable=1, food_milk = 1 }, + stack_max=10 + }) + minetest.register_craft({ + output = "food:milk", + recipe = { + {"default:sand"}, + {"bucket:bucket_water"} + }, + replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}, + }) +end) +food.asupport("egg",function() + minetest.register_craftitem("food:egg",{ + description = "Egg", + inventory_image = "food_egg.png", + groups = {food_egg=1} + }) + minetest.register_craft({ + output = "food:egg", + recipe = { + {"", "default:sand", ""}, + {"default:sand", "", "default:sand"}, + {"", "default:sand", ""} + } + }) +end) +food.asupport("cocoa",function() + minetest.register_craftitem("food:cocoa", { + description = "Cocoa Bean", + inventory_image = "food_cocoa.png", + groups = {food_cocoa=1} + }) + minetest.register_craft({ + output = "food:cocoa", + recipe = { + {"","default:apple",""}, + {"default:apple","","default:apple"}, + {"","default:apple",""} + } + }) +end) ------------------------------Bowl------------------------------- - -minetest.register_craftitem("food:bowl",{ - description = "Bowl", - inventory_image = "food_bowl.png", -}) - -minetest.register_craft({ - output = "food:bowl", - recipe = { - {"default:stone","","default:stone"}, - {"","default:stone",""}, - } -}) - - ------------------------------Sugar------------------------------ +-- Register sugar minetest.register_craftitem("food:sugar", { description = "Sugar", inventory_image = "food_sugar.png", + groups = {food_sugar=1} }) minetest.register_craft({ - output = '"food:sugar" 20', + output = "food:sugar 20", recipe = { - {'"default:papyrus"'}, - + {"default:papyrus"}, } }) ---------------------------Cactus Slice-------------------------- -minetest.register_craftitem("food:cactus_slice", { - description = "Cactus Slice", - inventory_image = "food_cactus_slice.png", - on_use = minetest.item_eat(2), +-- Register chocolate powder +minetest.register_craftitem("food:chocolate_powder", { + description = "Chocolate Powder", + inventory_image = "food_chocolate_powder.png", + groups = {food_choco_powder = 1} }) minetest.register_craft({ - output = '"food:cactus_slice" 4', + output = "food:chocolate_powder 16", recipe = { - {'"default:cactus"'}, - + {"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"} } }) -print("Food: Mainframe loaded") +-- Register dark chocolate +minetest.register_craftitem("food:dark_chocolate",{ + description = "Dark Chocolate", + inventory_image = "food_dark_chocolate.png", + groups = {food_dark_chocolate=1} +}) +minetest.register_craft({ + output = "food:dark_chocolate", + recipe = { + {"group:food_cocoa","group:food_cocoa","group:food_cocoa"} + } +}) + +-- Register milk chocolate +minetest.register_craftitem("food:milk_chocolate",{ + description = "Milk Chocolate", + inventory_image = "food_milk_chocolate.png", + groups = {food_milk_chocolate=1} +}) +minetest.register_craft({ + output = "food:milk_chocolate", + recipe = { + {"","group:food_milk",""}, + {"group:food_cocoa","group:food_cocoa","group:food_cocoa"} + } +}) + +-- Register pasta +minetest.register_craftitem("food:pasta",{ + description = "Pasta", + inventory_image = "food_pasta.png", + groups = {food_pasta=1} +}) +minetest.register_craft({ + output = "food:pasta 4", + type = "shapeless", + recipe = {"group:food_flour","group:food_egg","group:food_egg"} +}) + +-- Register bowl +minetest.register_craftitem("food:bowl",{ + description = "Bowl", + inventory_image = "food_bowl.png", + groups = {food_bowl=1} +}) +-- Register butter +minetest.register_craftitem("food:butter", { + description = "Butter", + inventory_image = "food_butter.png", + groups = {food_butter=1} +}) +minetest.register_craft({ + output = "food:butter", + recipe = { + {"group:food_milk","group:food_milk"}, + } +}) + +-- Register cheese +minetest.register_craftitem("food:cheese", { + description = "Cheese", + inventory_image = "food_cheese.png", + on_use = minetest.item_eat(4), + groups = {food_cheese=1} +}) +minetest.register_craft({ + output = "food:cheese", + recipe = { + {"group:food_butter","group:food_butter"}, + } +}) + +-- Register pasta bake +minetest.register_craftitem("food:pasta_bake",{ + description = "Pasta Bake", + inventory_image = "food_pasta_bake.png", + groups = {food=3} +}) +minetest.register_craftitem("food:pasta_bake_raw",{ + description = "Raw Pasta Bake", + inventory_image = "food_pasta_bake_raw.png", +}) +minetest.register_craft({ + output = "food:pasta_bake", + type = "cooking", + recipe = "food:pasta_bake_raw" +}) +minetest.register_craft({ + output = "food:pasta_bake_raw", + recipe = { + {"group:food_cheese"}, + {"group:food_pasta"}, + {"group:food_bowl"} + } +}) + +-- Register cakes +minetest.register_node("food:cake", { + description = "Cake", + on_use = minetest.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 = { + type = "fixed", + fixed = { + {-0.250000,-0.500000,-0.296880,0.250000,-0.250000,0.312502}, --NodeBox 1 + {-0.309375,-0.500000,-0.250000,0.309375,-0.250000,0.250000}, --NodeBox 2 + {-0.250000,-0.250000,-0.250000,0.250000,-0.200000,0.250000}, --NodeBox 3 + } + } +}) +minetest.register_node("food:cake_choco", { + description = "Chocolate Cake", + on_use = minetest.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 = { + type = "fixed", + fixed = { + {-0.250000,-0.500000,-0.296880,0.250000,-0.250000,0.312502}, --NodeBox 1 + {-0.309375,-0.500000,-0.250000,0.309375,-0.250000,0.250000}, --NodeBox 2 + {-0.250000,-0.250000,-0.250000,0.250000,-0.200000,0.250000}, --NodeBox 3 + } + } +}) +minetest.register_node("food:cake_carrot", { + description = "Carrot Cake", + on_use = minetest.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 = { + type = "fixed", + fixed = { + {-0.250000,-0.500000,-0.296880,0.250000,-0.250000,0.312502}, --NodeBox 1 + {-0.309375,-0.500000,-0.250000,0.309375,-0.250000,0.250000}, --NodeBox 2 + {-0.250000,-0.250000,-0.250000,0.250000,-0.200000,0.250000}, --NodeBox 3 + } + } +}) +minetest.register_craftitem("food:cake_cheese",{ + description = "Cheese cake", + inventory_image = "food_cake_cheese.png", + on_use = minetest.item_eat(4), + groups={food=3,crumbly=3} +}) +minetest.register_craft({ + type = "cooking", + output = "food:cake", + recipe = "food:cakemix_plain", + cooktime = 10, +}) +minetest.register_craft({ + type = "cooking", + output = "food:cake_choco", + recipe = "food:cakemix_choco", + cooktime = 10, +}) +minetest.register_craft({ + type = "cooking", + output = "food:cake_carrot", + recipe = "food:cakemix_carrot", + cooktime = 10, +}) +minetest.register_craft({ + type = "cooking", + output = "food:cake_cheese", + recipe = "food:cakemix_cheese", + cooktime = 10, +}) + +-- Cake mix +minetest.register_craftitem("food:cakemix_plain",{ + description = "Cake Mix", + inventory_image = "food_cakemix_plain.png", +}) + +minetest.register_craftitem("food:cakemix_choco",{ + description = "Chocolate Cake Mix", + inventory_image = "food_cakemix_choco.png", +}) + +minetest.register_craftitem("food:cakemix_carrot",{ + description = "Carrot Cake Mix", + inventory_image = "food_cakemix_carrot.png", +}) + +minetest.register_craftitem("food:cakemix_cheese",{ + description = "Cheese Cake Mix", + inventory_image = "food_cakemix_carrot.png", +}) +minetest.register_craft({ + output = "food:cakemix_plain", + recipe = { + {"group:food_flour","group:food_sugar","group:food_egg"}, + } +}) +minetest.register_craft({ + output = "food:cakemix_choco", + recipe = { + {"","group:food_choco_powder",""}, + {"group:food_flour","group:food_sugar","group:food_egg"}, + } +}) +minetest.register_craft({ + output = "food:cakemix_carrot", + recipe = { + {"","group:food_carrot",""}, + {"group:food_flour","group:food_sugar","group:food_egg"}, + } +}) +minetest.register_craft({ + output = "food:cakemix_cheese", + recipe = { + {"group:food_cheese","group:food_strawberry",""}, + {"group:food_flour","group:food_sugar","group:food_egg"}, + } +}) diff --git a/snacks/cakes.lua b/snacks/cakes.lua deleted file mode 100644 index d5468cf..0000000 --- a/snacks/cakes.lua +++ /dev/null @@ -1,101 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/snacks/cakes.lua --- adds cakes --- ===================================== --- [regis-food] Plain Cake --- [craft] Plain Cake --- [regis-food] Chocolate Cake --- [craft] Chocolate Cake --- [regis-food] Carrot Cake --- [craft] Chocolate Cake --- ===================================== -print("Food [Master] - Loading Cakes") - ---------------------------Cakes------------------------- -minetest.register_craftitem("food:cakemix_plain",{ - description = "Cake Mix", - inventory_image = "food_pastry.png", -}) - -minetest.register_craftitem("food:cakemix_choco",{ - description = "Chocolate Cake Mix", - inventory_image = "food_pastry_choco.png", -}) - -minetest.register_craftitem("food:cakemix_carrot",{ - description = "Carrot Cake Mix", - inventory_image = "food_pastry_carrot.png", -}) - -minetest.register_craft({ - type = "cooking", - output = "food:cake", - recipe = "food:cakemix_plain", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "food:cake_chocolate", - recipe = "food:cakemix_choco", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "food:cake_carrot", - recipe = "food:cakemix_carrot", - cooktime = 10, -}) - -minetest.register_craftitem("food:cake", { - description = "Cake", - inventory_image = "food_cake.png", - on_use = minetest.item_eat(30), - groups={food=3}, -}) - -minetest.register_craftitem("food:cake_chocolate", { - description = "Chocolate Cake", - inventory_image = "food_cake_choco.png", - on_use = minetest.item_eat(40), - groups={food=3}, -}) - -minetest.register_craftitem("food:cake_carrot", { - description = "Carrot Cake", - inventory_image = "food_cake_carrot.png", - on_use = minetest.item_eat(40), - groups={food=3}, -}) - - - - - - ------------------------------ Cake Pastry ---------------------------- - -minetest.register_craft({ - output = '"food:cakemix_plain" 1', - recipe = { - {'"food:flour"','"food:sugar"','"food:egg"'}, - } -}) - -minetest.register_craft({ - output = '"food:cakemix_choco" 1', - recipe = { - {'""','"food:chocolate_milk"','""'}, {'"food:flour"','"food:sugar"','"food:egg"'}, - } -}) - -minetest.register_craft({ - output = '"food:cakemix_carrot" 1', - recipe = { - {'""','"food:carrot"','""'}, {'"food:flour"','"food:sugar"','"food:egg"'}, - } -}) diff --git a/snacks/crumbles.lua b/snacks/crumbles.lua deleted file mode 100644 index c1efd0e..0000000 --- a/snacks/crumbles.lua +++ /dev/null @@ -1,37 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ===================================== --- >> rubenfood/snacks/crumbles.lua --- adds crumbles --- ===================================== --- [regis-food] Rhubarb Crumble --- ===================================== - -print "Food [Master] - Loading Crumbles" ---Crumbles -minetest.register_craftitem("food:crumble_rhubarb", { - description = "Rhubarb Crumble", - inventory_image = "food_crumble_rhubarb.png", - on_use = minetest.item_eat(30), - groups={food=3}, -}) - -minetest.register_craftitem("food:crumble_rhubarb_raw", { - description = "Raw Rhubarb Crumble", - inventory_image = "food_crumble_rhubarb_raw.png", -}) - -minetest.register_craft({ - output = '"food:crumble_rhubarb_raw" 1', - recipe = { - {'"food:sugar"',"",""}, - {'"food:flour"','"food:rhubarb"','"food:butter"'} - } -}) - -minetest.register_craft({ - type = "cooking", - output = "food:crumble_rhubarb", - recipe = "food:crumble_rhubarb_raw", -}) diff --git a/snacks/tarts.lua b/snacks/tarts.lua deleted file mode 100644 index 2af5e5d..0000000 --- a/snacks/tarts.lua +++ /dev/null @@ -1,53 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/snacks/tarts.lua --- adds diary products --- ====================================== --- [regis-food] Strawberry Tart --- ====================================== - -print "Food [Master] - Loading Tarts" - -minetest.register_craftitem("food:tart_strawberry", { - description = "Strawberry Tart", - inventory_image = "food_tart_strawberry.png", - on_use = minetest.item_eat(30), - groups={food=3}, -}) - -minetest.register_craftitem("food:tart_base", { - description = "Tart Base", - inventory_image = "food_tart_base.png", -}) - -minetest.register_craftitem("food:tart_base_raw", { - description = "Raw Tart Base", - inventory_image = "food_tart_base_raw.png", -}) - -minetest.register_craft({ - type = "cooking", - output = "food:tart_base", - recipe = "food:tart_base_raw", -}) - -minetest.register_craft({ - output = '"food:tart_strawberry" 1', - recipe = { - {'"food:strawberry"'},{'"food:tart_base"'}, - } -}) - -minetest.register_craft({ - output = '"food:tart_base_raw" 1', - recipe = { - {'"food:flour"','"food:milk"','"food:egg"'}, - } -}) - - - - - diff --git a/support.lua b/support.lua deleted file mode 100644 index 8819844..0000000 --- a/support.lua +++ /dev/null @@ -1,348 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/support.lua --- adds support for other mods --- ====================================== --- [support] --- ====================================== - -print "Food [Support] - Initialising" - ---NODE_IMPLEMENT() Gets an item from another mod softly --- modname: the name of the mod that the item will be got from --- n_ext: the name of the item that we want to get --- n_int: the name we want to save the item so we can load it as an ingredient --- resultfunc: if the mod does not exist, then do this function -function node_implement(modname,n_ext,n_int,resultfunc) - if not minetest.get_modpath(modname) then - -- Mod is NOT installed - resultfunc() - else - -- Mod IS installed - minetest.register_alias(n_int,n_ext) - end -end - -print "Food [Support] - Vegetables and Fruit" -print "Food [Support] - > Bread and Flour" - -node_implement("farming","farming:flour","food:flour",function() - node_implement("plantlib","plantlib:wheat","food:wheat",function() - minetest.register_craft({ - output = '"food:wheat" 1', - recipe = { - {"default:dry_shrub"}, - } - }) - end) - minetest.register_craftitem("food:flour", { - description = "Flour", - inventory_image = "farming_flour.png", - }) - minetest.register_craft({ - output = '"food:flour" 1', - recipe = { - {"food:wheat"}, - } - }) -end) - -node_implement("farming","farming:bread","food:bread",function() -minetest.register_craftitem("food:bread", { - description = "Bread", - inventory_image = "food_bread.png", - stack_max = 1, - on_use = minetest.item_eat(10), - groups={food=2}, -}) -minetest.register_craft({ - type = "cooking", - output = "food:bread", - recipe = "food:dough", - cooktime = 10, -}) -end) - - -node_implement("farming","farming:cake_mix","food:dough",function() -minetest.register_craftitem("food:dough", { - description = "Cake Mix", - inventory_image = "farming_cake_mix.png", -}) -minetest.register_craft({ - output = "food:dough", - type = "shapeless", - recipe = {"food:flour", "food:flour", "food:flour", "food:flour", "bucket:bucket_water"}, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}, -}) -end) - - - -print "Food [Support] - > Strawberry" - -node_implement("farming_plus","farming_plus:strawberry_item","food:strawberry",function() -node_implement("plantlib","plantlib:strawberry","food:strawberry",function() -minetest.register_craftitem("food:strawberry", { - description = "Strawberry", - inventory_image = "farming_strawberry.png", - on_use = minetest.item_eat(2), -}) -minetest.register_craft({ - output = '"food:strawberry" 1', - recipe = { - {"default:apple"}, - } -}) -end) -end) - -print "Food [Support] - > Carrot" - -node_implement("farming_plus","farming_plus:carrot_item","food:carrot",function() -node_implement("docfarming","docfarming:carrot","food:carrot",function() -node_implement("plantlib","plantlib:carrot","food:carrot",function() -minetest.register_craftitem("food:carrot", { - description = "Carrot", - inventory_image = "farming_carrot.png", - on_use = minetest.item_eat(3), -}) -minetest.register_craft({ - output = '"food:carrot" 1', - recipe = { - {"default:apple","default:apple","default:apple"}, - } -}) -end) -end) -end) - - -print "Food [Support] - > Rhubarb" -node_implement("farming_plus","farming_plus:rhubarb_item","food:rhubarb",function() -minetest.register_craftitem("food:rhubarb", { - description = "Rhubarb", - inventory_image = "farming_rhubarb.png", -}) -minetest.register_craft({ - output = '"food:rhubarb" 1', - recipe = { - {"default:apple"}, - {"default:apple"}, - {"default:apple"} - } -}) -end) - -print "Food [Support] - > Cocoa Bean" -node_implement("farming_plus","farming_plus:cocoa_bean","food:cocoa",function() -minetest.register_craftitem("food:cocoa", { - description = "Cocoa Bean", - inventory_image = "farming_cocoa_bean.png", -}) -minetest.register_craft({ - output = '"food:cocoa" 1', - recipe = { - {"","default:apple",""}, - {"default:apple","","default:apple"}, - {"","default:apple",""} - } -}) -end) - - -print "Food [Support] - > Banana" -node_implement("farming_plus","farming_plus:banana","food:banana",function() -minetest.register_node("food:banana", { - description = "Banana", - tiles = {"farming_banana.png"}, - inventory_image = "farming_banana.png", - wield_image = "farming_banana.png", - drawtype = "torchlike", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - groups = {fleshy=3,dig_immediate=3,flammable=2}, - sounds = default.node_sound_defaults(), - on_use = minetest.item_eat(6), -}) -minetest.register_craft({ - output = '"food:banana" 1', - recipe = { - {"default:apple"}, - {"default:apple"} - } -}) -end) - -print "Food [Support] - > Tomato" -node_implement("farming_plus","farming_plus:tomato_item","food:tomato",function() -node_implement("plantlib","plantlib:tomato","food:tomato",function() -minetest.register_craftitem("food:tomato", { - description = "Tomato", - inventory_image = "farming_strawberry.png", - on_use = minetest.item_eat(2), -}) -minetest.register_craft({ - output = '"food:rhubarb" 1', - recipe = { - {""}, - {""}, - {"default:apple"} - } -}) -end) -end) - -print "Food [Support] - > Potato" -node_implement("docfarming","docfarming:potato","food:potato",function() -minetest.register_craftitem("food:potato", { - description = "Potato", - inventory_image = "food_potato.png", -}) -minetest.register_craft({ - output = '"food:rhubarb" 1', - recipe = { - {"default:apple"}, - {"default:dirt"} - } -}) -end) - -node_implement("docfarming","docfarming:bakedpotato","food:potato_baked",function() -minetest.register_craftitem("food:potato_baked", { - description = "Baked Potato", - inventory_image = "food_baked_potato.png", - on_use = minetest.item_eat(6), -}) -minetest.register_craft({ - type = "cooking", - output = "food:potato_baked", - recipe = "food:potato", - cooktime = 2, -}) -end) - -print "Food [Support] - > Coffee" -node_implement("plantlib","plantlib:coffee","food:coffeebean",function() -minetest.register_craftitem("food:coffeebean",{ - description = "Raw Coffee Bean", - tiles = {"food_coffee.png"}, - inventory_image = "food_coffee.png", -}) - -minetest.register_craft({ - output = '"food:coffeebean" 1', - recipe = { - {'""','"default:dry_shrub"','""'}, - {'""','"default:dry_shrub"','""'}, - {'""','"default:dry_shrub"','""'}, - } -}) -end) - -print "Food [Support] - Meats and Animal Produce" - -print "Food [Support] - > Raw Meat" -node_implement("mobs","mobs:meat_raw","food:meat_raw",function() -node_implement("animalmaterials","animalmaterials:meat_raw","food:meat_raw",function() -minetest.register_craftitem("food:meat_raw", { - description = "Raw meat", - image = "animalmaterials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) -minetest.register_craft({ - output = '"food:meat_raw" 1', - recipe = { - {"default:apple"}, - {"default:dirt"} - } -}) -end) -end) - -print "Food [Support] - > Meat" -node_implement("mobs","mobs:meat","food:meat",function() -minetest.register_craftitem("food:meat", { - description = "Venison", - inventory_image = "food_meat.png", -}) - -minetest.register_craft({ - type = "cooking", - output = "food:meat", - recipe = "food:meat_raw", - cooktime = 30 -}) -end) - -print "Food [Support] - > Egg" -node_implement("animalmaterials","animalmaterials:egg","food:egg",function() - minetest.register_craftitem("food:egg", { - description = "Egg", - image = "animalmaterials_egg.png", - stack_max=10 -}) -minetest.register_craft({ - output = '"food:egg" 1', - recipe = { - {"default:sand"}, - {"default:apple"} - } -}) -end) - -print "Food [Support] - > Milk" -node_implement("animalmaterials","animalmaterials:milk","food:milk",function() -node_implement("my_mobs","my_mobs:milk_glass_cup","food:milk",function() - minetest.register_craftitem("food:milk", { - description = "Milk", - image = "animalmaterials_milk.png", - on_use = minetest.item_eat(1), - groups = { eatable=1 }, - stack_max=10 -}) -minetest.register_craft({ - output = '"food:meat_raw" 1', - recipe = { - {"default:apple"}, - {"bucket:bucket_water"} - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}, -}) -end) -end) - -print "Food [Support] - Vessels and Cutlery" - -node_implement("vessels","vessels:drinking_glass","food:cup",function() -node_implement("animalmaterials","animalmaterials:glass","food:cup",function() - minetest.register_craftitem("food:cup",{ - description = "Glass", - tiles = {"food_cup.png"}, - inventory_image = "food_cup.png", -}) -minetest.register_craft({ - output = '"food:cup" 1', - recipe = { - {"default:glass"}, - {"default:glass"} - } -}) -end) -end) - - - - - - - - - - - diff --git a/textures/animalmaterials_meat_raw.png b/textures/animalmaterials_meat_raw.png deleted file mode 100644 index 0dea4ec..0000000 Binary files a/textures/animalmaterials_meat_raw.png and /dev/null differ diff --git a/textures/farming_banana.png b/textures/farming_banana.png deleted file mode 100644 index f775e14..0000000 Binary files a/textures/farming_banana.png and /dev/null differ diff --git a/textures/farming_flour.png b/textures/farming_flour.png deleted file mode 100644 index 7c302bf..0000000 Binary files a/textures/farming_flour.png and /dev/null differ diff --git a/textures/farming_rhubarb.png b/textures/farming_rhubarb.png deleted file mode 100644 index 849f61b..0000000 Binary files a/textures/farming_rhubarb.png and /dev/null differ diff --git a/textures/food_baked_potato.png b/textures/food_baked_potato.png deleted file mode 100644 index 425c4ae..0000000 Binary files a/textures/food_baked_potato.png and /dev/null differ diff --git a/textures/food_baking_bread_slice.png b/textures/food_baking_bread_slice.png new file mode 100644 index 0000000..174c900 Binary files /dev/null and b/textures/food_baking_bread_slice.png differ diff --git a/textures/food_bun_mix.png b/textures/food_baking_bun_mix.png similarity index 100% rename from textures/food_bun_mix.png rename to textures/food_baking_bun_mix.png diff --git a/textures/farming_cake_mix.png b/textures/food_baking_dough.png similarity index 100% rename from textures/farming_cake_mix.png rename to textures/food_baking_dough.png diff --git a/textures/food_bread.png b/textures/food_bread.png deleted file mode 100644 index 6dca983..0000000 Binary files a/textures/food_bread.png and /dev/null differ diff --git a/textures/food_bread_slice.png b/textures/food_bread_slice.png deleted file mode 100644 index 6ada224..0000000 Binary files a/textures/food_bread_slice.png and /dev/null differ diff --git a/textures/food_bun.png b/textures/food_bun.png deleted file mode 100644 index abbe121..0000000 Binary files a/textures/food_bun.png and /dev/null differ diff --git a/textures/food_butter.png b/textures/food_butter.png index 97ea805..cb6f054 100644 Binary files a/textures/food_butter.png and b/textures/food_butter.png differ diff --git a/textures/food_cactus_slice.png b/textures/food_cactus_slice.png deleted file mode 100644 index 5af32ad..0000000 Binary files a/textures/food_cactus_slice.png and /dev/null differ diff --git a/textures/food_cake.png b/textures/food_cake.png deleted file mode 100644 index 250303b..0000000 Binary files a/textures/food_cake.png and /dev/null differ diff --git a/textures/food_cake_carrot.png b/textures/food_cake_carrot.png deleted file mode 100644 index 9e95bbd..0000000 Binary files a/textures/food_cake_carrot.png and /dev/null differ diff --git a/textures/food_cake_carrot_texture.png b/textures/food_cake_carrot_texture.png new file mode 100644 index 0000000..1acfccd Binary files /dev/null and b/textures/food_cake_carrot_texture.png differ diff --git a/textures/food_cake_carrot_texture_side.png b/textures/food_cake_carrot_texture_side.png new file mode 100644 index 0000000..ef961d0 Binary files /dev/null and b/textures/food_cake_carrot_texture_side.png differ diff --git a/textures/food_cake_cheese.png b/textures/food_cake_cheese.png new file mode 100644 index 0000000..dc7467e Binary files /dev/null and b/textures/food_cake_cheese.png differ diff --git a/textures/food_cake_choco.png b/textures/food_cake_choco.png deleted file mode 100644 index b75f8ed..0000000 Binary files a/textures/food_cake_choco.png and /dev/null differ diff --git a/textures/food_cake_choco_texture.png b/textures/food_cake_choco_texture.png new file mode 100644 index 0000000..20ae8b5 Binary files /dev/null and b/textures/food_cake_choco_texture.png differ diff --git a/textures/food_cake_choco_texture_side.png b/textures/food_cake_choco_texture_side.png new file mode 100644 index 0000000..4f7a8b4 Binary files /dev/null and b/textures/food_cake_choco_texture_side.png differ diff --git a/textures/food_cake_texture.png b/textures/food_cake_texture.png new file mode 100644 index 0000000..f4e9b27 Binary files /dev/null and b/textures/food_cake_texture.png differ diff --git a/textures/food_cake_texture_side.png b/textures/food_cake_texture_side.png new file mode 100644 index 0000000..314ed39 Binary files /dev/null and b/textures/food_cake_texture_side.png differ diff --git a/textures/food_cakemix_carrot.png b/textures/food_cakemix_carrot.png new file mode 100644 index 0000000..30dd002 Binary files /dev/null and b/textures/food_cakemix_carrot.png differ diff --git a/textures/food_cakemix_choco.png b/textures/food_cakemix_choco.png new file mode 100644 index 0000000..cd88169 Binary files /dev/null and b/textures/food_cakemix_choco.png differ diff --git a/textures/food_cakemix_plain.png b/textures/food_cakemix_plain.png new file mode 100644 index 0000000..7b9f392 Binary files /dev/null and b/textures/food_cakemix_plain.png differ diff --git a/textures/farming_carrot.png b/textures/food_carrot.png similarity index 100% rename from textures/farming_carrot.png rename to textures/food_carrot.png diff --git a/textures/food_cheese.png b/textures/food_cheese.png index aef8b59..eec185c 100644 Binary files a/textures/food_cheese.png and b/textures/food_cheese.png differ diff --git a/textures/food_choco_powder.png b/textures/food_chocolate_powder.png similarity index 100% rename from textures/food_choco_powder.png rename to textures/food_chocolate_powder.png diff --git a/textures/food_clay_mug.png b/textures/food_clay_mug.png deleted file mode 100644 index 73eeecf..0000000 Binary files a/textures/food_clay_mug.png and /dev/null differ diff --git a/textures/farming_cocoa_bean.png b/textures/food_cocoa.png similarity index 100% rename from textures/farming_cocoa_bean.png rename to textures/food_cocoa.png diff --git a/textures/food_coffee.png b/textures/food_coffee.png deleted file mode 100644 index 944fd73..0000000 Binary files a/textures/food_coffee.png and /dev/null differ diff --git a/textures/food_coffee_cooked.png b/textures/food_coffee_cooked.png deleted file mode 100644 index 8f75897..0000000 Binary files a/textures/food_coffee_cooked.png and /dev/null differ diff --git a/textures/food_coffee_cup.png b/textures/food_coffee_cup.png deleted file mode 100644 index 272299a..0000000 Binary files a/textures/food_coffee_cup.png and /dev/null differ diff --git a/textures/food_corn_pip.png b/textures/food_corn_pip.png deleted file mode 100644 index bf2ac77..0000000 Binary files a/textures/food_corn_pip.png and /dev/null differ diff --git a/textures/food_crumble_rhubarb.png b/textures/food_crumble_rhubarb.png deleted file mode 100644 index 4b8811e..0000000 Binary files a/textures/food_crumble_rhubarb.png and /dev/null differ diff --git a/textures/food_crumble_rhubarb_raw.png b/textures/food_crumble_rhubarb_raw.png deleted file mode 100644 index 5c1689e..0000000 Binary files a/textures/food_crumble_rhubarb_raw.png and /dev/null differ diff --git a/textures/food_cup.png b/textures/food_cup.png deleted file mode 100644 index 9fadc0d..0000000 Binary files a/textures/food_cup.png and /dev/null differ diff --git a/textures/food_choco_dark.png b/textures/food_dark_chocolate.png similarity index 100% rename from textures/food_choco_dark.png rename to textures/food_dark_chocolate.png diff --git a/textures/animalmaterials_egg.png b/textures/food_egg.png similarity index 100% rename from textures/animalmaterials_egg.png rename to textures/food_egg.png diff --git a/textures/food_flour.png b/textures/food_flour.png new file mode 100644 index 0000000..a526b20 Binary files /dev/null and b/textures/food_flour.png differ diff --git a/textures/food_juice_apple.png b/textures/food_juice_apple.png deleted file mode 100644 index fc2b8ef..0000000 Binary files a/textures/food_juice_apple.png and /dev/null differ diff --git a/textures/food_juice_cactus.png b/textures/food_juice_cactus.png deleted file mode 100644 index 6180eed..0000000 Binary files a/textures/food_juice_cactus.png and /dev/null differ diff --git a/textures/food_juice_rainbow.png b/textures/food_juice_rainbow.png deleted file mode 100644 index 7eb97cf..0000000 Binary files a/textures/food_juice_rainbow.png and /dev/null differ diff --git a/textures/food_meat.png b/textures/food_meat.png deleted file mode 100644 index d4e4abb..0000000 Binary files a/textures/food_meat.png and /dev/null differ diff --git a/textures/animalmaterials_milk.png b/textures/food_milk.png similarity index 100% rename from textures/animalmaterials_milk.png rename to textures/food_milk.png diff --git a/textures/food_choco_milk.png b/textures/food_milk_chocolate.png similarity index 100% rename from textures/food_choco_milk.png rename to textures/food_milk_chocolate.png diff --git a/textures/food_mug.png b/textures/food_mug.png deleted file mode 100644 index f68173b..0000000 Binary files a/textures/food_mug.png and /dev/null differ diff --git a/textures/food_oven_bottom.png b/textures/food_oven_bottom.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_bottom.png and /dev/null differ diff --git a/textures/food_oven_front.png b/textures/food_oven_front.png deleted file mode 100644 index 55ee708..0000000 Binary files a/textures/food_oven_front.png and /dev/null differ diff --git a/textures/food_oven_front_active.png b/textures/food_oven_front_active.png deleted file mode 100644 index ba732e6..0000000 Binary files a/textures/food_oven_front_active.png and /dev/null differ diff --git a/textures/food_oven_side.png b/textures/food_oven_side.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_side.png and /dev/null differ diff --git a/textures/food_oven_top.png b/textures/food_oven_top.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_top.png and /dev/null differ diff --git a/textures/food_pasta.png b/textures/food_pasta.png new file mode 100644 index 0000000..9fa194b Binary files /dev/null and b/textures/food_pasta.png differ diff --git a/textures/food_pasta_bake.png b/textures/food_pasta_bake.png new file mode 100644 index 0000000..81221a6 Binary files /dev/null and b/textures/food_pasta_bake.png differ diff --git a/textures/food_pasta_bake_raw.png b/textures/food_pasta_bake_raw.png new file mode 100644 index 0000000..2a6294a Binary files /dev/null and b/textures/food_pasta_bake_raw.png differ diff --git a/textures/food_pastry.png b/textures/food_pastry.png deleted file mode 100644 index 2df203b..0000000 Binary files a/textures/food_pastry.png and /dev/null differ diff --git a/textures/food_pastry_carrot.png b/textures/food_pastry_carrot.png deleted file mode 100644 index b0b973b..0000000 Binary files a/textures/food_pastry_carrot.png and /dev/null differ diff --git a/textures/food_pastry_choco.png b/textures/food_pastry_choco.png deleted file mode 100644 index 578637b..0000000 Binary files a/textures/food_pastry_choco.png and /dev/null differ diff --git a/textures/food_potato.png b/textures/food_potato.png deleted file mode 100644 index 6e91d6a..0000000 Binary files a/textures/food_potato.png and /dev/null differ diff --git a/textures/food_soup_chicken.png b/textures/food_soup_chicken.png deleted file mode 100644 index db9f10d..0000000 Binary files a/textures/food_soup_chicken.png and /dev/null differ diff --git a/textures/food_soup_chicken_raw.png b/textures/food_soup_chicken_raw.png deleted file mode 100644 index 468c73f..0000000 Binary files a/textures/food_soup_chicken_raw.png and /dev/null differ diff --git a/textures/food_soup_tomato.png b/textures/food_soup_tomato.png deleted file mode 100644 index 5cc23be..0000000 Binary files a/textures/food_soup_tomato.png and /dev/null differ diff --git a/textures/food_soup_tomato_raw.png b/textures/food_soup_tomato_raw.png deleted file mode 100644 index 1eac22c..0000000 Binary files a/textures/food_soup_tomato_raw.png and /dev/null differ diff --git a/textures/farming_strawberry.png b/textures/food_strawberry.png similarity index 100% rename from textures/farming_strawberry.png rename to textures/food_strawberry.png diff --git a/textures/food_sw_cheese.png b/textures/food_sw_cheese.png deleted file mode 100644 index d025e8f..0000000 Binary files a/textures/food_sw_cheese.png and /dev/null differ diff --git a/textures/food_sw_meat.png b/textures/food_sw_meat.png deleted file mode 100644 index 56f4e56..0000000 Binary files a/textures/food_sw_meat.png and /dev/null differ diff --git a/textures/food_tart_base.png b/textures/food_tart_base.png deleted file mode 100644 index 43e056d..0000000 Binary files a/textures/food_tart_base.png and /dev/null differ diff --git a/textures/food_tart_base_raw.png b/textures/food_tart_base_raw.png deleted file mode 100644 index e6d1ac4..0000000 Binary files a/textures/food_tart_base_raw.png and /dev/null differ diff --git a/textures/food_tart_strawberry.png b/textures/food_tart_strawberry.png deleted file mode 100644 index 6fcfa99..0000000 Binary files a/textures/food_tart_strawberry.png and /dev/null differ diff --git a/textures/food_tomato.png b/textures/food_tomato.png new file mode 100644 index 0000000..c998b60 Binary files /dev/null and b/textures/food_tomato.png differ diff --git a/textures/food_wheat.png b/textures/food_wheat.png new file mode 100644 index 0000000..8ecd735 Binary files /dev/null and b/textures/food_wheat.png differ diff --git a/textures/my_mobs_cooked_rabbit.png b/textures/my_mobs_cooked_rabbit.png deleted file mode 100644 index 339ab20..0000000 Binary files a/textures/my_mobs_cooked_rabbit.png and /dev/null differ