diff --git a/depends.txt b/depends.txt index 48b3b46..e13a4bf 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,5 @@ food +farming_plus? +plantlib? +bushes_classic? +bushes? diff --git a/init.lua b/init.lua index ee93f3a..8a39363 100644 --- a/init.lua +++ b/init.lua @@ -9,6 +9,10 @@ print("Sweet Foods - Version 0.1") +if not food or not food.version or food.version < 2.1 then + error("You need to update your version of the Food mod - it is too old") +end + -- Boilerplate to support localized strings if intllib mod is installed. local S if (minetest.get_modpath("intllib")) then @@ -20,13 +24,13 @@ end food.support("strawberry","farming_plus","farming_plus:strawberry_item") food.support("strawberry","plantlib","plantlib:strawberry") +food.support("strawberry","bushes_classic","bushes:strawberry") food.support("rhubarb","farming_plus","farming_plus:rhubarb_item") if minetest.setting_get("food_sweet_use_2d")==nil then minetest.setting_set("food_sweet_use_2d", "1") end - food.asupport("walnut",function() minetest.register_craftitem("food_sweet:walnut", { description = S("Walnut"), @@ -36,9 +40,9 @@ food.asupport("walnut",function() food.craft({ output = "food_sweet:walnut 4", recipe = { - {"","default:sand",""}, {"default:sand","","default:sand"}, - {"","default:sand",""} + {"","default:sand",""}, + {"default:sand","","default:sand"} } }) end) @@ -79,7 +83,7 @@ food.asupport("rhubarb",function() groups = {food_rhubarb = 1} }) food.craft({ - output = "food_sweet:rhubarb 4", + output = "food_sweet:rhubarb 10", recipe = { {"wool:red"}, {"wool:red"}, @@ -87,6 +91,21 @@ food.asupport("rhubarb",function() } }) end) +food.asupport("lemon",function() + minetest.register_craftitem("food_sweet:lemon", { + description = S("Lemon"), + inventory_image = "food_lemon.png", + groups = {food_lemon = 1} + }) + food.craft({ + output = "food_sweet:lemon 4", + recipe = { + {"","default:sand",""}, + {"default:sand","","default:sand"}, + {"","default:sand",""} + } + }) +end) -- Walnut and Coffee cake food.register("food_sweet:cake_walnut_coffee",{ @@ -142,7 +161,7 @@ minetest.register_craftitem("food_sweet:cake_cheese",{ description = S("Strawberry Cheese Cake"), inventory_image = "food_sweet_cake_cheese.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_cheese",{ description = S("Strawberry Cheese Cake Mix"), @@ -167,7 +186,7 @@ minetest.register_craftitem("food_sweet:cake_cheese_blueberry",{ description = S("Blueberry Cheese Cake"), inventory_image = "food_sweet_cake_cheese_blueberry.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_cheese_blueberry",{ description = S("Blueberry Cheese Cake Mix"), @@ -192,7 +211,7 @@ minetest.register_craftitem("food_sweet:cake_triple_choco",{ description = S("Triple Chocolate Cake"), inventory_image = "food_sweet_cake_triple_choco.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_triple_choco",{ description = S("Triple Chocolate Cake Mix"), @@ -217,7 +236,7 @@ minetest.register_craftitem("food_sweet:cake_wedding",{ description = S("Wedding Cake"), inventory_image = "food_sweet_cake_wedding.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) food.craft({ @@ -234,7 +253,7 @@ minetest.register_craftitem("food_sweet:crumble_rhubarb",{ description = S("Rhubarb Crumble"), inventory_image = "food_sweet_crumble_rhubarb.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:crumble_rhubarb_raw",{ description = S("Raw Rhubarb Crumble"), @@ -253,3 +272,134 @@ food.craft({ {"group:food_flour","group:food_sugar","group:food_egg"} } }) + +-- Cup cake +minetest.register_craftitem("food_sweet:cupcake",{ + description = S("Cupcake"), + inventory_image = "food_sweet_cupcake.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:cupcake_mix",{ + description = S("Cupcake Mix"), + inventory_image = "food_sweet_cupcake_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:cupcake", + recipe = "food_sweet:cupcake_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:cupcake_mix 6", + recipe = { + {"group:food_flour","","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Chocolate Cupcake +minetest.register_craftitem("food_sweet:cupcake_choco",{ + description = S("Chocolate Cupcake"), + inventory_image = "food_sweet_cupcake_choco.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:cupcake_choco_mix",{ + description = S("Chocolate Cupcake Mix"), + inventory_image = "food_sweet_cupcake_choco_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:cupcake_choco", + recipe = "food_sweet:cupcake_choco_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:cupcake_choco_mix 6", + recipe = { + {"group:food_flour","group:food_milk_chocolate","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Fairy Cake +minetest.register_craftitem("food_sweet:cupcake_fairy",{ + description = S("Fairy Cake"), + inventory_image = "food_sweet_cupcake_fairy.png", + on_use = food.item_eat(2), + groups={food=1} +}) +food.craft({ + output = "food_sweet:cupcake_fairy", + recipe = { + {"group:food_sugar"}, + {"food_sweet:cupcake"} + } +}) + +-- Lemon Cake +minetest.register_craftitem("food_sweet:cupcake_lemon",{ + description = S("Lemon Drizzle Cupcake"), + inventory_image = "food_sweet_cupcake_lemon.png", + on_use = food.item_eat(2), + groups={food=1} +}) +food.craft({ + output = "food_sweet:cupcake_lemon", + recipe = { + {"group:food_lemon"}, + {"food_sweet:cupcake"} + } +}) + +-- Blueberry Muffin +minetest.register_craftitem("food_sweet:muffin_blueberry",{ + description = S("Blueberry Muffin"), + inventory_image = "food_sweet_muffin_blueberry.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:muffin_blueberry_mix",{ + description = S("Blueberry Muffin Mix"), + inventory_image = "food_sweet_cupcake_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:muffin_blueberry", + recipe = "food_sweet:muffin_blueberry_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:muffin_blueberry_mix 6", + recipe = { + {"group:food_flour","group:food_blueberry","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Chocolate Chip Muffin +minetest.register_craftitem("food_sweet:muffin_choco",{ + description = S("Chocolate Chip Muffin"), + inventory_image = "food_sweet_muffin_choco.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:muffin_choco_mix",{ + description = S("Chocolate Chip Muffin Mix"), + inventory_image = "food_sweet_cupcake_choco_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:muffin_choco", + recipe = "food_sweet:muffin_choco_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:muffin_choco_mix 6", + recipe = { + {"","group:food_milk_chocolate",""}, + {"group:food_flour","group:food_milk_chocolate","group:food_egg"}, + {"","group:food_sugar",""} + } +}) diff --git a/locale/template.txt b/locale/template.txt index db34e3a..14a7d80 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,8 +1,12 @@ # template +# Supported Walnut = Strawberry = Blueberry = Rhubarb = +Lemon = + +# Cakes Walnut and Coffee Cake = Walnut and Coffee Cake Mix = Strawberry Cheese Cake = @@ -12,5 +16,22 @@ Blueberry Cheese Cake Mix = Triple Chocolate Cake = Triple Chocolate Cake Mix = Wedding Cake = + +# Crumbles Rhubarb Crumble = Raw Rhubarb Crumble = + +# Cupcake and derivs +Cupcake = +Cupcake Mix = +Chocolate Cupcake = +Chocolate Cupcake Mix = +Lemon Drizzle Cupcake = +Fairy Cake = + +# Muffins +Chocolate Chip Muffin = +Chocolate Chip Muffin Mix = +Blueberry Muffin = +Blueberry Muffin Mix = + diff --git a/textures/food_lemon.png b/textures/food_lemon.png new file mode 100644 index 0000000..d626840 Binary files /dev/null and b/textures/food_lemon.png differ diff --git a/textures/food_sweet_cupcake.png b/textures/food_sweet_cupcake.png new file mode 100644 index 0000000..de92785 Binary files /dev/null and b/textures/food_sweet_cupcake.png differ diff --git a/textures/food_sweet_cupcake_choco.png b/textures/food_sweet_cupcake_choco.png new file mode 100644 index 0000000..75dd706 Binary files /dev/null and b/textures/food_sweet_cupcake_choco.png differ diff --git a/textures/food_sweet_cupcake_choco_mix.png b/textures/food_sweet_cupcake_choco_mix.png new file mode 100644 index 0000000..6b074c6 Binary files /dev/null and b/textures/food_sweet_cupcake_choco_mix.png differ diff --git a/textures/food_sweet_cupcake_fairy.png b/textures/food_sweet_cupcake_fairy.png new file mode 100644 index 0000000..6a98758 Binary files /dev/null and b/textures/food_sweet_cupcake_fairy.png differ diff --git a/textures/food_sweet_cupcake_lemon.png b/textures/food_sweet_cupcake_lemon.png new file mode 100644 index 0000000..2e3ea20 Binary files /dev/null and b/textures/food_sweet_cupcake_lemon.png differ diff --git a/textures/food_sweet_cupcake_mix.png b/textures/food_sweet_cupcake_mix.png new file mode 100644 index 0000000..7999412 Binary files /dev/null and b/textures/food_sweet_cupcake_mix.png differ diff --git a/textures/food_sweet_muffin_blueberry.png b/textures/food_sweet_muffin_blueberry.png new file mode 100644 index 0000000..6d33e38 Binary files /dev/null and b/textures/food_sweet_muffin_blueberry.png differ diff --git a/textures/food_sweet_muffin_choco.png b/textures/food_sweet_muffin_choco.png new file mode 100644 index 0000000..d4e61bb Binary files /dev/null and b/textures/food_sweet_muffin_choco.png differ