Update to 0.2

README.md

@@ -3,7 +3,7 @@ Sweet Foods
 
 An expansion pack for the food mod, written by rubenwardy.
 
-Version 0.1
+Version 0.2
 
 * Strawberry cheese cake
 * Blueberry cheese cake

init.lua

@@ -7,9 +7,9 @@
 -- things
 -- =====================================
 
-print("Sweet Foods - Version 0.1")
+print("Sweet Foods - Version 0.2")
 
-if not food or not food.version or food.version < 2.1 then
+if not food or not food.version or food.version < 2.3 then
 	error("You need to update your version of the Food mod - it is too old")
 end
 
@@ -22,16 +22,14 @@ else
 	S = function ( s ) return s end
 end
 
-food.support("strawberry","farming_plus","farming_plus:strawberry_item")
+food.support("strawberry", {"farming_plus:strawberry_item", "plantlib:strawberry", "bushes:strawberry"})
-food.support("strawberry","plantlib","plantlib:strawberry")
+food.support("rhubarb", "farming_plus:rhubarb_item")
-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()
+food.module("walnut",function()
 	minetest.register_craftitem("food_sweet:walnut", {
 		description = S("Walnut"),
 		inventory_image = "food_sweet_walnut.png",
@@ -45,8 +43,8 @@ food.asupport("walnut",function()
 			{"default:sand","","default:sand"}
 		}
 	})
-end)
+end, true)
-food.asupport("strawberry",function()
+food.module("strawberry",function()
 	minetest.register_alias("food:strawberry", "food_sweet:strawberry")
 	minetest.register_craftitem("food_sweet:strawberry", {
 		description = S("Strawberry"),
@@ -60,8 +58,8 @@ food.asupport("strawberry",function()
 			{"default:apple"},
 		}
 	})
-end)
+end, true)
-food.asupport("blueberry",function()
+food.module("blueberry",function()
 	minetest.register_craftitem("food_sweet:blueberry", {
 		description = S("Blueberry"),
 		inventory_image = "food_sweet_blueberry.png",
@@ -75,8 +73,8 @@ food.asupport("blueberry",function()
 			{"","wool:blue",""}
 		}
 	})
-end)
+end, true)
-food.asupport("rhubarb",function()
+food.module("rhubarb",function()
 	minetest.register_craftitem("food_sweet:rhubarb", {
 		description = S("Rhubard"),
 		inventory_image = "farming_rhubarb.png",
@@ -90,8 +88,8 @@ food.asupport("rhubarb",function()
 			{"wool:red"}
 		}
 	})
-end)
+end, true)
-food.asupport("lemon",function()
+food.module("lemon",function()
 	minetest.register_craftitem("food_sweet:lemon", {
 		description = S("Lemon"),
 		inventory_image = "food_lemon.png",
@@ -105,10 +103,11 @@ food.asupport("lemon",function()
 			{"","default:sand",""}
 		}
 	})
-end)
+end, true)
 
 -- Walnut and Coffee cake
-food.register("food_sweet:cake_walnut_coffee",{
+food.module("cake_walnut_coffee", function()
+	food.register("food_sweet:cake_walnut_coffee",{
 		description = S("Walnut and Coffee Cake"),
 		on_use = food.item_eat(4),
 		groups={food=3,crumbly=3},
@@ -135,271 +134,295 @@ food.register("food_sweet:cake_walnut_coffee",{
 				{0.1875,0.0625,-0.3125,0.3125,0.1875,-0.1875}, --NodeBox5
 			}
 		}
-},"sweet")
+	},"sweet")
-minetest.register_craftitem("food_sweet:cakemix_walnut_coffee",{
+	minetest.register_craftitem("food_sweet:cakemix_walnut_coffee",{
 		description = S("Walnut and Coffee Cake Mix"),
 		inventory_image = "food_sweet_cakemix_walnut_coffee.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cake_walnut_coffee",
 		recipe = "food_sweet:cakemix_walnut_coffee",
 		cooktime = 10
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cakemix_walnut_coffee",
 		recipe = {
 			{"","group:food_walnut",""},
 			{"group:food_flour","group:food_sugar","group:food_egg"}
 		}
-})
+	})
+end)
 
 -- Strawberry Cheese cake
