diff --git a/rubenfood/baking.lua b/baking.lua similarity index 100% rename from rubenfood/baking.lua rename to baking.lua diff --git a/rubenfood/cakes.lua b/cakes.lua similarity index 100% rename from rubenfood/cakes.lua rename to cakes.lua diff --git a/rubenfood/dairy.lua b/dairy.lua similarity index 67% rename from rubenfood/dairy.lua rename to dairy.lua index c0388a4..c2ca2dd 100644 --- a/rubenfood/dairy.lua +++ b/dairy.lua @@ -3,12 +3,8 @@ -- food to the minetest game -- ====================================== -- >> rubenfood/support.lua --- adds support for other mods --- adds items and aliases that are needed +-- adds diary products -- ====================================== --- [regis-item] Flour --- [regis-item] Milk --- [regis-item] Egg -- [regis-food] Cheese -- [craft] Cheese -- [regis-item] Butter diff --git a/rubenfood/depends.txt b/depends.txt similarity index 100% rename from rubenfood/depends.txt rename to depends.txt diff --git a/rubenfood/drinks.lua b/drinks.lua similarity index 100% rename from rubenfood/drinks.lua rename to drinks.lua diff --git a/rubenfood/fruits.lua b/fruits.lua similarity index 100% rename from rubenfood/fruits.lua rename to fruits.lua diff --git a/rubenfood/init.lua b/init.lua similarity index 83% rename from rubenfood/init.lua rename to init.lua index ce0a043..a0f3b02 100644 --- a/rubenfood/init.lua +++ b/init.lua @@ -13,6 +13,7 @@ print ("RubenFood: Loading mainframe: [Master]") ----------------------Load Files----------------------------- +dofile(minetest.get_modpath("rubenfood").."/support.lua") dofile(minetest.get_modpath("rubenfood").."/dairy.lua") dofile(minetest.get_modpath("rubenfood").."/baking.lua") @@ -24,12 +25,6 @@ dofile(minetest.get_modpath("rubenfood").."/fruits.lua") ----------------------------Cup------------------------------ -minetest.register_alias("rubenfood:cup","animalmaterials:glass") -minetest.register_craftitem(":animalmaterials:glass",{ - description = "Cup", - tiles = {"ruben_cup.png"}, - inventory_image = "ruben_cup.png", -}) minetest.register_craftitem("rubenfood:mug",{ description = "Mug", diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/rubenfood_animals/init.lua b/rubenfood_animals/init.lua deleted file mode 100644 index aa3cdf2..0000000 --- a/rubenfood_animals/init.lua +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index ab5e489..0000000 --- a/rubenfood_farming/init.lua +++ /dev/null @@ -1 +0,0 @@ -minetest.register_alias("rubenfood:flour","farming:flour") \ No newline at end of file diff --git a/support.lua b/support.lua new file mode 100644 index 0000000..41d23fe --- /dev/null +++ b/support.lua @@ -0,0 +1,81 @@ +-- 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 +-- ====================================== +-- [support] +-- ====================================== + +print "RubenFood [Support] - Initialising" +function node_implement(modname,n_ext,n_int,resultfunc) + if not minetest.get_modpath(modname) then + resultfunc() + else + minetest.register_alias(n_int,n_ext) + end +end + + + + + + + +print "RubenFood [Support] - Farming Mod" +node_implement("farming","farming:flour","rubenfood:flour",function() + minetest.register_craftitem("rubenfood:flour", { + description = "Flour", + inventory_image = "farming_flour.png", +}) +end) + +node_implement("farming","farming:strawberry_item","rubenfood:strawberry",function() +minetest.register_craftitem("rubenfood:strawberry", { + description = "Strawberry", + inventory_image = "farming_strawberry.png", + on_use = minetest.item_eat(2), +}) +end) + + + + + +print "RubenFood [Support] - Animal Mod" +node_implement("animalmaterials","animalmaterials:glass","rubenfood:cup",function() + minetest.register_craftitem("rubenfood:cup",{ + description = "Glass", + tiles = {"ruben_cup.png"}, + inventory_image = "ruben_cup.png", +}) +end) + +node_implement("animalmaterials","animalmaterials:egg","rubenfood:egg",function() + minetest.register_craftitem("rubenfood:egg", { + description = "Egg", + image = "animalmaterials_egg.png", + stack_max=10 +}) +end) + +node_implement("animalmaterials","animalmaterials:milk","rubenfood:milk",function() + minetest.register_craftitem("rubenfood:milk", { + description = "Milk", + image = "animalmaterials_milk.png", + on_use = minetest.item_eat(1), + groups = { eatable=1 }, + stack_max=10 +}) +end) + + + + + + + + + diff --git a/rubenfood/textures/animalmaterials_egg.png b/textures/animalmaterials_egg.png similarity index 100% rename from rubenfood/textures/animalmaterials_egg.png rename to textures/animalmaterials_egg.png diff --git a/rubenfood/textures/animalmaterials_milk.png b/textures/animalmaterials_milk.png similarity index 100% rename from rubenfood/textures/animalmaterials_milk.png rename to textures/animalmaterials_milk.png diff --git a/textures/farming_cake_mix.png b/textures/farming_cake_mix.png new file mode 100644 index 0000000..5c4b197 Binary files /dev/null and b/textures/farming_cake_mix.png differ diff --git a/textures/farming_flour.png b/textures/farming_flour.png new file mode 100644 index 0000000..7c302bf Binary files /dev/null and b/textures/farming_flour.png differ diff --git a/textures/farming_strawberry.png b/textures/farming_strawberry.png new file mode 100644 index 0000000..0a80f45 Binary files /dev/null and b/textures/farming_strawberry.png differ diff --git a/rubenfood/textures/ruben_bread.png b/textures/ruben_bread.png similarity index 100% rename from rubenfood/textures/ruben_bread.png rename to textures/ruben_bread.png diff --git a/rubenfood/textures/ruben_cake.png b/textures/ruben_cake.png similarity index 100% rename from rubenfood/textures/ruben_cake.png rename to textures/ruben_cake.png diff --git a/rubenfood/textures/ruben_cake_choco.png b/textures/ruben_cake_choco.png similarity index 100% rename from rubenfood/textures/ruben_cake_choco.png rename to textures/ruben_cake_choco.png diff --git a/rubenfood/textures/ruben_cigar.png b/textures/ruben_cigar.png similarity index 100% rename from rubenfood/textures/ruben_cigar.png rename to textures/ruben_cigar.png diff --git a/rubenfood/textures/ruben_coffee.png b/textures/ruben_coffee.png similarity index 100% rename from rubenfood/textures/ruben_coffee.png rename to textures/ruben_coffee.png diff --git a/rubenfood/textures/ruben_coffee_cooked.png b/textures/ruben_coffee_cooked.png similarity index 100% rename from rubenfood/textures/ruben_coffee_cooked.png rename to textures/ruben_coffee_cooked.png diff --git a/rubenfood/textures/ruben_coffee_cup.png b/textures/ruben_coffee_cup.png similarity index 100% rename from rubenfood/textures/ruben_coffee_cup.png rename to textures/ruben_coffee_cup.png diff --git a/rubenfood/textures/ruben_cup.png b/textures/ruben_cup.png similarity index 100% rename from rubenfood/textures/ruben_cup.png rename to textures/ruben_cup.png diff --git a/rubenfood/textures/ruben_juice_apple.png b/textures/ruben_juice_apple.png similarity index 100% rename from rubenfood/textures/ruben_juice_apple.png rename to textures/ruben_juice_apple.png diff --git a/rubenfood/textures/ruben_mug.png b/textures/ruben_mug.png similarity index 100% rename from rubenfood/textures/ruben_mug.png rename to textures/ruben_mug.png diff --git a/rubenfood/textures/ruben_pastry.png b/textures/ruben_pastry.png similarity index 100% rename from rubenfood/textures/ruben_pastry.png rename to textures/ruben_pastry.png diff --git a/rubenfood/textures/ruben_pastry_choco.png b/textures/ruben_pastry_choco.png similarity index 100% rename from rubenfood/textures/ruben_pastry_choco.png rename to textures/ruben_pastry_choco.png