summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modpack.txt0
-rw-r--r--rubenfood/baking.lua (renamed from baking.lua)7
-rw-r--r--rubenfood/cakes.lua (renamed from cakes.lua)8
-rw-r--r--rubenfood/dairy.lua21
-rw-r--r--rubenfood/depends.txt (renamed from depends.txt)0
-rw-r--r--rubenfood/drinks.lua (renamed from drinks.lua)0
-rw-r--r--rubenfood/fruits.lua (renamed from fruits.lua)0
-rw-r--r--rubenfood/init.lua (renamed from init.lua)20
-rw-r--r--rubenfood/textures/animalmaterials_egg.png (renamed from textures/animalmaterials_egg.png)bin672 -> 672 bytes
-rw-r--r--rubenfood/textures/animalmaterials_milk.png (renamed from textures/animalmaterials_milk.png)bin559 -> 559 bytes
-rw-r--r--rubenfood/textures/ruben_bread.png (renamed from textures/ruben_bread.png)bin918 -> 918 bytes
-rw-r--r--rubenfood/textures/ruben_cake.png (renamed from textures/ruben_cake.png)bin908 -> 908 bytes
-rw-r--r--rubenfood/textures/ruben_cake_choco.png (renamed from textures/ruben_cake_choco.png)bin942 -> 942 bytes
-rw-r--r--rubenfood/textures/ruben_cigar.pngbin0 -> 693 bytes
-rw-r--r--rubenfood/textures/ruben_coffee.png (renamed from textures/ruben_coffee.png)bin1399 -> 1399 bytes
-rw-r--r--rubenfood/textures/ruben_coffee_cooked.png (renamed from textures/ruben_coffee_cooked.png)bin895 -> 895 bytes
-rw-r--r--rubenfood/textures/ruben_coffee_cup.pngbin0 -> 873 bytes
-rw-r--r--rubenfood/textures/ruben_cup.png (renamed from textures/animalmaterials_glass.png)bin564 -> 564 bytes
-rw-r--r--rubenfood/textures/ruben_juice_apple.pngbin0 -> 729 bytes
-rw-r--r--rubenfood/textures/ruben_mug.pngbin0 -> 780 bytes
-rw-r--r--rubenfood/textures/ruben_pastry.pngbin0 -> 842 bytes
-rw-r--r--rubenfood/textures/ruben_pastry_choco.png (renamed from textures/ruben_pastry_choco.png)bin854 -> 854 bytes
-rw-r--r--rubenfood_animals/init.lua2
-rw-r--r--rubenfood_farming/init.lua1
-rw-r--r--support.lua53
-rw-r--r--textures/ruben_cigar.pngbin696 -> 0 bytes
-rw-r--r--textures/ruben_coffee_cup.pngbin1283 -> 0 bytes
-rw-r--r--textures/ruben_juice_apple.pngbin1114 -> 0 bytes
-rw-r--r--textures/ruben_pastry.pngbin807 -> 0 bytes
29 files changed, 47 insertions, 65 deletions
diff --git a/modpack.txt b/modpack.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modpack.txt
diff --git a/baking.lua b/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
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
index a916278..a916278 100644
--- a/depends.txt
+++ b/rubenfood/depends.txt
diff --git a/drinks.lua b/rubenfood/drinks.lua
index 04d0ba5..04d0ba5 100644
--- a/drinks.lua
+++ b/rubenfood/drinks.lua
diff --git a/fruits.lua b/rubenfood/fruits.lua
index ff7a2b0..ff7a2b0 100644
--- a/fruits.lua
+++ b/rubenfood/fruits.lua
diff --git a/init.lua b/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
index 50010de..50010de 100644
--- a/textures/animalmaterials_egg.png
+++ b/rubenfood/textures/animalmaterials_egg.png
Binary files differ
diff --git a/textures/animalmaterials_milk.png b/rubenfood/textures/animalmaterials_milk.png
index e535264..e535264 100644
--- a/textures/animalmaterials_milk.png
+++ b/rubenfood/textures/animalmaterials_milk.png
Binary files differ
diff --git a/textures/ruben_bread.png b/rubenfood/textures/ruben_bread.png
index 6dca983..6dca983 100644
--- a/textures/ruben_bread.png
+++ b/rubenfood/textures/ruben_bread.png
Binary files differ
diff --git a/textures/ruben_cake.png b/rubenfood/textures/ruben_cake.png
index 250303b..250303b 100644
--- a/textures/ruben_cake.png
+++ b/rubenfood/textures/ruben_cake.png
Binary files differ
diff --git a/textures/ruben_cake_choco.png b/rubenfood/textures/ruben_cake_choco.png
index b75f8ed..b75f8ed 100644
--- a/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
new file mode 100644
index 0000000..f2275ec
--- /dev/null
+++ b/rubenfood/textures/ruben_cigar.png
Binary files differ
diff --git a/textures/ruben_coffee.png b/rubenfood/textures/ruben_coffee.png
index 944fd73..944fd73 100644
--- a/textures/ruben_coffee.png
+++ b/rubenfood/textures/ruben_coffee.png
Binary files differ
diff --git a/textures/ruben_coffee_cooked.png b/rubenfood/textures/ruben_coffee_cooked.png
index 8f75897..8f75897 100644
--- a/textures/ruben_coffee_cooked.png
+++ b/rubenfood/textures/ruben_coffee_cooked.png
Binary files differ
diff --git a/rubenfood/textures/ruben_coffee_cup.png b/rubenfood/textures/ruben_coffee_cup.png
new file mode 100644
index 0000000..272299a
--- /dev/null
+++ b/rubenfood/textures/ruben_coffee_cup.png
Binary files differ
diff --git a/textures/animalmaterials_glass.png b/rubenfood/textures/ruben_cup.png
index 9fadc0d..9fadc0d 100644
--- a/textures/animalmaterials_glass.png
+++ b/rubenfood/textures/ruben_cup.png
Binary files differ
diff --git a/rubenfood/textures/ruben_juice_apple.png b/rubenfood/textures/ruben_juice_apple.png
new file mode 100644
index 0000000..fc2b8ef
--- /dev/null
+++ b/rubenfood/textures/ruben_juice_apple.png
Binary files differ
diff --git a/rubenfood/textures/ruben_mug.png b/rubenfood/textures/ruben_mug.png
new file mode 100644
index 0000000..f68173b
--- /dev/null
+++ b/rubenfood/textures/ruben_mug.png
Binary files differ
diff --git a/rubenfood/textures/ruben_pastry.png b/rubenfood/textures/ruben_pastry.png
new file mode 100644
index 0000000..2df203b
--- /dev/null
+++ b/rubenfood/textures/ruben_pastry.png
Binary files differ
diff --git a/textures/ruben_pastry_choco.png b/rubenfood/textures/ruben_pastry_choco.png
index 578637b..578637b 100644
--- a/textures/ruben_pastry_choco.png
+++ b/rubenfood/textures/ruben_pastry_choco.png
Binary files differ
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
--- a/textures/ruben_cigar.png
+++ /dev/null
Binary files differ
diff --git a/textures/ruben_coffee_cup.png b/textures/ruben_coffee_cup.png
deleted file mode 100644
index f026f64..0000000
--- a/textures/ruben_coffee_cup.png
+++ /dev/null
Binary files differ
diff --git a/textures/ruben_juice_apple.png b/textures/ruben_juice_apple.png
deleted file mode 100644
index 9a71e03..0000000
--- a/textures/ruben_juice_apple.png
+++ /dev/null
Binary files differ
diff --git a/textures/ruben_pastry.png b/textures/ruben_pastry.png
deleted file mode 100644
index 2115934..0000000
--- a/textures/ruben_pastry.png
+++ /dev/null
Binary files differ