-minetest.register_alias("food:cake_cheese", "food_sweet:cake_cheese")
+food.module("cake_cheese", function()
-minetest.register_alias("food:cakemix_cheese", "food_sweet:cakemix_cheese")
+	minetest.register_alias("food:cake_cheese", "food_sweet:cake_cheese")
-minetest.register_craftitem("food_sweet:cake_cheese",{
+	minetest.register_alias("food:cakemix_cheese", "food_sweet:cakemix_cheese")
+	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}
-})
+	})
-minetest.register_craftitem("food_sweet:cakemix_cheese",{
+	minetest.register_craftitem("food_sweet:cakemix_cheese",{
 		description = S("Strawberry Cheese Cake Mix"),
 		inventory_image = "food_sweet_cakemix_cheese.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cake_cheese",
 		recipe = "food_sweet:cakemix_cheese",
 		cooktime = 10
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cakemix_cheese",
 		recipe = {
 			{"group:food_cheese","group:food_strawberry",""},
 			{"group:food_flour","group:food_sugar","group:food_egg"}
 		}
-})
+	})
+end)
 
 -- Blueberry Cheese Cake
-minetest.register_craftitem("food_sweet:cake_cheese_blueberry",{
+food.module("cake_cheese_blueberry", function()
+	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}
-})
+	})
-minetest.register_craftitem("food_sweet:cakemix_cheese_blueberry",{
+	minetest.register_craftitem("food_sweet:cakemix_cheese_blueberry",{
 		description = S("Blueberry Cheese Cake Mix"),
 		inventory_image = "food_sweet_cakemix_cheese_blueberry.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cake_cheese_blueberry",
 		recipe = "food_sweet:cakemix_cheese_blueberry",
 		cooktime = 10
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cakemix_cheese",
 		recipe = {
 			{"group:food_cheese","group:food_blueberry",""},
 			{"group:food_flour","group:food_sugar","group:food_egg"}
 		}
-})
+	})
+end)
 
 -- Triple chocolate cake
-minetest.register_craftitem("food_sweet:cake_triple_choco",{
+food.module("cake_triple_choco", function()
+	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}
-})
+	})
-minetest.register_craftitem("food_sweet:cakemix_triple_choco",{
+	minetest.register_craftitem("food_sweet:cakemix_triple_choco",{
 		description = S("Triple Chocolate Cake Mix"),
 		inventory_image = "food_sweet_cakemix_triple_choco.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cake_triple_choco",
 		recipe = "food_sweet:cakemix_triple_choco",
 		cooktime = 10
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cakemix_triple_choco",
 		recipe = {
 			{"group:food_milk_chocolate","group:food_milk_chocolate","group:food_milk_chocolate"},
 			{"group:food_flour","group:food_sugar","group:food_egg"}
 		}
-})
+	})
+end)
 
 -- Wedding Cake
-minetest.register_craftitem("food_sweet:cake_wedding",{
+food.module("cake_wedding", function()
+	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}
-})
+	})
 
-food.craft({
+	food.craft({
 		output = "food_sweet:cake_wedding",
 		recipe = {
 			{"food:cake"},
 			{"food:cake"},
 			{"food:cake"}
 		}
-})
+	})
+end)
 
 -- Rhubarb Crumble
