nalc/farming
1
0
Fork 0
forked from mtcontrib/farming
Code Issues Pull Requests Releases Wiki Activity

Fix glass water group and recipes, fix mcl wheat item

Browse Source
This commit is contained in:
tenplus1 2023-09-03 08:12:02 +01:00
parent 8dd80159fd
commit d4b0b02fc4
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crops/coffee.lua
View File

@ -36,7 +36,7 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
minetest.register_craft( {
output = "farming:coffee_cup",
recipe = {
{"group:food_coffee", "group:food_water_glass", a.saucepan}
{"group:food_coffee", "group:food_glass_water", a.saucepan}
},
replacements = {
{"group:food_saucepan", "farming:saucepan"}

4
crops/mint.lua
View File

@ -35,7 +35,7 @@ minetest.register_craftitem("farming:mint_leaf", {
minetest.register_craftitem("farming:mint_tea", {
description = S("Mint Tea"),
inventory_image = "farming_mint_tea.png",
on_use = minetest.item_eat(2, "vessels:drinking_glass"),
on_use = minetest.item_eat(2, a.drinking_glass),
groups = {flammable = 4}
})
@ -43,7 +43,7 @@ minetest.register_craft({
output = "farming:mint_tea",
recipe = {
{"group:food_mint", "group:food_mint", "group:food_mint"},
{"group:food_water_glass", a.juicer, ""}
{"group:food_glass_water", a.juicer, ""}
},
replacements = {
{"group:food_juicer", "farming:juicer"}

6
crops/vanilla.lua
View File

@ -53,10 +53,10 @@ minetest.register_craft( {
output = "farming:vanilla_extract",
recipe = {
{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
{"group:food_vanilla", "farming:bottle_ethanol", "group:food_water_glass"},
{"group:food_vanilla", "farming:bottle_ethanol", "group:food_glass_water"},
},
replacements = {
{"group:food_water_glass", a.drinking_glass}
{"group:food_glass_water", a.drinking_glass}
}
})
@ -64,7 +64,7 @@ minetest.register_craft({
type = "fuel",
recipe = "farming:vanilla_extract",
burntime = 25,
replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}}
replacements = {{"farming:vanilla_extract", a.glass_bottle}}
})
-- stage 1

21
food.lua
View File

@ -62,12 +62,23 @@ minetest.register_craft({
}
})
if farming.mcl then
minetest.register_craft({
output = "mcl_potions:river_water",
recipe = {
{"farming:hemp_fibre"},
{"mcl_potions:water"}
}
})
end
-- glass of water
minetest.register_craftitem("farming:glass_water", {
description = S("Glass of Water"),
inventory_image = "farming_water_glass.png",
groups = {food_water_glass = 1, flammable = 3, vessel = 1}
groups = {food_glass_water = 1, flammable = 3, vessel = 1}
})
minetest.register_craft({
@ -319,10 +330,10 @@ minetest.register_craft({
recipe = {
{a.rose, a.rose, a.rose},
{a.rose, a.rose, a.rose},
{"group:food_water_glass", a.pot, a.glass_bottle}
{"group:food_glass_water", a.pot, a.glass_bottle}
},
replacements = {
{"group:food_water_glass", a.drinking_glass},
{"group:food_glass_water", a.drinking_glass},
{"group:food_pot", "farming:pot"}
}
})
@ -822,11 +833,11 @@ minetest.register_craft({
recipe = {
{"", a.mortar_pestle, ""},
{"group:food_rice", "group:food_sugar", "group:food_rice"},
{"", "farming:glass_water", ""}
{"", "group:food_glass_water", ""}
},
replacements = {
{"group:food_mortar_pestle", "farming:mortar_pestle"},
{"farming:glass_water", a.drinking_glass}
{"group:food_glass_water", a.drinking_glass}
}
})

4
items.lua
View File

@ -99,7 +99,7 @@ if farming.mcl then
add_groups("mcl_core:sugar", {food_sugar = 1})
add_groups("mcl_throwing:egg", {food_egg = 1})
add_groups("mcl_farming:wheat", {food_wheat = 1})
add_groups("mcl_farming:wheat_item", {food_wheat = 1})
add_groups("mcl_cocoas:cocoa_beans", {food_cocoa = 1})
add_groups("mcl_core:apple", {food_apple = 1})
add_groups("mcl_core:bowl", {food_bowl = 1})
@ -113,7 +113,7 @@ if farming.mcl then
add_groups("mcl_farming:bread", {food_bread = 1})
add_groups("mcl_mobitems:milk_bucket", {food_milk = 1})
add_groups("mcl_ocean:dried_kelp", {food_seaweed = 1})
add_groups("mcl_potions:river_water", {food_water_glass = 1})
add_groups("mcl_potions:river_water", {food_glass_water = 1})
-- add missing food groups to current items so recipes work
add_groups("mcl_dye:yellow", {food_lemon = 1, food_banana = 1})