diff --git a/baking.lua b/baking.lua index 98da7ad..3e12f92 100644 --- a/baking.lua +++ b/baking.lua @@ -11,31 +11,11 @@ -- doughs -minetest.register_craftitem("rubenfood:dough", { +if not minetest.get_modpath("farming") then + +else +minetest.register_craftitem(":farming:cake_mix", { description = "Dough", inventory_image = "farming_cake_mix.png", }) - -if add_bread_craft then -minetest.register_craft({ - output = "rubenfood:dough", - type = "shapeless", - recipe = {"rubenfood:flour","rubenfood:flour", "bucket:bucket_water"}, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} -}) - -minetest.register_craft({ - type = "cooking", - output = "rubenfood:bread", - recipe = "rubenfood:dough", - cooktime = 10 -}) - -end - -minetest.register_craftitem("rubenfood:bread", { - description = "Bread", - inventory_image = "ruben_bread.png", - stack_max = 1, - on_use = minetest.item_eat(10) -}) \ No newline at end of file +end \ No newline at end of file diff --git a/cakes.lua b/cakes.lua index 4a4b772..94a9d34 100644 --- a/cakes.lua +++ b/cakes.lua @@ -11,39 +11,39 @@ print("RubenFood [Master] - Loading Cakes") --------------------------Cakes------------------------- -minetest.register_craftitem("rubenfood:cakemix_plain",{ +minetest.register_craftitem("food:cakemix_plain",{ description = "Cake Mix", - tiles = {"ruben_pastry.png"}, - inventory_image = "ruben_pastry.png", + tiles = {"food_pastry.png"}, + inventory_image = "food_pastry.png", }) -minetest.register_craftitem("rubenfood:cakemix_choco",{ +minetest.register_craftitem("food:cakemix_choco",{ description = "Chocolate Cake Mix", - tiles = {"ruben_pastry_choco.png"}, - inventory_image = "ruben_pastry_choco.png", + tiles = {"food_pastry_choco.png"}, + inventory_image = "food_pastry_choco.png", }) minetest.register_craft({ type = "cooking", - output = "rubenfood:cake", - recipe = "rubenfood:cakemix_plain", + output = "food:cake", + recipe = "food:cakemix_plain", }) minetest.register_craft({ type = "cooking", - output = "rubenfood:cake_chocolate", - recipe = "rubenfood:cakemix_choco", + output = "food:cake_chocolate", + recipe = "food:cakemix_choco", }) -minetest.register_craftitem("rubenfood:cake", { +minetest.register_craftitem("food:cake", { description = "Cake", - inventory_image = "ruben_cake.png", + inventory_image = "food_cake.png", on_use = minetest.item_eat(30), }) -minetest.register_craftitem("rubenfood:cake_chocolate", { +minetest.register_craftitem("food:cake_chocolate", { description = "Chocolate Cake", - inventory_image = "ruben_cake_choco.png", + inventory_image = "food_cake_choco.png", on_use = minetest.item_eat(40), }) @@ -55,15 +55,15 @@ minetest.register_craftitem("rubenfood:cake_chocolate", { ----------------------------- Cake Pastry ---------------------------- minetest.register_craft({ - output = '"rubenfood:cakemix_plain" 1', + output = '"food:cakemix_plain" 1', recipe = { - {'"rubenfood:flour"',"",'"rubenfood:egg"'}, + {'"food:flour"',"",'"food:egg"'}, } }) minetest.register_craft({ - output = '"rubenfood:cakemix_choco" 1', + output = '"food:cakemix_choco" 1', recipe = { - {'""','"default:dirt"','""'}, {'"rubenfood:flour"',"",'"rubenfood:egg"'}, + {'""','"default:dirt"','""'}, {'"food:flour"',"",'"food:egg"'}, } }) \ No newline at end of file diff --git a/dairy.lua b/dairy.lua index 7487a62..017fea1 100644 --- a/dairy.lua +++ b/dairy.lua @@ -11,28 +11,28 @@ -- [craft] Butter -- ====================================== -minetest.register_craftitem("rubenfood:butter", { +minetest.register_craftitem("food:butter", { description = "Butter", - inventory_image = "ruben_butter.png", + inventory_image = "food_butter.png", }) -minetest.register_craftitem("rubenfood:cheese", { +minetest.register_craftitem("food:cheese", { description = "Cheese", - inventory_image = "ruben_cheese.png", + inventory_image = "food_cheese.png", on_use = minetest.item_eat(4), }) minetest.register_craft({ - output = '"rubenfood:butter" 1', + output = '"food:butter" 1', recipe = { - {'"rubenfood:milk"','"rubenfood:milk"'}, + {'"food:milk"','"food:milk"'}, } }) minetest.register_craft({ - output = '"rubenfood:cheese" 1', + output = '"food:cheese" 1', recipe = { - {'"rubenfood:butter"','"rubenfood:butter"'}, + {'"food:butter"','"food:butter"'}, } }) diff --git a/drinks.lua b/drinks.lua index 49ca709..b518263 100644 --- a/drinks.lua +++ b/drinks.lua @@ -14,12 +14,12 @@ print ("RubenFood [Master] - Loading Juices") --------------------------Apple Juice-------------------------- -minetest.register_node(":rubenfood:apple_juice", { +minetest.register_node("food:apple_juice", { description = "Apple Juice", visual_scale = 1.0, - tiles = {"ruben_juice_apple.png"}, - inventory_image = "ruben_juice_apple.png", + tiles = {"food_juice_apple.png"}, + inventory_image = "food_juice_apple.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -29,11 +29,11 @@ minetest.register_node(":rubenfood:apple_juice", { }) minetest.register_craft({ - output = '"rubenfood:apple_juice" 4', + output = '"food:apple_juice" 4', recipe = { {'""','""','""'}, {'""','"default:apple"','""'}, - {'""','"rubenfood:cup"','""'}, + {'""','"food:cup"','""'}, } }) @@ -42,12 +42,12 @@ minetest.register_craft({ ----------------------cactus juice---------------------------- -minetest.register_node(":rubenfood:cactus_juice", { +minetest.register_node(":food:cactus_juice", { description = "Cactuz Juice", visual_scale = 1.0, - tiles = {"ruben_juice_cactus.png"}, - inventory_image = "ruben_juice_cactus.png", + tiles = {"food_juice_cactus.png"}, + inventory_image = "food_juice_cactus.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -57,11 +57,11 @@ minetest.register_node(":rubenfood:cactus_juice", { }) minetest.register_craft({ - output = '"rubenfood:cactus_juice" 4', + output = '"food:cactus_juice" 4', recipe = { {'""','""','""'}, {'""','"default:cactus"','""'}, - {'""','"rubenfood:cup"','""'}, + {'""','"food:cup"','""'}, } }) @@ -76,24 +76,24 @@ minetest.register_craft({ -----------------------------Coffee----------------------------- -minetest.register_craftitem(":rubenfood:coffeebean",{ +minetest.register_craftitem(":food:coffeebean",{ description = "Raw Coffee Bean", - tiles = {"ruben_coffee.png"}, - inventory_image = "ruben_coffee.png", + tiles = {"food_coffee.png"}, + inventory_image = "food_coffee.png", }) -minetest.register_craftitem(":rubenfood:coffeebean_cooked",{ +minetest.register_craftitem(":food:coffeebean_cooked",{ description = "Cooked Coffee Bean", - tiles = {"ruben_coffee_cooked.png"}, - inventory_image = "ruben_coffee_cooked.png", + tiles = {"food_coffee_cooked.png"}, + inventory_image = "food_coffee_cooked.png", }) -minetest.register_node(":rubenfood:coffee", { +minetest.register_node(":food:coffee", { description = "Coffee", visual_scale = 1.0, - tiles = {"ruben_coffee_cup.png"}, - inventory_image = "ruben_coffee_cup.png", + tiles = {"food_coffee_cup.png"}, + inventory_image = "food_coffee_cup.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -103,7 +103,7 @@ minetest.register_node(":rubenfood:coffee", { }) minetest.register_craft({ - output = '"rubenfood:coffeebean" 1', + output = '"food:coffeebean" 1', recipe = { {'""','"default:dry_shrub"','""'}, {'""','"default:dry_shrub"','""'}, @@ -112,18 +112,18 @@ minetest.register_craft({ }) minetest.register_craft({ - output = '"rubenfood:coffee" 1', + output = '"food:coffee" 1', recipe = { - {'""','"rubenfood:coffeebean_cooked"','""'}, - {'""','"rubenfood:coffeebean_cooked"','""'}, - {'""','"rubenfood:cup"','""'}, + {'""','"food:coffeebean_cooked"','""'}, + {'""','"food:coffeebean_cooked"','""'}, + {'""','"food:cup"','""'}, } }) minetest.register_craft({ type = "cooking", - output = "rubenfood:coffeebean_cooked", - recipe = "rubenfood:coffeebean", + output = "food:coffeebean_cooked", + recipe = "food:coffeebean", }) diff --git a/fruits.lua b/fruits.lua index ff7a2b0..7322f7d 100644 --- a/fruits.lua +++ b/fruits.lua @@ -14,8 +14,8 @@ minetest.register_node(":default:orange", { description = "Orange Fruit", drawtype = "plantlike", visual_scale = 1.0, - tiles = {"ruben_orange.png"}, - inventory_image = "ruben_orange.png", + tiles = {"food_orange.png"}, + inventory_image = "food_orange.png", paramtype = "light", sunlight_propagates = true, walkable = false, diff --git a/init.lua b/init.lua index acca8f2..8753fea 100644 --- a/init.lua +++ b/init.lua @@ -10,31 +10,31 @@ -- [regis-food] Cigerette (-4) -- ===================================== -print ("RubenFood: Loading mainframe: [Master]") +print ("food: Loading mainframe: [Master]") ----------------------Load Files----------------------------- -dofile(minetest.get_modpath("rubenfood").."/support.lua") -dofile(minetest.get_modpath("rubenfood").."/dairy.lua") +dofile(minetest.get_modpath("food").."/support.lua") +dofile(minetest.get_modpath("food").."/dairy.lua") -dofile(minetest.get_modpath("rubenfood").."/baking.lua") -dofile(minetest.get_modpath("rubenfood").."/cakes.lua") -dofile(minetest.get_modpath("rubenfood").."/tarts.lua") +dofile(minetest.get_modpath("food").."/baking.lua") +dofile(minetest.get_modpath("food").."/cakes.lua") +dofile(minetest.get_modpath("food").."/tarts.lua") -dofile(minetest.get_modpath("rubenfood").."/drinks.lua") ---dofile(minetest.get_modpath("rubenfood").."/fruits.lua") +dofile(minetest.get_modpath("food").."/drinks.lua") +--dofile(minetest.get_modpath("food").."/fruits.lua") ----------------------------Cup------------------------------ -minetest.register_craftitem("rubenfood:mug",{ +minetest.register_craftitem("food:mug",{ description = "Mug", - tiles = {"ruben_mug.png"}, - inventory_image = "ruben_mug.png", + tiles = {"food_mug.png"}, + inventory_image = "food_mug.png", }) minetest.register_craft({ - output = '"rubenfood:cup" 4', + output = '"food:cup" 4', recipe = { {"default:glass"}, {"default:glass"}, @@ -43,11 +43,11 @@ minetest.register_craft({ ----------------------------Cigerete---------------------------- -minetest.register_node(":rubenfood:cigarette", { +minetest.register_node(":food:cigarette", { description = "Cigarette", visual_scale = 1.0, - tiles = {"ruben_cigar.png"}, - inventory_image = "ruben_cigar.png", + tiles = {"food_cigar.png"}, + inventory_image = "food_cigar.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -57,11 +57,11 @@ minetest.register_node(":rubenfood:cigarette", { }) minetest.register_craft({ - output = '"rubenfood:cigarette" 1', + output = '"food:cigarette" 1', recipe = { {'"default:dry_shrub"','"default:dry_shrub"','"default:dry_shrub"'}, } }) -print("Rubenfood: Mainframe loaded") \ No newline at end of file +print("food: Mainframe loaded") \ No newline at end of file diff --git a/support.lua b/support.lua index fe6022f..8fc95d7 100644 --- a/support.lua +++ b/support.lua @@ -24,44 +24,80 @@ end print "RubenFood [Support] - Farming Mod" -node_implement("farming","farming:flour","rubenfood:flour",function() - minetest.register_craftitem("rubenfood:flour", { +node_implement("farming","farming:flour","food:flour",function() + minetest.register_craftitem("food:flour", { description = "Flour", inventory_image = "farming_flour.png", }) end) -node_implement("farming","farming:strawberry_item","rubenfood:strawberry",function() -minetest.register_craftitem("rubenfood:strawberry", { +node_implement("farming","farming:strawberry_item","food:strawberry",function() +minetest.register_craftitem("food:strawberry", { description = "Strawberry", inventory_image = "farming_strawberry.png", on_use = minetest.item_eat(2), }) end) +node_implement("farming","farming:bread","food:bread",function() + + + +minetest.register_craftitem("food:bread", { + description = "Bread", + inventory_image = "farming_bread.png", + stack_max = 1, + on_use = minetest.item_eat(10) +}) +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"}} +}) +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", +}) +end) + print "RubenFood [Support] - Animal Mod" -node_implement("animalmaterials","animalmaterials:glass","rubenfood:cup",function() - minetest.register_craftitem("rubenfood:cup",{ +node_implement("animalmaterials","animalmaterials:glass","food:cup",function() + minetest.register_craftitem("food:cup",{ description = "Glass", - tiles = {"ruben_cup.png"}, - inventory_image = "ruben_cup.png", + tiles = {"food_cup.png"}, + inventory_image = "food_cup.png", }) end) -node_implement("animalmaterials","animalmaterials:egg","rubenfood:egg",function() - minetest.register_craftitem("rubenfood:egg", { +node_implement("animalmaterials","animalmaterials:egg","food:egg",function() + minetest.register_craftitem("food:egg", { description = "Egg", image = "animalmaterials_egg.png", stack_max=10 }) end) -node_implement("animalmaterials","animalmaterials:milk","rubenfood:milk",function() - minetest.register_craftitem("rubenfood:milk", { +node_implement("animalmaterials","animalmaterials:milk","food:milk",function() + minetest.register_craftitem("food:milk", { description = "Milk", image = "animalmaterials_milk.png", on_use = minetest.item_eat(1), diff --git a/tarts.lua b/tarts.lua index 14662cc..905f6f1 100644 --- a/tarts.lua +++ b/tarts.lua @@ -10,39 +10,39 @@ print "RubenFood [Master] - Loading Tarts" -minetest.register_craftitem("rubenfood:tart_strawberry", { +minetest.register_craftitem("food:tart_strawberry", { description = "Strawberry Tart", - inventory_image = "ruben_tart_strawberry.png", + inventory_image = "food_tart_strawberry.png", on_use = minetest.item_eat(30), }) -minetest.register_craftitem("rubenfood:tart_base", { +minetest.register_craftitem("food:tart_base", { description = "Tart Base", - inventory_image = "ruben_tart_base.png", + inventory_image = "food_tart_base.png", }) -minetest.register_craftitem("rubenfood:tart_base_raw", { +minetest.register_craftitem("food:tart_base_raw", { description = "Raw Tart Base", - inventory_image = "ruben_tart_base_raw.png", + inventory_image = "food_tart_base_raw.png", }) minetest.register_craft({ type = "cooking", - output = "rubenfood:tart_base", - recipe = "rubenfood:tart_base_raw", + output = "food:tart_base", + recipe = "food:tart_base_raw", }) minetest.register_craft({ - output = '"rubenfood:tart_strawberry" 1', + output = '"food:tart_strawberry" 1', recipe = { - {'"rubenfood:strawberry"'},{'"rubenfood:tart_base"'}, + {'"food:strawberry"'},{'"food:tart_base"'}, } }) minetest.register_craft({ - output = '"rubenfood:tart_base_raw" 1', + output = '"food:tart_base_raw" 1', recipe = { - {'"rubenfood:flour"','"rubenfood:milk"','"rubenfood:egg"'}, + {'"food:flour"','"food:milk"','"food:egg"'}, } }) diff --git a/textures/ruben_bread.png b/textures/food_bread.png similarity index 100% rename from textures/ruben_bread.png rename to textures/food_bread.png diff --git a/textures/ruben_butter.png b/textures/food_butter.png similarity index 100% rename from textures/ruben_butter.png rename to textures/food_butter.png diff --git a/textures/ruben_cake.png b/textures/food_cake.png similarity index 100% rename from textures/ruben_cake.png rename to textures/food_cake.png diff --git a/textures/ruben_cake_choco.png b/textures/food_cake_choco.png similarity index 100% rename from textures/ruben_cake_choco.png rename to textures/food_cake_choco.png diff --git a/textures/ruben_cheese.png b/textures/food_cheese.png similarity index 100% rename from textures/ruben_cheese.png rename to textures/food_cheese.png diff --git a/textures/food_cigar.png b/textures/food_cigar.png new file mode 100644 index 0000000..df436f7 Binary files /dev/null and b/textures/food_cigar.png differ diff --git a/textures/ruben_coffee.png b/textures/food_coffee.png similarity index 100% rename from textures/ruben_coffee.png rename to textures/food_coffee.png diff --git a/textures/ruben_coffee_cooked.png b/textures/food_coffee_cooked.png similarity index 100% rename from textures/ruben_coffee_cooked.png rename to textures/food_coffee_cooked.png diff --git a/textures/ruben_coffee_cup.png b/textures/food_coffee_cup.png similarity index 100% rename from textures/ruben_coffee_cup.png rename to textures/food_coffee_cup.png diff --git a/textures/ruben_cup.png b/textures/food_cup.png similarity index 100% rename from textures/ruben_cup.png rename to textures/food_cup.png diff --git a/textures/ruben_juice_apple.png b/textures/food_juice_apple.png similarity index 100% rename from textures/ruben_juice_apple.png rename to textures/food_juice_apple.png diff --git a/textures/ruben_juice_cactuz.png b/textures/food_juice_cactus.png similarity index 100% rename from textures/ruben_juice_cactuz.png rename to textures/food_juice_cactus.png diff --git a/textures/ruben_mug.png b/textures/food_mug.png similarity index 100% rename from textures/ruben_mug.png rename to textures/food_mug.png diff --git a/textures/ruben_pastry.png b/textures/food_pastry.png similarity index 100% rename from textures/ruben_pastry.png rename to textures/food_pastry.png diff --git a/textures/ruben_pastry_choco.png b/textures/food_pastry_choco.png similarity index 100% rename from textures/ruben_pastry_choco.png rename to textures/food_pastry_choco.png diff --git a/textures/ruben_tart_base.png b/textures/food_tart_base.png similarity index 100% rename from textures/ruben_tart_base.png rename to textures/food_tart_base.png diff --git a/textures/ruben_tart_base_raw.png b/textures/food_tart_base_raw.png similarity index 100% rename from textures/ruben_tart_base_raw.png rename to textures/food_tart_base_raw.png diff --git a/textures/ruben_tart_strawberry.png b/textures/food_tart_strawberry.png similarity index 100% rename from textures/ruben_tart_strawberry.png rename to textures/food_tart_strawberry.png diff --git a/textures/ruben_cigar.png b/textures/ruben_cigar.png deleted file mode 100644 index f2275ec..0000000 Binary files a/textures/ruben_cigar.png and /dev/null differ