-minetest.register_craftitem("food_sweet:crumble_rhubarb",{
+food.module("crumble_rhubarb", function()
+	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}
-})
+	})
-minetest.register_craftitem("food_sweet:crumble_rhubarb_raw",{
+	minetest.register_craftitem("food_sweet:crumble_rhubarb_raw",{
 		description = S("Raw Rhubarb Crumble"),
 		inventory_image = "food_sweet_crumble_rhubarb_raw.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:crumble_rhubarb",
 		recipe = "food_sweet:crumble_rhubarb_raw",
 		cooktime = 10
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:crumble_rhubarb_raw",
 		recipe = {
 			{"","group:food_rhubarb",""},
 			{"group:food_flour","group:food_sugar","group:food_egg"}
 		}
-})
+	})
+end)
 
 -- Cup cake
-minetest.register_craftitem("food_sweet:cupcake",{
+food.module("cupcake", function()
+	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",{
+	minetest.register_craftitem("food_sweet:cupcake_mix",{
 		description = S("Cupcake Mix"),
 		inventory_image = "food_sweet_cupcake_mix.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cupcake",
 		recipe = "food_sweet:cupcake_mix",
 		cooktime = 1
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cupcake_mix 6",
 		recipe = {
 			{"group:food_flour","","group:food_egg"},
 			{"","group:food_sugar",""}
 		}
-})
+	})
+end)
 
 -- Chocolate Cupcake
-minetest.register_craftitem("food_sweet:cupcake_choco",{
+food.module("cupcake_choco", function()
+	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",{
+	minetest.register_craftitem("food_sweet:cupcake_choco_mix",{
 		description = S("Chocolate Cupcake Mix"),
 		inventory_image = "food_sweet_cupcake_choco_mix.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:cupcake_choco",
 		recipe = "food_sweet:cupcake_choco_mix",
 		cooktime = 1
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:cupcake_choco_mix 6",
 		recipe = {
 			{"group:food_flour","group:food_milk_chocolate","group:food_egg"},
 			{"","group:food_sugar",""}
 		}
-})
+	})
+end)
 
 -- Fairy Cake
-minetest.register_craftitem("food_sweet:cupcake_fairy",{
+food.module("cupcake_fairy", function()
+	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({
+	food.craft({
 		output = "food_sweet:cupcake_fairy",
 		recipe = {
 			{"group:food_sugar"},
 			{"food_sweet:cupcake"}
 		}
-})
+	})
+end)
 
 -- Lemon Cake
-minetest.register_craftitem("food_sweet:cupcake_lemon",{
+food.module("cupcake_lemon", function()
+	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({
+	food.craft({
 		output = "food_sweet:cupcake_lemon",
 		recipe = {
 			{"group:food_lemon"},
 			{"food_sweet:cupcake"}
 		}
-})
+	})
+end)
 
 -- Blueberry Muffin
-minetest.register_craftitem("food_sweet:muffin_blueberry",{
+food.module("muffin_blueberry", function()
+	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",{
+	minetest.register_craftitem("food_sweet:muffin_blueberry_mix",{
 		description = S("Blueberry Muffin Mix"),
 		inventory_image = "food_sweet_cupcake_mix.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:muffin_blueberry",
 		recipe = "food_sweet:muffin_blueberry_mix",
 		cooktime = 1
-})
+	})
-food.craft({
+	food.craft({
 		output = "food_sweet:muffin_blueberry_mix 6",
 		recipe = {
 			{"group:food_flour","group:food_blueberry","group:food_egg"},
 			{"","group:food_sugar",""}
 		}
-})
+	})
+end)
 
 -- Chocolate Chip Muffin
-minetest.register_craftitem("food_sweet:muffin_choco",{
+food.module("muffin_choco", function()
+	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",{
+	minetest.register_craftitem("food_sweet:muffin_choco_mix",{
 		description = S("Chocolate Chip Muffin Mix"),
 		inventory_image = "food_sweet_cupcake_choco_mix.png"
-})
+	})
-food.craft({
+	food.craft({
 		type = "cooking",
 		output = "food_sweet:muffin_choco",
 		recipe = "food_sweet:muffin_choco_mix",
 		cooktime = 1
-})
+	})
-food.craft({
+	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",""}
 		}
-})
+	})
+end)
+