summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rubenfood/cakemix.lua (renamed from rubenfood_animalsandfarming/init.lua)34
-rw-r--r--rubenfood/cakes.lua52
-rw-r--r--rubenfood/drinks.lua (renamed from rubenfood/init - Copy (2).lua)43
-rw-r--r--rubenfood/fruits.lua (renamed from rubenfood_treefruits/init.lua)28
-rw-r--r--rubenfood/init - Copy.lua80
-rw-r--r--rubenfood/init.lua176
-rw-r--r--rubenfood/textures/farming_bread.pngbin0 -> 918 bytes
-rw-r--r--rubenfood/textures/ruben_cake.png (renamed from rubenfood_cpuload/textures/ruben_cake.png)bin908 -> 908 bytes
-rw-r--r--rubenfood/textures/ruben_cake_choco.png (renamed from rubenfood_cpuload/textures/ruben_cake_choco.png)bin942 -> 942 bytes
-rw-r--r--rubenfood/textures/ruben_cigar.pngbin696 -> 696 bytes
-rw-r--r--rubenfood/textures/ruben_juice_apple.pngbin1118 -> 1114 bytes
-rw-r--r--rubenfood/textures/ruben_pastry.png (renamed from rubenfood_cpuload/textures/ruben_pastry.png)bin807 -> 807 bytes
-rw-r--r--rubenfood/textures/ruben_pastry_choco.png (renamed from rubenfood_cpuload/textures/ruben_pastry_choco.png)bin854 -> 854 bytes
-rw-r--r--rubenfood_animals/depends.txt (renamed from rubenfood_cpuload/depends.txt)0
-rw-r--r--rubenfood_animals/init.lua3
-rw-r--r--rubenfood_animalsandfarming/textures/ruben_cake.pngbin728 -> 0 bytes
-rw-r--r--rubenfood_animalsandfarming/textures/ruben_cake_choco.pngbin733 -> 0 bytes
-rw-r--r--rubenfood_animalsandfarming/textures/ruben_pastry.pngbin641 -> 0 bytes
-rw-r--r--rubenfood_animalsandfarming/textures/ruben_pastry_choco.pngbin696 -> 0 bytes
-rw-r--r--rubenfood_cpuload/init.lua18
-rw-r--r--rubenfood_farming/depends.txt (renamed from rubenfood_animalsandfarming/depends.txt)6
-rw-r--r--rubenfood_farming/init.lua1
-rw-r--r--rubenfood_treefruits/depends.txt2
23 files changed, 114 insertions, 329 deletions
diff --git a/rubenfood_animalsandfarming/init.lua b/rubenfood/cakemix.lua
index b94fc2d..d95524a 100644
--- a/rubenfood_animalsandfarming/init.lua
+++ b/rubenfood/cakemix.lua
@@ -1,18 +1,18 @@
--- Loads the animal mod based crafting
-print ("RubenFood: Loading animal+farming based foods")
-
----------------Cake Pastry-----------
-
-minetest.register_craft({
- output = '"rubenfood:cakemix_plain" 1',
- recipe = {
- {'"farming:wheat"','"animalmaterials:milk"','"animalmaterials:egg"'},
- }
-})
-
-minetest.register_craft({
- output = '"rubenfood:cakemix_choco" 1',
- recipe = {
- {'""','"default:dirt"','""'}, {'"farming:wheat"','"animalmaterials:milk"','"animalmaterials:egg"'},
- }
+-- Loads the animal mod based crafting
+print ("RubenFood: Loading animal+farming based foods")
+
+---------------Cake Pastry-----------
+
+minetest.register_craft({
+ output = '"rubenfood:cakemix_plain" 1',
+ recipe = {
+ {'"rubenfood:wheat"','"rubenfood:milk"','"rubenfood:egg"'},
+ }
+})
+
+minetest.register_craft({
+ output = '"rubenfood:cakemix_choco" 1',
+ recipe = {
+ {'""','"default:dirt"','""'}, {'"rubenfood:wheat"','"rubenfood:milk"','"rubenfood:egg"'},
+ }
}) \ No newline at end of file
diff --git a/rubenfood/cakes.lua b/rubenfood/cakes.lua
new file mode 100644
index 0000000..f7a161d
--- /dev/null
+++ b/rubenfood/cakes.lua
@@ -0,0 +1,52 @@
+--------------------------Cakes-------------------------
+minetest.register_craftitem(":rubenfood:cakemix_plain",{
+ description = "Cake Mix",
+ tiles = {"ruben_pastry.png"},
+ inventory_image = "ruben_pastry.png",
+})
+
+minetest.register_craftitem(":rubenfood:cakemix_choco",{
+ description = "Chocolate Cake Mix",
+ tiles = {"ruben_pastry_choco.png"},
+ inventory_image = "ruben_pastry_choco.png",
+})
+
+minetest.register_craft({
+ type = "cooking",
+ output = "rubenfood:cake",
+ recipe = "rubenfood:cakemix_plain",
+})
+
+minetest.register_craft({
+ type = "cooking",
+ output = "rubenfood:cake_chocolate",
+ recipe = "rubenfood:cakemix_choco",
+})
+
+minetest.register_node(":rubenfood:cake", {
+ description = "Cake",
+ drawtype = "plantlike",
+ visual_scale = 1.0,
+ tiles = {"ruben_cake.png"},
+ inventory_image = "ruben_cake.png",
+ paramtype = "light",
+ sunlight_propagates = true,
+ walkable = false,
+ groups = {fleshy=3,dig_immediate=3,flammable=2},
+ on_use = minetest.item_eat(30),
+ sounds = default.node_sound_defaults(),
+})
+
+minetest.register_node(":rubenfood:cake_chocolate", {
+ description = "Chocolate Cake",
+ drawtype = "plantlike",
+ visual_scale = 1.0,
+ tiles = {"ruben_cake_choco.png"},
+ inventory_image = "ruben_cake_choco.png",
+ paramtype = "light",
+ sunlight_propagates = true,
+ walkable = false,
+ groups = {fleshy=3,dig_immediate=3,flammable=2},
+ on_use = minetest.item_eat(40),
+ sounds = default.node_sound_defaults(),
+}) \ No newline at end of file
diff --git a/rubenfood/init - Copy (2).lua b/rubenfood/drinks.lua
index 6d0db96..c9d7bc2 100644
--- a/rubenfood/init - Copy (2).lua
+++ b/rubenfood/drinks.lua
@@ -1,8 +1,3 @@
--- This file registers all the foods
-
-print ("RubenFood: Loading basic foods")
-
-
--------------------------Apple Juice--------------------------
minetest.register_node(":rubenfood:apple_juice", {
description = "Apple Juice",
@@ -19,11 +14,11 @@ minetest.register_node(":rubenfood:apple_juice", {
})
minetest.register_craft({
- output = '":rubenfood:apple_juice" 4',
+ output = '"rubenfood:apple_juice" 4',
recipe = {
{'""','""','""'},
{'""','"default:apple"','""'},
- {'""','"bucket:bucket_water"','""'},
+ {'""','"rubenfood:cup"','""'},
}
})
@@ -31,26 +26,27 @@ minetest.register_craft({
-----------------------------Cigerete----------------------------
-minetest.register_node(":rubenfood:cigarette", {
- description = "Cigarette",
+----------------------cactuz juice----------------------------
+minetest.register_node(":rubenfood:cactus_juice", {
+ description = "Cactuz Juice",
drawtype = "plantlike",
visual_scale = 1.0,
- tiles = {"ruben_cigar.png"},
- inventory_image = "ruben_cigar.png",
+ tiles = {"ruben_juice_cactus.png"},
+ inventory_image = "ruben_juice_cactus.png",
paramtype = "light",
sunlight_propagates = true,
walkable = false,
groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(-4),
+ on_use = minetest.item_eat(2),
sounds = default.node_sound_defaults(),
})
minetest.register_craft({
- output = '"rubenfood:cigarette" 1',
+ output = '"rubenfood:cactus_juice" 4',
recipe = {
- {'"default:dry_shrub"','"default:dry_shrub"','"default:dry_shrub"'},
-
+ {'""','""','""'},
+ {'""','"default:cactus"','""'},
+ {'""','"rubenfood:cup"','""'},
}
})
@@ -58,10 +54,15 @@ minetest.register_craft({
+
+
+
+
+
-----------------------------Coffee-----------------------------
minetest.register_craftitem(":rubenfood:coffeebean",{
- description = "Coffee Bean",
+ description = "Raw Coffee Bean",
tiles = {"ruben_coffee.png"},
inventory_image = "ruben_coffee.png",
})
@@ -100,7 +101,7 @@ minetest.register_craft({
recipe = {
{'""','"rubenfood:coffeebean_cooked"','""'},
{'""','"rubenfood:coffeebean_cooked"','""'},
- {'""','"bucket:bucket_water"','""'},
+ {'""','"rubenfood:cup"','""'},
}
})
@@ -108,4 +109,8 @@ minetest.register_craft({
type = "cooking",
output = "rubenfood:coffeebean_cooked",
recipe = "rubenfood:coffeebean",
-}) \ No newline at end of file
+})
+
+
+
+
diff --git a/rubenfood_treefruits/init.lua b/rubenfood/fruits.lua
index d814b94..0bbdb39 100644
--- a/rubenfood_treefruits/init.lua
+++ b/rubenfood/fruits.lua
@@ -1,15 +1,15 @@
--- This file adds apple like fruits
-
-minetest.register_node(":default:orange", {
- description = "Orange Fruit",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_orange.png"},
- inventory_image = "ruben_orange.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(4),
- sounds = default.node_sound_defaults(),
+-- This file adds apple like fruits
+
+minetest.register_node(":default:orange", {
+ description = "Orange Fruit",
+ drawtype = "plantlike",
+ visual_scale = 1.0,
+ tiles = {"ruben_orange.png"},
+ inventory_image = "ruben_orange.png",
+ paramtype = "light",
+ sunlight_propagates = true,
+ walkable = false,
+ groups = {fleshy=3,dig_immediate=3,flammable=2},
+ on_use = minetest.item_eat(4),
+ sounds = default.node_sound_defaults(),
}) \ No newline at end of file
diff --git a/rubenfood/init - Copy.lua b/rubenfood/init - Copy.lua
deleted file mode 100644
index 9f02977..0000000
--- a/rubenfood/init - Copy.lua
+++ /dev/null
@@ -1,80 +0,0 @@
--- This file registers all the foods
-
--- Apple Juice
-minetest.register_node(":rubenfood:apple_juice", {
- description = "Apple Juice",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_juice_apple.png"},
- inventory_image = "ruben_juice_apple.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(2),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:apple_juice" 4',
- recipe = {
- {'""','""','""'},
- {'""','"default:apple"','""'},
- {'""','"bucket:bucket_water"','""'},
- }
-})
-
-
-
-
-
--- Cigerete
-minetest.register_node("rubenfood:cigarette", {
- description = "Cigarette",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_cigar.png"},
- inventory_image = "ruben_cigar.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(-4),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:cigarette" 1',
- recipe = {
- {'"default:dry_shrub"','"default:dry_shrub"','"default:dry_shrub"'},
-
- }
-})
-
-
-
-
-
---Coffee
-minetest.register_node("rubenfood:coffee", {
- description = "Coffee",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_coffee_cup.png"},
- inventory_image = "ruben_coffee_cup.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(10),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:coffee" 1',
- recipe = {
- {'""','"default:dry_shrub"','""'},
- {'""','"default:dry_shrub"','""'},
- {'""','"bucket:bucket_water"','""'},
- }
-}) \ No newline at end of file
diff --git a/rubenfood/init.lua b/rubenfood/init.lua
index dda01eb..e45beca 100644
--- a/rubenfood/init.lua
+++ b/rubenfood/init.lua
@@ -17,66 +17,6 @@ minetest.register_craft({
})
---------------------------Apple Juice--------------------------
-
-minetest.register_node(":rubenfood:apple_juice", {
- description = "Apple Juice",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_juice_apple.png"},
- inventory_image = "ruben_juice_apple.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(2),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:apple_juice" 4',
- recipe = {
- {'""','""','""'},
- {'""','"default:apple"','""'},
- {'""','"rubenfood:cup"','""'},
- }
-})
-
-
-
-
-
-
-
-
-----------------------cactuz juice----------------------------
-minetest.register_node(":rubenfood:cactus_juice", {
- description = "Cactuz Juice",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_juice_cactus.png"},
- inventory_image = "ruben_juice_cactus.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(2),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:cactus_juice" 4',
- recipe = {
- {'""','""','""'},
- {'""','"default:cactus"','""'},
- {'""','"rubenfood:cup"','""'},
- }
-})
-
-
-
-
-
----------------------------Cigerete----------------------------
minetest.register_node(":rubenfood:cigarette", {
description = "Cigarette",
@@ -100,120 +40,4 @@ minetest.register_craft({
}
})
-
-
-
-
------------------------------Coffee-----------------------------
-
-minetest.register_craftitem(":rubenfood:coffeebean",{
- description = "Raw Coffee Bean",
- tiles = {"ruben_coffee.png"},
- inventory_image = "ruben_coffee.png",
-})
-
-minetest.register_craftitem(":rubenfood:coffeebean_cooked",{
- description = "Cooked Coffee Bean",
- tiles = {"ruben_coffee_cooked.png"},
- inventory_image = "ruben_coffee_cooked.png",
-})
-
-minetest.register_node(":rubenfood:coffee", {
- description = "Coffee",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_coffee_cup.png"},
- inventory_image = "ruben_coffee_cup.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(10),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
- output = '"rubenfood:coffeebean" 1',
- recipe = {
- {'""','"default:dry_shrub"','""'},
- {'""','"default:dry_shrub"','""'},
- {'""','"default:dry_shrub"','""'},
- }
-})
-
-minetest.register_craft({
- output = '"rubenfood:coffee" 1',
- recipe = {
- {'""','"rubenfood:coffeebean_cooked"','""'},
- {'""','"rubenfood:coffeebean_cooked"','""'},
- {'""','"rubenfood:cup"','""'},
- }
-})
-
-minetest.register_craft({
- type = "cooking",
- output = "rubenfood:coffeebean_cooked",
- recipe = "rubenfood:coffeebean",
-})
-
-
-
-
-
-
---------------------------Cakes-------------------------
-minetest.register_craftitem(":rubenfood:cakemix_plain",{
- description = "Cake Mix",
- tiles = {"ruben_pastry.png"},
- inventory_image = "ruben_pastry.png",
-})
-
-minetest.register_craftitem(":rubenfood:cakemix_choco",{
- description = "Chocolate Cake Mix",
- tiles = {"ruben_pastry_choco.png"},
- inventory_image = "ruben_pastry_choco.png",
-})
-
-minetest.register_craft({
- type = "cooking",
- output = "rubenfood:cake",
- recipe = "rubenfood:cakemix_plain",
-})
-
-minetest.register_craft({
- type = "cooking",
- output = "rubenfood:cake_chocolate",
- recipe = "rubenfood:cakemix_choco",
-})
-
-minetest.register_node(":rubenfood:cake", {
- description = "Cake",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_cake.png"},
- inventory_image = "ruben_cake.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(30),
- sounds = default.node_sound_defaults(),
-})
-
-minetest.register_node(":rubenfood:cake_chocolate", {
- description = "Chocolate Cake",
- drawtype = "plantlike",
- visual_scale = 1.0,
- tiles = {"ruben_cake_choco.png"},
- inventory_image = "ruben_cake_choco.png",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- on_use = minetest.item_eat(40),
- sounds = default.node_sound_defaults(),
-})
-
-
-
print("Rubenfood: Mainframe loaded") \ No newline at end of file
diff --git a/rubenfood/textures/farming_bread.png b/rubenfood/textures/farming_bread.png
new file mode 100644
index 0000000..6dca983
--- /dev/null
+++ b/rubenfood/textures/farming_bread.png
Binary files differ
diff --git a/rubenfood_cpuload/textures/ruben_cake.png b/rubenfood/textures/ruben_cake.png
index 250303b..250303b 100644
--- a/rubenfood_cpuload/textures/ruben_cake.png
+++ b/rubenfood/textures/ruben_cake.png
Binary files differ
diff --git a/rubenfood_cpuload/textures/ruben_cake_choco.png b/rubenfood/textures/ruben_cake_choco.png
index b75f8ed..b75f8ed 100644
--- a/rubenfood_cpuload/textures/ruben_cake_choco.png
+++ b/rubenfood/textures/ruben_cake_choco.png
Binary files differ
diff --git a/rubenfood/textures/ruben_cigar.png b/rubenfood/textures/ruben_cigar.png
index 519a20d..35ed4de 100644
--- a/rubenfood/textures/ruben_cigar.png
+++ b/rubenfood/textures/ruben_cigar.png
Binary files differ
diff --git a/rubenfood/textures/ruben_juice_apple.png b/rubenfood/textures/ruben_juice_apple.png
index 3734978..9a71e03 100644
--- a/rubenfood/textures/ruben_juice_apple.png
+++ b/rubenfood/textures/ruben_juice_apple.png
Binary files differ
diff --git a/rubenfood_cpuload/textures/ruben_pastry.png b/rubenfood/textures/ruben_pastry.png
index adde0b7..2115934 100644
--- a/rubenfood_cpuload/textures/ruben_pastry.png
+++ b/rubenfood/textures/ruben_pastry.png
Binary files differ
diff --git a/rubenfood_cpuload/textures/ruben_pastry_choco.png b/rubenfood/textures/ruben_pastry_choco.png
index 578637b..578637b 100644
--- a/rubenfood_cpuload/textures/ruben_pastry_choco.png
+++ b/rubenfood/textures/ruben_pastry_choco.png
Binary files differ
diff --git a/rubenfood_cpuload/depends.txt b/rubenfood_animals/depends.txt
index 931b769..931b769 100644
--- a/rubenfood_cpuload/depends.txt
+++ b/rubenfood_animals/depends.txt
diff --git a/rubenfood_animals/init.lua b/rubenfood_animals/init.lua
new file mode 100644
index 0000000..e473b26
--- /dev/null
+++ b/rubenfood_animals/init.lua
@@ -0,0 +1,3 @@
+ minetest.register_alias("rubenfood:milk", "animalmaterials:milk")
+
+ minetest.register_alias("rubenfood:egg", "animalmaterials:egg") \ No newline at end of file
diff --git a/rubenfood_animalsandfarming/textures/ruben_cake.png b/rubenfood_animalsandfarming/textures/ruben_cake.png
deleted file mode 100644
index 08ba65c..0000000
--- a/rubenfood_animalsandfarming/textures/ruben_cake.png
+++ /dev/null
Binary files differ
diff --git a/rubenfood_animalsandfarming/textures/ruben_cake_choco.png b/rubenfood_animalsandfarming/textures/ruben_cake_choco.png
deleted file mode 100644
index da565b0..0000000
--- a/rubenfood_animalsandfarming/textures/ruben_cake_choco.png
+++ /dev/null
Binary files differ
diff --git a/rubenfood_animalsandfarming/textures/ruben_pastry.png b/rubenfood_animalsandfarming/textures/ruben_pastry.png
deleted file mode 100644
index 16d964c..0000000
--- a/rubenfood_animalsandfarming/textures/ruben_pastry.png
+++ /dev/null
Binary files differ
diff --git a/rubenfood_animalsandfarming/textures/ruben_pastry_choco.png b/rubenfood_animalsandfarming/textures/ruben_pastry_choco.png
deleted file mode 100644
index cf4ef07..0000000
--- a/rubenfood_animalsandfarming/textures/ruben_pastry_choco.png
+++ /dev/null
Binary files differ
diff --git a/rubenfood_cpuload/init.lua b/rubenfood_cpuload/init.lua
deleted file mode 100644
index 2bdf343..0000000
--- a/rubenfood_cpuload/init.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- Loads the animal mod based crafting
-print ("RubenFood: Loading animal+farming based foods")
-
----------------Cake Pastry-----------
-
-minetest.register_craft({
- output = '"rubenfood:cakemix_plain" 1',
- recipe = {
- {'"farming:wheat"','"animalmaterials:milk"','"animalmaterials:egg"'},
- }
-})
-
-minetest.register_craft({
- output = '"rubenfood:cakemix_choco" 1',
- recipe = {
- {'""','"default:dirt"','""'}, {'"farming:wheat"','"animalmaterials:milk"','"animalmaterials:egg"'},
- }
-}) \ No newline at end of file
diff --git a/rubenfood_animalsandfarming/depends.txt b/rubenfood_farming/depends.txt
index fc8c9ae..931b769 100644
--- a/rubenfood_animalsandfarming/depends.txt
+++ b/rubenfood_farming/depends.txt
@@ -1,4 +1,4 @@
-default
-bucket
-animalmaterials
+default
+bucket
+animalmaterials
farming \ No newline at end of file
diff --git a/rubenfood_farming/init.lua b/rubenfood_farming/init.lua
new file mode 100644
index 0000000..efc7acc
--- /dev/null
+++ b/rubenfood_farming/init.lua
@@ -0,0 +1 @@
+ minetest.register_alias("rubenfood:wheat", "farming:wheat") \ No newline at end of file
diff --git a/rubenfood_treefruits/depends.txt b/rubenfood_treefruits/depends.txt
deleted file mode 100644
index be1e6bc..0000000
--- a/rubenfood_treefruits/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-bucket \ No newline at end of file