diff --git a/modpack.txt b/modpack.txt new file mode 100644 index 0000000..e69de29 diff --git a/baking.lua b/rubenfood/baking.lua similarity index 83% rename from baking.lua rename to rubenfood/baking.lua index bf0bd87..98da7ad 100644 --- a/baking.lua +++ b/rubenfood/baking.lua @@ -16,15 +16,14 @@ minetest.register_craftitem("rubenfood: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", "rubenfood:flour", "rubenfood:flour", "bucket:bucket_water"}, + recipe = {"rubenfood:flour","rubenfood:flour", "bucket:bucket_water"}, replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} }) - ---plain bread minetest.register_craft({ type = "cooking", output = "rubenfood:bread", @@ -32,6 +31,8 @@ minetest.register_craft({ cooktime = 10 }) +end + minetest.register_craftitem("rubenfood:bread", { description = "Bread", inventory_image = "ruben_bread.png", diff --git a/cakes.lua b/rubenfood/cakes.lua similarity index 86% rename from cakes.lua rename to rubenfood/cakes.lua index 8b1b90d..09d1042 100644 --- a/cakes.lua +++ b/rubenfood/cakes.lua @@ -11,13 +11,13 @@ print("RubenFood [Master] - Loading Cakes") --------------------------Cakes------------------------- -minetest.register_craftitem(":rubenfood:cakemix_plain",{ +minetest.register_craftitem("rubenfood:cakemix_plain",{ description = "Cake Mix", tiles = {"ruben_pastry.png"}, inventory_image = "ruben_pastry.png", }) -minetest.register_craftitem(":rubenfood:cakemix_choco",{ +minetest.register_craftitem("rubenfood:cakemix_choco",{ description = "Chocolate Cake Mix", tiles = {"ruben_pastry_choco.png"}, inventory_image = "ruben_pastry_choco.png", @@ -35,7 +35,7 @@ minetest.register_craft({ recipe = "rubenfood:cakemix_choco", }) -minetest.register_node(":rubenfood:cake", { +minetest.register_node("rubenfood:cake", { description = "Cake", drawtype = "plantlike", visual_scale = 1.0, @@ -49,7 +49,7 @@ minetest.register_node(":rubenfood:cake", { sounds = default.node_sound_defaults(), }) -minetest.register_node(":rubenfood:cake_chocolate", { +minetest.register_node("rubenfood:cake_chocolate", { description = "Chocolate Cake", drawtype = "plantlike", visual_scale = 1.0, diff --git a/rubenfood/dairy.lua b/rubenfood/dairy.lua new file mode 100644 index 0000000..c0388a4 --- /dev/null +++ b/rubenfood/dairy.lua @@ -0,0 +1,21 @@ +-- RUBENFOOD MOD +-- A mod written by rubenwardy that adds +-- food to the minetest game +-- ====================================== +-- >> rubenfood/support.lua +-- adds support for other mods +-- adds items and aliases that are needed +-- ====================================== +-- [regis-item] Flour +-- [regis-item] Milk +-- [regis-item] Egg +-- [regis-food] Cheese +-- [craft] Cheese +-- [regis-item] Butter +-- [craft] Butter +-- ====================================== + + + + + diff --git a/depends.txt b/rubenfood/depends.txt similarity index 100% rename from depends.txt rename to rubenfood/depends.txt diff --git a/drinks.lua b/rubenfood/drinks.lua similarity index 100% rename from drinks.lua rename to rubenfood/drinks.lua diff --git a/fruits.lua b/rubenfood/fruits.lua similarity index 100% rename from fruits.lua rename to rubenfood/fruits.lua diff --git a/init.lua b/rubenfood/init.lua similarity index 73% rename from init.lua rename to rubenfood/init.lua index 5d8aa89..ce0a043 100644 --- a/init.lua +++ b/rubenfood/init.lua @@ -13,25 +13,35 @@ print ("RubenFood: Loading mainframe: [Master]") ----------------------Load Files----------------------------- +dofile(minetest.get_modpath("rubenfood").."/dairy.lua") + dofile(minetest.get_modpath("rubenfood").."/baking.lua") dofile(minetest.get_modpath("rubenfood").."/cakes.lua") dofile(minetest.get_modpath("rubenfood").."/drinks.lua") dofile(minetest.get_modpath("rubenfood").."/fruits.lua") -dofile(minetest.get_modpath("rubenfood").."/support.lua") + ----------------------------Cup------------------------------ -minetest.register_craftitem(":rubenfood:cup",{ +minetest.register_alias("rubenfood:cup","animalmaterials:glass") +minetest.register_craftitem(":animalmaterials:glass",{ description = "Cup", - tiles = {"ruben_coffee.png"}, - inventory_image = "ruben_coffee.png", + tiles = {"ruben_cup.png"}, + inventory_image = "ruben_cup.png", +}) + +minetest.register_craftitem("rubenfood:mug",{ + description = "Mug", + tiles = {"ruben_mug.png"}, + inventory_image = "ruben_mug.png", }) minetest.register_craft({ output = '"rubenfood:cup" 4', recipe = { - {'"bucket:bucket_water"'}, + {"default:glass"}, + {"default:glass"}, } }) diff --git a/textures/animalmaterials_egg.png b/rubenfood/textures/animalmaterials_egg.png similarity index 100% rename from textures/animalmaterials_egg.png rename to rubenfood/textures/animalmaterials_egg.png diff --git a/textures/animalmaterials_milk.png b/rubenfood/textures/animalmaterials_milk.png similarity index 100% rename from textures/animalmaterials_milk.png rename to rubenfood/textures/animalmaterials_milk.png diff --git a/textures/ruben_bread.png b/rubenfood/textures/ruben_bread.png similarity index 100% rename from textures/ruben_bread.png rename to rubenfood/textures/ruben_bread.png diff --git a/textures/ruben_cake.png b/rubenfood/textures/ruben_cake.png similarity index 100% rename from textures/ruben_cake.png rename to rubenfood/textures/ruben_cake.png diff --git a/textures/ruben_cake_choco.png b/rubenfood/textures/ruben_cake_choco.png similarity index 100% rename from textures/ruben_cake_choco.png rename to rubenfood/textures/ruben_cake_choco.png diff --git a/rubenfood/textures/ruben_cigar.png b/rubenfood/textures/ruben_cigar.png new file mode 100644 index 0000000..f2275ec Binary files /dev/null and b/rubenfood/textures/ruben_cigar.png differ diff --git a/textures/ruben_coffee.png b/rubenfood/textures/ruben_coffee.png similarity index 100% rename from textures/ruben_coffee.png rename to rubenfood/textures/ruben_coffee.png diff --git a/textures/ruben_coffee_cooked.png b/rubenfood/textures/ruben_coffee_cooked.png similarity index 100% rename from textures/ruben_coffee_cooked.png rename to rubenfood/textures/ruben_coffee_cooked.png diff --git a/rubenfood/textures/ruben_coffee_cup.png b/rubenfood/textures/ruben_coffee_cup.png new file mode 100644 index 0000000..272299a Binary files /dev/null and b/rubenfood/textures/ruben_coffee_cup.png differ diff --git a/textures/animalmaterials_glass.png b/rubenfood/textures/ruben_cup.png similarity index 100% rename from textures/animalmaterials_glass.png rename to rubenfood/textures/ruben_cup.png diff --git a/rubenfood/textures/ruben_juice_apple.png b/rubenfood/textures/ruben_juice_apple.png new file mode 100644 index 0000000..fc2b8ef Binary files /dev/null and b/rubenfood/textures/ruben_juice_apple.png differ diff --git a/rubenfood/textures/ruben_mug.png b/rubenfood/textures/ruben_mug.png new file mode 100644 index 0000000..f68173b Binary files /dev/null and b/rubenfood/textures/ruben_mug.png differ diff --git a/rubenfood/textures/ruben_pastry.png b/rubenfood/textures/ruben_pastry.png new file mode 100644 index 0000000..2df203b Binary files /dev/null and b/rubenfood/textures/ruben_pastry.png differ diff --git a/textures/ruben_pastry_choco.png b/rubenfood/textures/ruben_pastry_choco.png similarity index 100% rename from textures/ruben_pastry_choco.png rename to rubenfood/textures/ruben_pastry_choco.png diff --git a/rubenfood_animals/init.lua b/rubenfood_animals/init.lua new file mode 100644 index 0000000..aa3cdf2 --- /dev/null +++ b/rubenfood_animals/init.lua @@ -0,0 +1,2 @@ +minetest.register_alias("rubenfood:milk","animalmaterials:milk") +minetest.register_alias("rubenfood:egg","animalmaterials:egg") \ No newline at end of file diff --git a/rubenfood_farming/init.lua b/rubenfood_farming/init.lua new file mode 100644 index 0000000..ab5e489 --- /dev/null +++ b/rubenfood_farming/init.lua @@ -0,0 +1 @@ +minetest.register_alias("rubenfood:flour","farming:flour") \ No newline at end of file diff --git a/support.lua b/support.lua deleted file mode 100644 index 3a48324..0000000 --- a/support.lua +++ /dev/null @@ -1,53 +0,0 @@ --- RUBENFOOD MOD --- A mod written by rubenwardy that adds --- food to the minetest game --- ====================================== --- >> rubenfood/support.lua --- adds support for other modss --- adds items and aliases that are needed --- ====================================== --- [regis-item] Flour --- [regis-item] Milk --- [regis-item] Egg --- [regis-food] Cheese --- [craft] Cheese --- [regis-item] Butter --- [craft] Butter --- ====================================== - - - - -------------------------------------aliases------------------------------------ - -minetest.register_alias("farming:flour","rubenfood:flour") -minetest.register_alias("farming:cake_mix", "rubenfood:dough") -minetest.register_alias("farming:bread", "rubenfood:bread") - -minetest.register_alias("animalmaterials:milk","rubenfood:milk") -minetest.register_alias("animalmaterials:egg","rubenfood:egg") - - - - - -------------------------------------farming------------------------------------ -minetest.register_craftitem("rubenfood:flour", { - description = "Flour", - inventory_image = "farming_flour.png", -}) - -------------------------------------animals------------------------------------ -minetest.register_craftitem("rubenfood:milk", { - description = "Milk", - image = "animalmaterials_milk.png", - on_use = minetest.item_eat(1), - groups = { eatable=1 }, - stack_max=10 -}) - -minetest.register_craftitem("rubenfood:egg", { - description = "Egg", - image = "animalmaterials_egg.png", - stack_max=10 -}) \ No newline at end of file diff --git a/textures/ruben_cigar.png b/textures/ruben_cigar.png deleted file mode 100644 index 35ed4de..0000000 Binary files a/textures/ruben_cigar.png and /dev/null differ diff --git a/textures/ruben_coffee_cup.png b/textures/ruben_coffee_cup.png deleted file mode 100644 index f026f64..0000000 Binary files a/textures/ruben_coffee_cup.png and /dev/null differ diff --git a/textures/ruben_juice_apple.png b/textures/ruben_juice_apple.png deleted file mode 100644 index 9a71e03..0000000 Binary files a/textures/ruben_juice_apple.png and /dev/null differ diff --git a/textures/ruben_pastry.png b/textures/ruben_pastry.png deleted file mode 100644 index 2115934..0000000 Binary files a/textures/ruben_pastry.png and /dev/null differ