diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 0831eaf..d144e42 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:artichoke", { description = S("Artichoke"), inventory_image = "farming_artichoke.png", - groups = {compostability = 65, seed = 2, food_artichoke = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_artichoke = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:artichoke_1") end, @@ -69,7 +69,7 @@ farming.registered_plants["farming:artichoke"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 001c723..770f1aa 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:asparagus", { description = S("Asparagus"), inventory_image = "farming_asparagus.png", - groups = {compostability = 65, seed = 2, food_asparagus = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_asparagus = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:asparagus_1") end, @@ -77,7 +77,7 @@ farming.registered_plants["farming:asparagus"] = { minetest.register_decoration({ name = "farming:asparagus_5", deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = -0.1, diff --git a/crops/barley.lua b/crops/barley.lua index 6ac4cc7..2f1550d 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- barley seeds minetest.register_node("farming:seed_barley", { @@ -8,7 +9,7 @@ minetest.register_node("farming:seed_barley", { inventory_image = "farming_barley_seed.png", wield_image = "farming_barley_seed.png", drawtype = "signlike", - groups = {compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1}, + groups = {compostability = 48, seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -27,14 +28,12 @@ minetest.register_craftitem("farming:barley", { groups = {food_barley = 1, flammable = 2} }) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - -- flour minetest.register_craft({ output = "farming:flour", recipe = { {"farming:barley", "farming:barley", "farming:barley"}, - {"farming:barley", tmp, ""} + {"farming:barley", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/beans.lua b/crops/beans.lua index 8851dc6..6099bf5 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -5,6 +5,7 @@ ]] local S = farming.translate +local a = farming.recipe_items -- place beans local function place_beans(itemstack, placer, pointed_thing, plantname) @@ -71,7 +72,7 @@ end minetest.register_craftitem("farming:beans", { description = S("Green Beans"), inventory_image = "farming_beans.png", - groups = {compostability = 65, seed = 2, food_beans = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_beans = 1, flammable = 2}, on_use = minetest.item_eat(1), on_place = function(itemstack, placer, pointed_thing) return place_beans(itemstack, placer, pointed_thing, "farming:beanpole_1") @@ -80,7 +81,7 @@ minetest.register_craftitem("farming:beans", { -- beans can be used for green dye minetest.register_craft({ - output = "dye:green", + output = a.dye_green, recipe = {{"farming:beans"}} }) @@ -159,8 +160,8 @@ minetest.register_craft({ output = "farming:beanpole", recipe = { {"", "", ""}, - {"default:stick", "", "default:stick"}, - {"default:stick", "", "default:stick"} + {"group:stick", "", "group:stick"}, + {"group:stick", "", "group:stick"} } }) @@ -249,7 +250,7 @@ minetest.register_node("farming:beanbush", { }, selection_box = farming.select, groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 2, plant = 1, attached_node = 1, not_in_creative_inventory = 1 }, sounds = farming.sounds.node_sound_leaves_defaults() @@ -258,7 +259,7 @@ minetest.register_node("farming:beanbush", { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 8b7dd8c..f025e51 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- beetroot minetest.register_craftitem("farming:beetroot", { description = S("Beetroot"), inventory_image = "farming_beetroot.png", - groups = {compostability = 65, seed = 2, food_beetroot = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_beetroot = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:beetroot_1") end, @@ -30,7 +31,7 @@ minetest.register_craft({ -- red dye minetest.register_craft({ - output = "dye:red", + output = a.dye_red, recipe = {{"group:food_beetroot"}} }) @@ -92,7 +93,7 @@ farming.registered_plants["farming:beetroot"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/blackberry.lua b/crops/blackberry.lua index f9ace9e..6dca0e6 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -6,7 +6,7 @@ minetest.register_craftitem("farming:blackberry", { description = S("Blackberries"), inventory_image = "farming_blackberry.png", groups = { - compostability = 65, seed = 2, food_blackberries = 1, food_blackberry = 1, + compostability = 48, seed = 2, food_blackberries = 1, food_blackberry = 1, food_berry = 1, flammable = 2 }, on_place = function(itemstack, placer, pointed_thing) @@ -67,7 +67,7 @@ farming.registered_plants["farming:blackberry"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 1810f77..e1da44f 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -1,12 +1,13 @@ local S = farming.translate +local a = farming.recipe_items -- blueberries minetest.register_craftitem("farming:blueberries", { description = S("Wild Blueberries"), inventory_image = "farming_blueberries.png", groups = { - compostability = 65,seed = 2, food_blueberries = 1, food_blueberry = 1, + compostability = 48,seed = 2, food_blueberries = 1, food_blueberry = 1, food_berry = 1, flammable = 2 }, on_place = function(itemstack, placer, pointed_thing) @@ -36,20 +37,18 @@ minetest.register_craftitem("farming:blueberry_pie", { on_use = minetest.item_eat(6) }) -local tmp = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:blueberry_pie", recipe = { {"group:food_flour", "group:food_sugar", "group:food_blueberries"}, - {"", tmp, ""} + {"", a.baking_tray, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) -- Blue Dye minetest.register_craft({ - output = farming.mcl and "mcl_dye:blue" or "dye:blue", + output = a.dye_blue, recipe = {{"farming:blueberries"}} }) @@ -106,7 +105,7 @@ farming.registered_plants["farming:blueberries"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/cabbage.lua b/crops/cabbage.lua index dbe7989..c42bd22 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:cabbage", { description = S("Cabbage"), inventory_image = "farming_cabbage.png", - groups = {compostability = 65, seed = 2, food_cabbage = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_cabbage = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cabbage_1") end, @@ -72,7 +72,7 @@ farming.registered_plants["farming:cabbage"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/carrot.lua b/crops/carrot.lua index fb61000..eb46bf4 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -5,12 +5,13 @@ ]] local S = farming.translate +local a = farming.recipe_items -- carrot minetest.register_craftitem("farming:carrot", { description = S("Carrot"), inventory_image = "farming_carrot.png", - groups = {compostability = 65, seed = 2, food_carrot = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_carrot = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") end, @@ -25,12 +26,10 @@ minetest.register_craftitem("farming:carrot_juice", { groups = {vessel = 1, drink = 1} }) -local tmp = farming.use_utensils and "farming:juicer" or "" - minetest.register_craft({ output = "farming:carrot_juice", recipe = { - {tmp}, + {a.juicer}, {"group:food_carrot"}, {"vessels:drinking_glass"} }, @@ -135,7 +134,7 @@ def = { minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/chili.lua b/crops/chili.lua index 2dead5d..e877b86 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- chili pepper minetest.register_craftitem("farming:chili_pepper", { description = S("Chili Pepper"), inventory_image = "farming_chili_pepper.png", - groups = {compostability = 65, seed = 2, food_chili_pepper = 1, flammable = 4}, + groups = {compostability = 48, seed = 2, food_chili_pepper = 1, flammable = 4}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:chili_1") end, @@ -29,7 +30,7 @@ minetest.register_craft({ -- chili can be used for red dye minetest.register_craft({ - output = farming.mcl and "mcl_dye:red" or "dye:red", + output = a.dye_red, recipe = {{"farming:chili_pepper"}} }) @@ -40,12 +41,10 @@ minetest.register_craftitem("farming:chili_powder", { inventory_image = "farming_chili_powder.png" }) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:chili_powder", recipe = { - {"farming:chili_pepper", tmp} + {"farming:chili_pepper", a.mortar_pestle} }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) @@ -120,7 +119,10 @@ farming.registered_plants["farming:chili_pepper"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + place_on = { + "default:dirt_with_grass", "default:dirt_with_rainforest_litter", + "mcl_core:dirt_with_grass" + }, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/cocoa.lua b/crops/cocoa.lua index cbe6454..303104e 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- place cocoa local function place_cocoa(itemstack, placer, pointed_thing, plantname) @@ -67,7 +68,7 @@ end minetest.register_craftitem("farming:cocoa_beans_raw", { description = S("Raw Cocoa Beans"), inventory_image = "farming_cocoa_beans.png^[brighten", - groups = {compostability = 65, seed = 1, flammable = 2}, + groups = {compostability = 48, seed = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") end @@ -76,7 +77,7 @@ minetest.register_craftitem("farming:cocoa_beans_raw", { minetest.register_craftitem("farming:cocoa_beans", { description = S("Cocoa Beans"), inventory_image = "farming_cocoa_beans.png", - groups = {food_cocoa = 1, flammable = 2} + groups = {compostability = 65, food_cocoa = 1, flammable = 2} }) minetest.register_craft({ @@ -87,7 +88,7 @@ minetest.register_craft({ }) minetest.register_craft( { - output = farming.mcl and "mcl_dye:brown 2" or "dye:brown 2", + output = a.dye_brown, recipe = {{"farming:cocoa_beans"}} }) diff --git a/crops/coffee.lua b/crops/coffee.lua index 002121b..3cc6822 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- coffee minetest.register_craftitem("farming:coffee_beans", { description = S("Coffee Beans"), inventory_image = "farming_coffee_beans.png", - groups = {compostability = 65, seed = 2, food_coffee = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_coffee = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:coffee_1") end @@ -32,12 +33,10 @@ minetest.register_node("farming:coffee_cup", { minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup") minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") -local tmp = farming.use_utensils and "farming:saucepan" or "" - minetest.register_craft( { output = "farming:coffee_cup", recipe = { - {"group:food_coffee", "group:food_water_glass", tmp} + {"group:food_coffee", "group:food_water_glass", a.saucepan} }, replacements = { {"group:food_saucepan", "farming:saucepan"} @@ -106,7 +105,8 @@ local mg = farming.mapgen == "v6" def = { y_max = mg and 50 or 55, spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass"} + "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass", + "mcl_core:dirt_with_grass"} } minetest.register_decoration({ diff --git a/crops/corn.lua b/crops/corn.lua index 6b1d89b..1e82768 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -5,12 +5,13 @@ ]] local S = farming.translate +local a = farming.recipe_items -- corn minetest.register_craftitem("farming:corn", { description = S("Corn"), inventory_image = "farming_corn.png", - groups = {compostability = 65, seed = 2, food_corn = 1, flammable = 2}, + groups = {compostability = 45, seed = 2, food_corn = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1") end, @@ -21,7 +22,7 @@ minetest.register_craftitem("farming:corn", { minetest.register_craftitem("farming:corn_cob", { description = S("Corn on the Cob"), inventory_image = "farming_corn_cob.png", - groups = {food_corn_cooked = 1, flammable = 2}, + groups = {compostability = 65, food_corn_cooked = 1, flammable = 2}, on_use = minetest.item_eat(5) }) @@ -36,16 +37,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:popcorn", { description = S("Popcorn"), inventory_image = "farming_popcorn.png", - groups = {food_popcorn = 1, flammable = 2}, + groups = {compostability = 55, food_popcorn = 1, flammable = 2}, on_use = minetest.item_eat(4) }) -local tmp = farming.use_utensils and "farming:pot" or "" - minetest.register_craft({ output = "farming:popcorn", recipe = { - {"group:food_oil", "group:food_corn", tmp} + {"group:food_oil", "group:food_corn", a.pot} }, replacements = { {"group:food_pot", "farming:pot"}, @@ -60,13 +59,10 @@ minetest.register_craftitem("farming:cornstarch", { groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2} }) -tmp = farming.use_utensils and "farming:mortar_pestle" or "" -local tmp2 = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:cornstarch", recipe = { - {tmp, "group:food_corn_cooked", tmp2}, + {a.mortar_pestle, "group:food_corn_cooked", a.baking_tray}, {"", "group:food_bowl", ""}, }, replacements = { @@ -97,7 +93,7 @@ minetest.register_craft( { output = "farming:bottle_ethanol", recipe = { {"group:food_corn", "group:food_corn", "group:food_corn"}, - {"group:food_corn", "vessels:glass_bottle", "group:food_corn"}, + {"group:food_corn", a.glass_bottle, "group:food_corn"}, {"group:food_corn", "group:food_corn", "group:food_corn"} } }) @@ -106,7 +102,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:bottle_ethanol", burntime = 80, - replacements = {{"farming:bottle_ethanol", "vessels:glass_bottle"}} + replacements = {{"farming:bottle_ethanol", a.glass_bottle}} }) -- corn definition @@ -187,7 +183,7 @@ farming.registered_plants["farming:corn"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/cotton.lua b/crops/cotton.lua index d1aba32..7dfda69 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -13,7 +13,7 @@ minetest.register_node("farming:cotton_wild", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {handy = 1, snappy = 3, attached_node = 1, flammable = 4}, + groups = {handy = 1, snappy = 3, attached_node = 1, flammable = 4, compostability = 60}, drop = { items = { {items = {"farming:cotton"}, rarity = 2}, @@ -35,7 +35,7 @@ minetest.register_node("farming:seed_cotton", { wield_image = "farming_cotton_seed.png", drawtype = "signlike", groups = { - compostability = 65, seed = 1, snappy = 3, attached_node = 1, + compostability = 48, seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1 }, paramtype = "light", @@ -53,7 +53,7 @@ minetest.register_node("farming:seed_cotton", { minetest.register_craftitem("farming:cotton", { description = S("Cotton"), inventory_image = "farming_cotton.png", - groups = {flammable = 4} + groups = {flammable = 4, compostability = 50} }) -- string @@ -195,7 +195,8 @@ farming.register_plant("farming:cotton", { local mg = farming.mapgen == "v6" def = { - grow_on = mg and {"default:dirt_with_grass"} or {"default:dry_dirt_with_dry_grass"}, + grow_on = mg and {"default:dirt_with_grass"} or {"default:dry_dirt_with_dry_grass", + "mcl_core:dirt_with_grass"}, biome = mg and {"jungle"} or {"savanna"} } diff --git a/crops/cucumber.lua b/crops/cucumber.lua index 5edd356..577aff4 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -10,7 +10,7 @@ local S = farming.translate minetest.register_craftitem("farming:cucumber", { description = S("Cucumber"), inventory_image = "farming_cucumber.png", - groups = {compostability = 65, seed = 2, food_cucumber = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_cucumber = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1") end, @@ -75,7 +75,7 @@ def = { minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 8cdf2e3..b72eda4 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:eggplant", { description = S("Eggplant"), inventory_image = "farming_eggplant.png", - groups = {compostability = 65, seed = 2, food_eggplant = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_eggplant = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:eggplant_1") end, @@ -72,7 +72,7 @@ farming.registered_plants["farming:eggplant"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = -0.1, diff --git a/crops/garlic.lua b/crops/garlic.lua index d750598..7586533 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -11,7 +11,7 @@ local S = farming.translate minetest.register_craftitem("farming:garlic_clove", { description = S("Garlic clove"), inventory_image = "crops_garlic_clove.png", - groups = {compostability = 65, seed = 2, food_garlic_clove = 1, flammable = 3}, + groups = {compostability = 35, seed = 2, food_garlic_clove = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:garlic_1") end @@ -22,7 +22,7 @@ minetest.register_craftitem("farming:garlic", { description = S("Garlic"), inventory_image = "crops_garlic.png", on_use = minetest.item_eat(1), - groups = {food_garlic = 1, flammable = 3} + groups = {food_garlic = 1, flammable = 3, compostability = 55} }) minetest.register_craft({ @@ -53,7 +53,7 @@ minetest.register_node("farming:garlic_braid", { "crops_garlic_braid_side.png^[transformFx","crops_garlic_braid_side.png", "crops_garlic_braid.png","crops_garlic_braid.png" }, - groups = {vessel = 1, dig_immediate = 3, flammable = 3}, + groups = {vessel = 1, dig_immediate = 3, flammable = 3, compostability = 65}, sounds = farming.sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", @@ -138,7 +138,7 @@ farming.registered_plants["farming:garlic"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/ginger.lua b/crops/ginger.lua index c7ba67a..e94d995 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:ginger", { description = S("Ginger"), inventory_image = "farming_ginger.png", - groups = {compostability = 65, seed = 2, food_ginger = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_ginger = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:ginger_1") end, @@ -72,7 +72,7 @@ farming.registered_plants["farming:ginger"] = { minetest.register_decoration({ name = "farming:ginger_4", deco_type = "simple", - place_on = {"default:dirt_with_rainforest_litter"}, + place_on = {"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/grapes.lua b/crops/grapes.lua index 7afa68d..57fc283 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- place trellis local function place_grapes(itemstack, placer, pointed_thing, plantname) @@ -67,7 +68,7 @@ minetest.register_craftitem("farming:grapes", { description = S("Grapes"), inventory_image = "farming_grapes.png", on_use = minetest.item_eat(2), - groups = {compostability = 65, seed = 2, food_grapes = 1, flammable = 3}, + groups = {compostability = 48, seed = 2, food_grapes = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1") end @@ -75,7 +76,7 @@ minetest.register_craftitem("farming:grapes", { -- grapes can be used for violet dye minetest.register_craft({ - output = farming.mcl and "mcl_dye:violet" or "dye:violet", + output = a.dye_violet, recipe = {{"farming:grapes"}} }) @@ -153,9 +154,9 @@ minetest.register_node("farming:trellis", { minetest.register_craft({ output = "farming:trellis", recipe = { - {"default:stick", "default:stick", "default:stick"}, - {"default:stick", "default:stick", "default:stick"}, - {"default:stick", "default:stick", "default:stick"} + {"group:stick", "group:stick", "group:stick"}, + {"group:stick", "group:stick", "group:stick"}, + {"group:stick", "group:stick", "group:stick"} } }) @@ -257,7 +258,7 @@ minetest.register_node("farming:grapebush", { selection_box = farming.select, groups = { handy = 1, snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1 + not_in_creative_inventory = 1, compostability = 35 }, sounds = farming.sounds.node_sound_leaves_defaults() }) @@ -265,7 +266,7 @@ minetest.register_node("farming:grapebush", { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/hemp.lua b/crops/hemp.lua index b06431e..fc6ce04 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- hemp seeds minetest.register_node("farming:seed_hemp", { @@ -8,7 +9,7 @@ minetest.register_node("farming:seed_hemp", { inventory_image = "farming_hemp_seed.png", wield_image = "farming_hemp_seed.png", drawtype = "signlike", - groups = {compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1}, + groups = {compostability = 38, seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -40,7 +41,10 @@ minetest.register_node("farming:hemp_oil", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} }, - groups = {food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, + groups = { + food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1, + compostability = 45 + }, sounds = farming.sounds.node_sound_glass_defaults() }) @@ -49,7 +53,7 @@ minetest.register_craft( { recipe = { {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, - {"", "vessels:glass_bottle", ""} + {"", a.glass_bottle, ""} } }) @@ -58,7 +62,7 @@ minetest.register_craft( { recipe = { {"farming:seed_hemp", "farming:seed_hemp", "farming:seed_hemp"}, {"farming:seed_hemp", "farming:seed_hemp", "farming:seed_hemp"}, - {"farming:seed_hemp", "vessels:glass_bottle", "farming:seed_hemp"} + {"farming:seed_hemp", a.glass_bottle, "farming:seed_hemp"} } }) @@ -66,13 +70,14 @@ minetest.register_craft({ type = "fuel", recipe = "farming:hemp_oil", burntime = 20, - replacements = {{"farming:hemp_oil", "vessels:glass_bottle"}} + replacements = {{"farming:hemp_oil", a.glass_bottle}} }) -- hemp fibre minetest.register_craftitem("farming:hemp_fibre", { description = S("Hemp Fibre"), - inventory_image = "farming_hemp_fibre.png" + inventory_image = "farming_hemp_fibre.png", + groups = {compostability = 55} }) minetest.register_craft( { @@ -82,7 +87,7 @@ minetest.register_craft( { {"farming:hemp_leaf", "group:water_bucket", "farming:hemp_leaf"}, {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"} }, - replacements = {{"group:water_bucket", "bucket:bucket_empty"}} + replacements = {{a.bucket_water, a.bucket_empty}} }) if minetest.get_modpath("bucket_wooden") then @@ -102,7 +107,10 @@ minetest.register_node("farming:hemp_block", { description = S("Hemp Block"), tiles = {"farming_hemp_block.png"}, paramtype = "light", - groups = {handy = 1, snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + groups = { + handy = 1, snappy = 2, oddly_breakable_by_hand = 1, flammable = 2, + compostability = 85 + }, sounds = farming.sounds.node_sound_leaves_defaults() }) @@ -138,7 +146,7 @@ end -- paper minetest.register_craft( { - output = "default:paper 3", + output = a.paper .. " 3", recipe = { {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"} } @@ -165,7 +173,9 @@ minetest.register_node("farming:hemp_rope", { wield_image = "farming_hemp_rope.png", inventory_image = "farming_hemp_rope.png", drawtype = "plantlike", - groups = {flammable = 2, choppy = 3, oddly_breakable_by_hand = 3}, + groups = { + flammable = 2, choppy = 3, oddly_breakable_by_hand = 3, compostability = 55 + }, sounds = farming.sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -268,7 +278,10 @@ farming.registered_plants["farming:hemp"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + place_on = { + "default:dirt_with_grass", "default:dirt_with_rainforest_litter", + "mcl_core:dirt_with_grass" + }, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 09265d9..3e555be 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:lettuce", { description = S("Lettuce"), inventory_image = "farming_lettuce.png", - groups = {compostability = 65, seed = 2, food_lettuce = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_lettuce = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:lettuce_1") end, @@ -67,7 +67,7 @@ farming.registered_plants["farming:lettuce"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/melon.lua b/crops/melon.lua index 0fdb328..5d4e6b1 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- melon minetest.register_craftitem("farming:melon_slice", { description = S("Melon Slice"), inventory_image = "farming_melon_slice.png", - groups = {compostability = 65, seed = 2, food_melon_slice = 1, flammable = 3}, + groups = {compostability = 48, seed = 2, food_melon_slice = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1") end, @@ -20,11 +21,9 @@ minetest.register_craft({ } }) -local tmp = farming.use_utensils and "farming:cutting_board" or "" - minetest.register_craft({ output = "farming:melon_slice 4", - recipe = {{"farming:melon_8", tmp}}, + recipe = {{"farming:melon_8", a.cutting_board}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) @@ -82,7 +81,7 @@ minetest.register_node("farming:melon_8", { }, groups = { food_melon = 1, handy = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, - flammable = 2, plant = 1 + flammable = 2, plant = 1, compostability = 65 }, drop = "farming:melon_8", sounds = farming.sounds.node_sound_wood_defaults(), @@ -105,7 +104,7 @@ local mg = farming.mapgen == "v6" def = { y_max = mg and 20 or 6, spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter"}, + "default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"}, near = mg and "group:water" or nil, num = mg and 1 or -1, } diff --git a/crops/mint.lua b/crops/mint.lua index b93b3e7..8b7f7b4 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- mint seed minetest.register_node("farming:seed_mint", { @@ -9,7 +10,7 @@ minetest.register_node("farming:seed_mint", { wield_image = "farming_mint_seeds.png", drawtype = "signlike", groups = { - compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1, + compostability = 48, seed = 1, snappy = 3, attached_node = 1, growing = 1, flammable = 2 }, paramtype = "light", @@ -27,7 +28,7 @@ minetest.register_node("farming:seed_mint", { minetest.register_craftitem("farming:mint_leaf", { description = S("Mint Leaf"), inventory_image = "farming_mint_leaf.png", - groups = {food_mint = 1, flammable = 4} + groups = {food_mint = 1, flammable = 4, compostability = 48} }) -- mint tea @@ -38,13 +39,11 @@ minetest.register_craftitem("farming:mint_tea", { groups = {flammable = 4} }) -local tmp = farming.use_utensils and "farming:juicer" or "" - minetest.register_craft({ output = "farming:mint_tea", recipe = { {"group:food_mint", "group:food_mint", "group:food_mint"}, - {"group:food_water_glass", tmp, ""} + {"group:food_water_glass", a.juicer, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -106,7 +105,10 @@ farming.registered_plants["farming:mint"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_coniferous_litter"}, + place_on = { + "default:dirt_with_grass", "default:dirt_with_coniferous_litter", + "mcl_core:dirt_with_grass" + }, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/onion.lua b/crops/onion.lua index ae404ea..d0a9cbd 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -6,12 +6,13 @@ ]] local S = farming.translate +local a = farming.recipe_items -- onion minetest.register_craftitem("farming:onion", { description = S("Onion"), inventory_image = "crops_onion.png", - groups = {compostability = 65, seed = 2, food_onion = 1, flammable = 3}, + groups = {compostability = 48, seed = 2, food_onion = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:onion_1") end, @@ -26,21 +27,19 @@ minetest.register_craftitem("farming:onion_soup", { on_use = minetest.item_eat(6, "farming:bowl") }) -local tmp = farming.use_utensils and "farming:pot" or "" - minetest.register_craft({ output = "farming:onion_soup", recipe = { {"group:food_onion", "group:food_onion", "group:food_onion"}, {"group:food_onion", "group:food_bowl", "group:food_onion"}, - {"", tmp, ""} + {"", a.pot, ""} }, replacements = {{"farming:pot", "farming:pot"}} }) -- yellow dye minetest.register_craft({ - output = farming.mcl and "mcl_dye:yellow" or "dye:yellow", + output = a.dye_yellow, recipe = {{"group:food_onion"}} }) @@ -107,7 +106,7 @@ farming.registered_plants["farming:onion"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/parsley.lua b/crops/parsley.lua index 2b678ee..3ba3bf7 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:parsley", { description = S("Parsley"), inventory_image = "farming_parsley.png", - groups = {compostability = 65, seed = 2, food_parsley = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_parsley = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:parsley_1") end @@ -61,7 +61,7 @@ farming.registered_plants["farming:parsley"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/peas.lua b/crops/peas.lua index 5fd3029..adfe6bb 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- Textures for Pea crop and Peas were done by Andrey01 @@ -8,7 +9,7 @@ minetest.register_craftitem("farming:pea_pod", { description = S("Pea Pod"), inventory_image = "farming_pea_pod.png", groups = { - compostability = 65, seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2 + compostability = 48, seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pea_1") @@ -24,7 +25,7 @@ minetest.register_craftitem("farming:pea_soup", { description = S("Pea Soup"), inventory_image = "farming_pea_soup.png", groups = {flammable = 2}, - on_use = minetest.item_eat(4, "farming:bowl") + on_use = minetest.item_eat(4, a.bowl) }) minetest.register_craft({ @@ -96,7 +97,7 @@ farming.registered_plants["farming:pea_pod"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/pepper.lua b/crops/pepper.lua index c6a154a..e1f3a4c 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -6,12 +6,13 @@ ]] local S = farming.translate +local a = farming.recipe_items -- peppercorn (seed) minetest.register_craftitem("farming:peppercorn", { description = S("Peppercorn"), inventory_image = "crops_peppercorn.png", - groups = {compostability = 65, seed = 1, food_peppercorn = 1, flammable = 3}, + groups = {compostability = 48, seed = 1, food_peppercorn = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pepper_1") end @@ -22,7 +23,7 @@ minetest.register_craftitem("farming:pepper", { description = S("Green Pepper"), inventory_image = "crops_pepper.png", on_use = minetest.item_eat(2), - groups = {food_pepper = 1, flammable = 3} + groups = {food_pepper = 1, flammable = 3, compostability = 55} }) -- yellow pepper @@ -30,7 +31,7 @@ minetest.register_craftitem("farming:pepper_yellow", { description = S("Yellow Pepper"), inventory_image = "crops_pepper_yellow.png", on_use = minetest.item_eat(3), - groups = {food_pepper = 1, flammable = 3} + groups = {food_pepper = 1, flammable = 3, compostability = 55} }) -- red pepper @@ -38,7 +39,7 @@ minetest.register_craftitem("farming:pepper_red", { description = S("Red Pepper"), inventory_image = "crops_pepper_red.png", on_use = minetest.item_eat(4), - groups = {food_pepper = 1, flammable = 3} + groups = {food_pepper = 1, flammable = 3, compostability = 55} }) minetest.register_craft({ @@ -57,7 +58,7 @@ minetest.register_node("farming:pepper_ground", { tiles = {"crops_pepper_ground.png"}, groups = { vessel = 1, food_pepper_ground = 1, - dig_immediate = 3, attached_node = 1 + dig_immediate = 3, attached_node = 1, compostability = 30 }, sounds = farming.sounds.node_sound_defaults(), selection_box = { @@ -66,14 +67,12 @@ minetest.register_node("farming:pepper_ground", { } }) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft( { output = "farming:pepper_ground", recipe = { {"group:food_peppercorn"}, - {"vessels:glass_bottle"}, - {tmp} + {a.glass_bottle}, + {a.mortar_pestle} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -161,7 +160,8 @@ farming.registered_plants["farming:pepper"] = { local mg = farming.mapgen == "v6" def = { - grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_rainforest_litter"} + grow_on = mg and {"default:dirt_with_grass"} or { + "default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"} } minetest.register_decoration({ diff --git a/crops/pineapple.lua b/crops/pineapple.lua index ed67b3f..2ef4550 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- pineapple top minetest.register_craftitem("farming:pineapple_top", { description = S("Pineapple Top"), inventory_image = "farming_pineapple_top.png", - groups = {compostability = 65, seed = 2, flammable = 2}, + groups = {compostability = 48, seed = 2, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1") end @@ -25,7 +26,10 @@ minetest.register_node("farming:pineapple", { type = "fixed", fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27} }, - groups = {food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2} + groups = { + food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2, + compostability = 65 + } }) -- pineapple @@ -47,18 +51,16 @@ minetest.register_craftitem("farming:pineapple_juice", { description = S("Pineapple Juice"), inventory_image = "farming_pineapple_juice.png", on_use = minetest.item_eat(4, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1} + groups = {vessel = 1, drink = 1, compostability = 45} }) -local tmp = farming.use_utensils and "farming:juicer" or "" - minetest.register_craft({ output = "farming:pineapple_juice", recipe = { {"group:food_pineapple_ring", "group:food_pineapple_ring", "group:food_pineapple_ring"}, - {"", "vessels:drinking_glass", ""}, - {"", tmp, ""} + {"", a.drinking_glass, ""}, + {"", a.juicer, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -68,9 +70,8 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:pineapple_juice 2", recipe = { - {"group:food_pineapple", ""}, - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {tmp, ""} + {a.drinking_glass, "group:food_pineapple", a.drinking_glass}, + {"", a.juicer, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -149,7 +150,7 @@ local mg = farming.mapgen == "v6" def = { grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", - "default:dry_dirt_with_dry_grass"}, + "default:dry_dirt_with_dry_grass", "mcl_core:dirt_with_grass"}, grow_near = mg and "group:sand" or nil, num = mg and 1 or -1 } diff --git a/crops/potato.lua b/crops/potato.lua index 56b6804..caaa72b 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -10,7 +10,7 @@ local S = farming.translate minetest.register_craftitem("farming:potato", { description = S("Potato"), inventory_image = "farming_potato.png", - groups = {compostability = 65, seed = 2, food_potato = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_potato = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1") end, @@ -115,7 +115,7 @@ farming.registered_plants["farming:potato"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 714cd8c..3f4d95a 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:pumpkin_slice", { description = S("Pumpkin Slice"), inventory_image = "farming_pumpkin_slice.png", - groups = {compostability = 65, seed = 2, food_pumpkin_slice = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_pumpkin_slice = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1") end, @@ -32,12 +32,17 @@ minetest.register_craft({ minetest.register_node("farming:jackolantern", { description = S("Jack 'O Lantern (punch to turn on and off)"), tiles = { - "farming_pumpkin_bottom.png^farming_pumpkin_top.png", "farming_pumpkin_bottom.png", - "farming_pumpkin_side.png", "farming_pumpkin_side.png", - "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_off.png" + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", + "farming_pumpkin_bottom.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png^farming_pumpkin_face_off.png" }, paramtype2 = "facedir", - groups = {handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + groups = { + handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 + }, sounds = farming.sounds.node_sound_wood_defaults(), on_punch = function(pos, node, puncher) local name = puncher:get_player_name() or "" @@ -49,9 +54,12 @@ minetest.register_node("farming:jackolantern", { minetest.register_node("farming:jackolantern_on", { tiles = { - "farming_pumpkin_bottom.png^farming_pumpkin_top.png", "farming_pumpkin_bottom.png", - "farming_pumpkin_side.png", "farming_pumpkin_side.png", - "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_on.png" + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", + "farming_pumpkin_bottom.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png^farming_pumpkin_face_on.png" }, light_source = minetest.LIGHT_MAX - 1, paramtype2 = "facedir", @@ -216,7 +224,7 @@ def = { minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/raspberry.lua b/crops/raspberry.lua index 20ca7d1..0b16347 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- raspberries minetest.register_craftitem("farming:raspberries", { description = S("Raspberries"), inventory_image = "farming_raspberries.png", - groups = {compostability = 65, seed = 2, food_raspberries = 1, food_raspberry = 1, + groups = {compostability = 48, seed = 2, food_raspberries = 1, food_raspberry = 1, food_berry = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1") @@ -18,15 +19,15 @@ minetest.register_craftitem("farming:smoothie_raspberry", { description = S("Raspberry Smoothie"), inventory_image = "farming_raspberry_smoothie.png", on_use = minetest.item_eat(2, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1} + groups = {vessel = 1, drink = 1, compostability = 65} }) minetest.register_craft({ output = "farming:smoothie_raspberry", recipe = { - {"default:snow"}, + {a.snow}, {"group:food_raspberries"}, - {"vessels:drinking_glass"} + {a.drinking_glass} } }) @@ -83,7 +84,7 @@ farming.registered_plants["farming:raspberries"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index b3b14cd..8d2604e 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- rhubarb minetest.register_craftitem("farming:rhubarb", { description = S("Rhubarb"), inventory_image = "farming_rhubarb.png", - groups = {compostability = 65, seed = 2, food_rhubarb = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_rhubarb = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1") end, @@ -19,12 +20,10 @@ minetest.register_craftitem("farming:rhubarb_pie", { on_use = minetest.item_eat(6) }) -local tmp = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:rhubarb_pie", recipe = { - {tmp, "group:food_sugar", ""}, + {a.baking_tray, "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_wheat", "group:food_wheat", "group:food_wheat"} }, @@ -92,7 +91,7 @@ farming.registered_plants["farming:rhubarb"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/rice.lua b/crops/rice.lua index c222296..01cc9ab 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- rice seed minetest.register_node("farming:seed_rice", { @@ -9,7 +10,7 @@ minetest.register_node("farming:seed_rice", { wield_image = "farming_rice_seed.png", drawtype = "signlike", groups = { - compostability = 65, seed = 1, snappy = 3, attached_node = 1, + compostability = 48, seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1 }, paramtype = "light", @@ -27,7 +28,7 @@ minetest.register_node("farming:seed_rice", { minetest.register_craftitem("farming:rice", { description = S("Rice"), inventory_image = "farming_rice.png", - groups = {seed = 2, food_rice = 1, flammable = 2}, + groups = {seed = 2, food_rice = 1, flammable = 2, compostability = 65}, }) -- dry rice seed to give edible rice @@ -43,22 +44,20 @@ minetest.register_craftitem("farming:rice_bread", { description = S("Rice Bread"), inventory_image = "farming_rice_bread.png", on_use = minetest.item_eat(5), - groups = {food_rice_bread = 1, flammable = 2} + groups = {food_rice_bread = 1, flammable = 2, compostability = 65} }) minetest.register_craftitem("farming:rice_flour", { description = S("Rice Flour"), inventory_image = "farming_rice_flour.png", - groups = {food_rice_flour = 1, flammable = 1} + groups = {food_rice_flour = 1, flammable = 1, compostability = 65} }) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:rice_flour", recipe = { {"farming:rice", "farming:rice", "farming:rice"}, - {"farming:rice", tmp, ""} + {"farming:rice", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index 3289757..ff56a22 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items --= A nice addition from Ademant's grain mod :) @@ -15,20 +16,18 @@ farming.register_plant("farming:rye", { minetest.override_item("farming:rye", { description = S("Rye"), - groups = {food_rye = 1, flammable = 4} + groups = {food_rye = 1, flammable = 4, compostability = 65} }) minetest.override_item("farming:rye_1", {drop = {}}) minetest.override_item("farming:rye_2", {drop = {}}) minetest.override_item("farming:rye_3", {drop = {}}) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:flour", recipe = { {"farming:rye", "farming:rye", "farming:rye"}, - {"farming:rye", tmp, ""} + {"farming:rye", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -45,7 +44,7 @@ farming.register_plant("farming:oat", { minetest.override_item("farming:oat", { description = S("Oats"), - groups = {food_oats = 1, flammable = 4} + groups = {food_oats = 1, flammable = 4, compostability = 65} }) minetest.override_item("farming:oat_1", {drop = {}}) @@ -56,7 +55,7 @@ minetest.register_craft({ output = "farming:flour", recipe = { {"farming:oat", "farming:oat", "farming:oat"}, - {"farming:oat", tmp, ""} + {"farming:oat", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -74,7 +73,7 @@ minetest.register_craft({ output = "farming:flour_multigrain", recipe = { "farming:wheat", "farming:barley", "farming:oat", - "farming:rye", tmp + "farming:rye", a.mortar_pestle }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -85,7 +84,7 @@ minetest.register_craftitem("farming:bread_multigrain", { description = S("Multigrain Bread"), inventory_image = "farming_bread_multigrain.png", on_use = minetest.item_eat(7), - groups = {food_bread = 1, flammable = 2} + groups = {food_bread = 1, flammable = 2, compostability = 65} }) minetest.register_craft({ diff --git a/crops/soy.lua b/crops/soy.lua index 107e4e1..8c38345 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- soy pod minetest.register_craftitem("farming:soy_pod", { description = S("Soy Pod"), inventory_image = "farming_soy_pod.png", - groups = {compostability = 65, seed = 2, food_soy = 1, food_soy_pod = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_soy = 1, food_soy_pod = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:soy_1") end @@ -28,22 +29,21 @@ minetest.register_node("farming:soy_sauce", { fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} }, groups = { - vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1 + vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1, + compostability = 65 }, sounds = farming.sounds.node_sound_glass_defaults() }) -local tmp = farming.use_utensils and "farming:juicer" or "" - -- soy sauce recipe minetest.register_craft( { output = "farming:soy_sauce", recipe = { {"group:food_soy", "group:food_salt", "group:food_soy"}, - {tmp, "bucket:bucket_water", "vessels:glass_bottle"} + {a.juicer, a.bucket_water, a.glass_bottle} }, replacements = { - {"bucket:bucket_water", "bucket:bucket_empty"}, + {a.bucket_water, a.bucket_empty}, {"group:food_juicer", "farming:juicer"} } }) @@ -64,7 +64,7 @@ minetest.register_node("farming:soy_milk", { on_use = minetest.item_eat(2, "vessels:drinking_glass"), groups = { vessel = 1, food_milk_glass = 1, dig_immediate = 3, - attached_node = 1, drink = 1 + attached_node = 1, drink = 1, compostability = 65 }, sounds = farming.sounds.node_sound_glass_defaults() }) @@ -73,11 +73,11 @@ minetest.register_craft( { output = "farming:soy_milk", recipe = { {"group:food_soy", "group:food_soy", "group:food_soy"}, - {"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"} + {"farming:vanilla_extract", "bucket:bucket_water", a.drinking_glass} }, replacements = { - {"bucket:bucket_water", "bucket:bucket_empty"}, - {"farming:vanilla_extract", "vessels:glass_bottle"} + {a.bucket_water, a.bucket_empty}, + {"farming:vanilla_extract", a.glass_bottle} } }) @@ -85,17 +85,15 @@ minetest.register_craft( { minetest.register_craftitem("farming:tofu", { description = S("Tofu"), inventory_image = "farming_tofu.png", - groups = {food_tofu = 1, food_meat_raw = 1, flammable = 2}, + groups = {food_tofu = 1, food_meat_raw = 1, flammable = 2, compostability = 65}, on_use = minetest.item_eat(3) }) -tmp = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:tofu", recipe = { {"group:food_soy", "group:food_soy", "group:food_soy"}, - {"group:food_soy", "group:food_soy", tmp} + {"group:food_soy", "group:food_soy", a.baking_tray} }, replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) @@ -104,7 +102,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:tofu_cooked", { description = S("Cooked Tofu"), inventory_image = "farming_tofu_cooked.png", - groups = {food_meat = 1, flammable = 2}, + groups = {food_meat = 1, flammable = 2, compostability = 65}, on_use = minetest.item_eat(6) }) @@ -200,7 +198,8 @@ local mg = farming.mapgen == "v6" def = { spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass"} + "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass", + "mcl_core:dirt_with_grass"} } minetest.register_decoration({ diff --git a/crops/spinach.lua b/crops/spinach.lua index 24126b0..ed43ae9 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:spinach", { description = S("Spinach"), inventory_image = "farming_spinach.png", - groups = {compostability = 65, seed = 2, food_spinach = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_spinach = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:spinach_1") end, @@ -72,7 +72,7 @@ farming.registered_plants["farming:spinach"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = -0.1, diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 3c2bfee..2b52b92 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -6,7 +6,7 @@ minetest.register_craftitem(":ethereal:strawberry", { description = S("Strawberry"), inventory_image = "ethereal_strawberry.png", groups = { - compostability = 65, seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2 + compostability = 48, seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") @@ -98,7 +98,7 @@ farming.registered_plants["ethereal:strawberry"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 298ea3f..d302f19 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- sunflower minetest.register_craftitem("farming:sunflower", { @@ -16,7 +17,7 @@ minetest.register_node("farming:seed_sunflower", { wield_image = "farming_sunflower_seeds.png", drawtype = "signlike", groups = { - compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1, + compostability = 48, seed = 1, snappy = 3, attached_node = 1, growing = 1, food_sunflower_seeds = 1, flammable = 2 }, paramtype = "light", @@ -41,7 +42,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:sunflower_seeds_toasted", { description = S("Toasted Sunflower Seeds"), inventory_image = "farming_sunflower_seeds_toasted.png", - groups = {food_sunflower_seeds_toasted = 1, flammable = 2}, + groups = {food_sunflower_seeds_toasted = 1, flammable = 2, compostability = 65}, on_use = minetest.item_eat(1) }) @@ -68,7 +69,7 @@ minetest.register_node("farming:sunflower_oil", { }, groups = { food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - flammable = 2 + flammable = 2, compostability = 65 }, sounds = farming.sounds.node_sound_glass_defaults() }) @@ -78,7 +79,7 @@ minetest.register_craft( { recipe = { {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, - {"group:food_sunflower_seeds", "vessels:glass_bottle", "group:food_sunflower_seeds"} + {"group:food_sunflower_seeds", a.glass_bottle, "group:food_sunflower_seeds"} } }) @@ -86,7 +87,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:sunflower_oil", burntime = 30, - replacements = {{"farming:sunflower_oil", "vessels:glass_bottle"}} + replacements = {{"farming:sunflower_oil", a.glass_bottle}} }) -- sunflower seed bread @@ -99,7 +100,13 @@ minetest.register_craftitem("farming:sunflower_bread", { minetest.register_craft({ output = "farming:sunflower_bread", - recipe = {{"group:food_sunflower_seeds_toasted", "group:food_bread", "group:food_sunflower_seeds_toasted"}} + recipe = { + { + "group:food_sunflower_seeds_toasted", + "group:food_bread", + "group:food_sunflower_seeds_toasted" + } + } }) -- sunflower definition @@ -172,7 +179,7 @@ farming.registered_plants["farming:sunflower"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/tomato.lua b/crops/tomato.lua index f6a1104..486a44c 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -10,7 +10,7 @@ local S = farming.translate minetest.register_craftitem("farming:tomato", { description = S("Tomato"), inventory_image = "farming_tomato.png", - groups = {compostability = 65, seed = 2, food_tomato = 1, flammable = 2}, + groups = {compostability = 45, seed = 2, food_tomato = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1") end, @@ -21,7 +21,7 @@ minetest.register_craftitem("farming:tomato", { minetest.register_craftitem("farming:tomato_soup", { description = S("Tomato Soup"), inventory_image = "farming_tomato_soup.png", - groups = {flammable = 2}, + groups = {flammable = 2, compostability = 65}, on_use = minetest.item_eat(8, "farming:bowl") }) @@ -110,7 +110,7 @@ farming.registered_plants["farming:tomato"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 680f235..2c1b90d 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -1,11 +1,12 @@ local S = farming.translate +local a = farming.recipe_items -- vanilla minetest.register_craftitem("farming:vanilla", { description = S("Vanilla"), inventory_image = "farming_vanilla.png", - groups = {compostability = 65, seed = 2, food_vanilla = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_vanilla = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:vanilla_1") end, @@ -55,7 +56,7 @@ minetest.register_craft( { {"group:food_vanilla", "farming:bottle_ethanol", "group:food_water_glass"}, }, replacements = { - {"group:food_water_glass", "vessels:drinking_glass"} + {"group:food_water_glass", a.drinking_glass} } }) @@ -127,7 +128,7 @@ farming.registered_plants["farming:vanilla"] = { -- mapgen minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/wheat.lua b/crops/wheat.lua index 9e9b44f..24fbd43 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- wheat seeds minetest.register_node("farming:seed_wheat", { @@ -78,13 +79,11 @@ minetest.register_craftitem("farming:flour", { groups = {food_flour = 1, flammable = 1} }) -local tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:flour", recipe = { {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", tmp, ""} + {"farming:wheat", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -104,54 +103,6 @@ minetest.register_craft({ recipe = "farming:flour" }) --- sliced bread -minetest.register_craftitem("farming:bread_slice", { - description = S("Sliced Bread"), - inventory_image = "farming_bread_slice.png", - on_use = minetest.item_eat(1), - groups = {food_bread_slice = 1, flammable = 2} -}) - -tmp = farming.use_utensils and "farming:cutting_board" or "" - -minetest.register_craft({ - output = "farming:bread_slice 5", - recipe = {{"farming:bread", tmp}}, - replacements = {{"group:food_cutting_board", "farming:cutting_board"}} -}) - --- toast -minetest.register_craftitem("farming:toast", { - description = S("Toast"), - inventory_image = "farming_toast.png", - on_use = minetest.item_eat(1), - groups = {food_toast = 1, flammable = 2} -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 3, - output = "farming:toast", - recipe = "farming:bread_slice" -}) - --- toast sandwich -minetest.register_craftitem("farming:toast_sandwich", { - description = S("Toast Sandwich"), - inventory_image = "farming_toast_sandwich.png", - on_use = minetest.item_eat(4), - groups = {flammable = 2} -}) - -minetest.register_craft({ - output = "farming:toast_sandwich", - recipe = { - {"farming:bread_slice"}, - {"farming:toast"}, - {"farming:bread_slice"} - } -}) - -- wheat definition local def = { drawtype = "plantlike", diff --git a/food.lua b/food.lua index 20e11ad..9a2bf02 100644 --- a/food.lua +++ b/food.lua @@ -1,72 +1,55 @@ local S = farming.translate -local tmp +local a = farming.recipe_items --- add group function -local function add_groups(item, groups) +-- sliced bread - local def = minetest.registered_items[item] +minetest.register_craftitem("farming:bread_slice", { + description = S("Sliced Bread"), + inventory_image = "farming_bread_slice.png", + on_use = minetest.item_eat(1), + groups = {food_bread_slice = 1, flammable = 2} +}) - if not def then return end +minetest.register_craft({ + output = "farming:bread_slice 5", + recipe = {{"group:food_bread", a.cutting_board}}, + replacements = {{"group:food_cutting_board", "farming:cutting_board"}} +}) - local grp = def.groups +-- toast - for k, v in pairs(groups) do - grp[k] = v - end +minetest.register_craftitem("farming:toast", { + description = S("Toast"), + inventory_image = "farming_toast.png", + on_use = minetest.item_eat(1), + groups = {food_toast = 1, flammable = 2} +}) - minetest.override_item(item, {groups = grp}) -end +minetest.register_craft({ + type = "cooking", + cooktime = 3, + output = "farming:toast", + recipe = "farming:bread_slice" +}) --- item compatibility list -local a = { - water_source = "default:water_source", - river_water_source = "default:river_water_source", - bucket_empty = "bucket:bucket_empty", - bucket_water = "bucket:bucket_water", - bucket_river_water = "bucket:bucket_river_water", - drinking_glass = "vessels:drinking_glass", - glass_bottle = "vessels:glass_bottle", - sugar = "farming:sugar", - rose = "flowers:rose", - dye_pink = "dye:pink", - dye_orange = "dye:orange", - bowl = "farming:bowl", - flour = "group:food_flour", - bread = "farming:bread", - cactus = "default:cactus", -} +-- toast sandwich -if farming.mcl then - a.water_source = "mcl_core:water_source" - a.river_water_source = "mclx_core:river_water_source" - a.bucket_empty = "mcl_buckets:bucket_empty" - a.bucket_water = "mcl_buckets:bucket_water" - a.bucket_river_water = "mcl_buckets:bucket_river_water" - a.drinking_glass = "mcl_potions:glass_bottle" - a.glass_bottle = "mcl_potions:glass_bottle" - a.sugar = "mcl_core:sugar" - a.rose = "mcl_flowers:rose_bush" - a.dye_pink = "mcl_dye:pink" - a.dye_orange = "mcl_dye:orange" - a.bowl = "mcl_core:bowl" - a.flour = "mcl_farming:bread" - a.bread = "mcl_farming:bread" - a.cactus = "mcl_core:cactus" +minetest.register_craftitem("farming:toast_sandwich", { + description = S("Toast Sandwich"), + inventory_image = "farming_toast_sandwich.png", + on_use = minetest.item_eat(4), + groups = {flammable = 2} +}) - add_groups("mcl_throwing:egg", {food_egg = 1}) - add_groups("mcl_farming:wheat", {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}) - add_groups("mcl_mobitems:chicken", {food_chicken_raw = 1}) - add_groups("mcl_mobitems:cooked_chicken", {food_chicken = 1}) - add_groups("mcl_mushrooms:mushroom_brown", {food_mushroom = 1}) - add_groups("mcl_farming:carrot_item", {food_carrot = 1}) - add_groups("mcl_mobitems:cooked_beef", {food_meat = 1}) - add_groups("mcl_mobitems:beef", {food_meat_raw = 1}) - add_groups("mcl_farming:potato_item", {food_potato = 1}) -end +minetest.register_craft({ + output = "farming:toast_sandwich", + recipe = { + {"farming:bread_slice"}, + {"farming:toast"}, + {"farming:bread_slice"} + } +}) -- filter sea water into river water @@ -138,10 +121,6 @@ if farming.mtg then }) end -if farming.mcl then - add_groups(a.sugar, {food_sugar = 1}) -end - minetest.register_node("farming:sugar_cube", { description = S("Sugar Cube"), tiles = {"farming_sugar_cube.png"}, @@ -168,7 +147,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:caramel", { description = S("Caramel"), - inventory_image = "farming_caramel.png" + inventory_image = "farming_caramel.png", + groups = {compostability = 40} }) minetest.register_craft({ @@ -249,7 +229,7 @@ minetest.register_craft({ -- Salt Crystal minetest.register_node("farming:salt_crystal", { - description = ("Salt crystal"), + description = S("Salt crystal"), inventory_image = "farming_salt_crystal.png", wield_image = "farming_salt_crystal.png", drawtype = "plantlike", @@ -265,12 +245,10 @@ minetest.register_node("farming:salt_crystal", { } }) -tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:salt 9", recipe = { - {"farming:salt_crystal", tmp} + {"farming:salt_crystal", a.mortar_pestle} }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) @@ -300,7 +278,10 @@ minetest.register_node("farming:mayonnaise", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.45, 0.25} }, - groups = {food_mayonnaise = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, + groups = { + compostability = 65, food_mayonnaise = 1, vessel = 1, dig_immediate = 3, + attached_node = 1 + }, sounds = farming.sounds.node_sound_glass_defaults() }) @@ -333,14 +314,12 @@ minetest.register_node("farming:rose_water", { } }) -tmp = farming.use_utensils and "farming:pot" or "" - minetest.register_craft({ output = "farming:rose_water", recipe = { {a.rose, a.rose, a.rose}, {a.rose, a.rose, a.rose}, - {"group:food_water_glass", tmp, a.glass_bottle} + {"group:food_water_glass", a.pot, a.glass_bottle} }, replacements = { {"group:food_water_glass", a.drinking_glass}, @@ -353,7 +332,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:turkish_delight", { description = S("Turkish Delight"), inventory_image = "farming_turkish_delight.png", - groups = {flammable = 3}, + groups = {flammable = 3, compostability = 85}, on_use = minetest.item_eat(2) }) @@ -376,7 +355,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:garlic_bread", { description = S("Garlic Bread"), inventory_image = "farming_garlic_bread.png", - groups = {flammable = 3}, + groups = {flammable = 3, compostability = 65}, on_use = minetest.item_eat(2) }) @@ -392,7 +371,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:donut", { description = S("Donut"), inventory_image = "farming_donut.png", - on_use = minetest.item_eat(4) + on_use = minetest.item_eat(4), + groups = {compostability = 65} }) minetest.register_craft({ @@ -407,7 +387,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:donut_chocolate", { description = S("Chocolate Donut"), inventory_image = "farming_donut_chocolate.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 65} }) minetest.register_craft({ @@ -421,7 +402,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:donut_apple", { description = S("Apple Donut"), inventory_image = "farming_donut_apple.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 65} }) minetest.register_craft({ @@ -437,7 +419,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:porridge", { description = S("Porridge"), inventory_image = "farming_porridge.png", - on_use = minetest.item_eat(6, a.bowl) + on_use = minetest.item_eat(6, a.bowl), + groups = {compostability = 65} }) minetest.register_craft({ @@ -457,15 +440,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:jaffa_cake", { description = S("Jaffa Cake"), inventory_image = "farming_jaffa_cake.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:jaffa_cake 3", recipe = { - {tmp, "group:food_egg", "group:food_sugar"}, + {a.baking_tray, "group:food_egg", "group:food_sugar"}, {a.flour, "group:food_cocoa", "group:food_orange"}, {"group:food_milk", "", ""} }, @@ -482,16 +464,15 @@ minetest.register_craft({ minetest.register_craftitem("farming:apple_pie", { description = S("Apple Pie"), inventory_image = "farming_apple_pie.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 75} }) -tmp = farming.use_utensils and "farming:baking_tray" or "" - minetest.register_craft({ output = "farming:apple_pie", recipe = { {a.flour, "group:food_sugar", "group:food_apple"}, - {"", tmp, ""} + {"", a.baking_tray, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) @@ -501,7 +482,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:cactus_juice", { description = S("Cactus Juice"), inventory_image = "farming_cactus_juice.png", - groups = {vessel = 1, drink = 1}, + groups = {vessel = 1, drink = 1, compostability = 55}, + on_use = function(itemstack, user, pointed_thing) if user then @@ -514,12 +496,10 @@ minetest.register_craftitem("farming:cactus_juice", { end }) -tmp = farming.use_utensils and "farming:juicer" or "" - minetest.register_craft({ output = "farming:cactus_juice", recipe = { - {tmp}, + {a.juicer}, {a.cactus}, {a.drinking_glass} }, @@ -533,15 +513,13 @@ minetest.register_craft({ minetest.register_craftitem("farming:pasta", { description = S("Pasta"), inventory_image = "farming_pasta.png", - groups = {food_pasta = 1} + groups = {compostability = 65, food_pasta = 1} }) -tmp = farming.use_utensils and "farming:mixing_bowl" or "" - minetest.register_craft({ output = "farming:pasta", recipe = { - {a.flour, "group:food_butter", tmp} + {a.flour, "group:food_butter", a.mixing_bowl} }, replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}} }) @@ -549,7 +527,7 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:pasta", recipe = { - {a.flour, "group:food_oil", tmp} + {a.flour, "group:food_oil", a.mixing_bowl} }, replacements = { {"group:food_mixing_bowl", "farming:mixing_bowl"}, @@ -562,7 +540,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:mac_and_cheese", { description = S("Mac & Cheese"), inventory_image = "farming_mac_and_cheese.png", - on_use = minetest.item_eat(6, a.bowl) + on_use = minetest.item_eat(6, a.bowl), + groups = {compostability = 65} }) minetest.register_craft({ @@ -577,15 +556,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:spaghetti", { description = S("Spaghetti"), inventory_image = "farming_spaghetti.png", - on_use = minetest.item_eat(8) + on_use = minetest.item_eat(8), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:saucepan" or "" - minetest.register_craft({ output = "farming:spaghetti", recipe = { - {"group:food_pasta", "group:food_tomato", tmp}, + {"group:food_pasta", "group:food_tomato", a.saucepan}, {"group:food_garlic_clove", "group:food_garlic_clove", ""} }, replacements = {{"group:food_saucepan", "farming:saucepan"}} @@ -596,15 +574,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:bibimbap", { description = S("Bibimbap"), inventory_image = "farming_bibimbap.png", - on_use = minetest.item_eat(8, a.bowl) + on_use = minetest.item_eat(8, a.bowl), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:skillet" or "" - minetest.register_craft({ output = "farming:bibimbap", recipe = { - {tmp, "group:food_bowl", "group:food_egg"}, + {a.skillet, "group:food_bowl", "group:food_egg"}, {"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"}, {"group:food_carrot", "group:food_chili_pepper", ""} }, @@ -615,7 +592,7 @@ minetest.register_craft({ output = "farming:bibimbap", type = "shapeless", recipe = { - tmp, "group:food_bowl", "group:food_mushroom", + a.skillet, "group:food_bowl", "group:food_mushroom", "group:food_rice", "group:food_cabbage", "group:food_carrot", "group:food_mushroom", "group:food_chili_pepper" }, @@ -628,6 +605,7 @@ minetest.register_craftitem("farming:burger", { description = S("Burger"), inventory_image = "farming_burger.png", on_use = minetest.item_eat(16), + groups = {compostability = 95} }) minetest.register_craft({ @@ -644,7 +622,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:salad", { description = S("Salad"), inventory_image = "farming_salad.png", - on_use = minetest.item_eat(8, a.bowl) + on_use = minetest.item_eat(8, a.bowl), + groups = {compostability = 45} }) minetest.register_craft({ @@ -662,7 +641,7 @@ minetest.register_craftitem("farming:smoothie_berry", { description = S("Triple Berry Smoothie"), inventory_image = "farming_berry_smoothie.png", on_use = minetest.item_eat(6, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1} + groups = {vessel = 1, drink = 1, compostability = 65} }) minetest.register_craft({ @@ -681,17 +660,15 @@ minetest.register_craftitem("farming:spanish_potatoes", { description = S("Spanish Potatoes"), inventory_image = "farming_spanish_potatoes.png", on_use = minetest.item_eat(8, a.bowl), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:skillet" or "" - minetest.register_craft({ - type = "shapeless", output = "farming:spanish_potatoes", recipe = { - "group:food_potato", "group:food_parsley", "group:food_potato", - "group:food_egg", a.flour, "group:food_onion", - "farming:garlic_clove", "group:food_bowl", tmp + {"group:food_potato", "group:food_parsley", "group:food_potato"}, + {"group:food_egg", a.flour, "group:food_onion"}, + {"farming:garlic_clove", "group:food_bowl", a.skillet} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -701,16 +678,15 @@ minetest.register_craft({ minetest.register_craftitem("farming:potato_omelet", { description = S("Potato omelet"), inventory_image = "farming_potato_omelet.png", - on_use = minetest.item_eat(6, a.bowl) + on_use = minetest.item_eat(6, a.bowl), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:skillet" or "" - minetest.register_craft({ output = "farming:potato_omelet", recipe = { {"group:food_egg", "group:food_potato", "group:food_onion"}, - {tmp, "group:food_bowl", ""} + {a.skillet, "group:food_bowl", ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -720,17 +696,16 @@ minetest.register_craft({ minetest.register_craftitem("farming:paella", { description = S("Paella"), inventory_image = "farming_paella.png", - on_use = minetest.item_eat(8, a.bowl) + on_use = minetest.item_eat(8, a.bowl), + groups = {compostability = 65} }) -tmp = farming.use_utensils and "farming:skillet" or "" - minetest.register_craft({ output = "farming:paella", recipe = { {"group:food_rice", a.dye_orange, "farming:pepper_red"}, {"group:food_peas", "group:food_chicken", "group:food_bowl"}, - {"", tmp, ""} + {"", a.skillet, ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -740,7 +715,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:flan", { description = S("Vanilla Flan"), inventory_image = "farming_vanilla_flan.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 65} }) minetest.register_craft({ @@ -763,17 +739,15 @@ minetest.register_craftitem("farming:cheese_vegan", { description = S("Vegan Cheese"), inventory_image = "farming_cheese_vegan.png", on_use = minetest.item_eat(2), - groups = {food_cheese = 1, flammable = 2} + groups = {compostability = 65, food_cheese = 1, flammable = 2} }) -tmp = farming.use_utensils and "farming:pot" or "" - minetest.register_craft({ output = "farming:cheese_vegan", recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"}, - {"group:food_gelatin", tmp, ""} + {"group:food_gelatin", a.pot, ""} }, replacements = { {"farming:soy_milk", a.drinking_glass .. " 3"}, @@ -787,7 +761,7 @@ minetest.register_craft({ recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"group:food_salt", "group:food_peppercorn", "group:food_lemon"}, - {"group:food_gelatin", tmp, ""} + {"group:food_gelatin", a.pot, ""} }, replacements = { {"farming:soy_milk", a.drinking_glass .. " 3"}, @@ -801,7 +775,7 @@ minetest.register_craftitem("farming:onigiri", { description = S("Onigiri"), inventory_image = "farming_onigiri.png", on_use = minetest.item_eat(2), - groups = {flammable = 2} + groups = {flammable = 2, compostability = 65} }) minetest.register_craft({ @@ -818,17 +792,15 @@ minetest.register_craftitem("farming:gyoza", { description = S("Gyoza"), inventory_image = "farming_gyoza.png", on_use = minetest.item_eat(4), - groups = {flammable = 2} + groups = {flammable = 2, compostability = 65} }) -tmp = farming.use_utensils and "farming:skillet" or "" - minetest.register_craft({ output = "farming:gyoza 4", recipe = { {"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"}, {"group:food_meat_raw", "group:food_salt", a.flour}, - {"", tmp, ""} + {"", a.skillet, ""} }, replacements = { @@ -842,15 +814,13 @@ minetest.register_craftitem("farming:mochi", { description = S("Mochi"), inventory_image = "farming_mochi.png", on_use = minetest.item_eat(3), - groups = {flammable = 2} + groups = {flammable = 2, compostability = 65} }) -tmp = farming.use_utensils and "farming:mortar_pestle" or "" - minetest.register_craft({ output = "farming:mochi", recipe = { - {"", tmp, ""}, + {"", a.mortar_pestle, ""}, {"group:food_rice", "group:food_sugar", "group:food_rice"}, {"", "farming:glass_water", ""} }, @@ -865,7 +835,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:gingerbread_man", { description = S("Gingerbread Man"), inventory_image = "farming_gingerbread_man.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {compostability = 85} }) minetest.register_craft({ diff --git a/grass.lua b/grass.lua index 86e7ac5..21c424c 100644 --- a/grass.lua +++ b/grass.lua @@ -1,46 +1,67 @@ -for i = 4, 5 do +-- Override grasses to drop seeds - -- Override default grass and have it drop Wheat and Oat Seeds +if minetest.registered_nodes["default:grass_1"] then - minetest.override_item("default:grass_" .. i, { - drop = { - max_items = 1, - items = { - {items = {"farming:seed_wheat"}, rarity = 5}, - {items = {"farming:seed_oat"},rarity = 5}, - {items = {"default:grass_1"}} + for i = 4, 5 do + + minetest.override_item("default:grass_" .. i, { + drop = { + max_items = 1, + items = { + {items = {"farming:seed_wheat"}, rarity = 5}, + {items = {"farming:seed_oat"},rarity = 5}, + {items = {"default:grass_1"}} + } } - } - }) + }) + end +end - -- Override default dry grass and have it drop Barley and Rye Seeds +if minetest.registered_nodes["default:dry_grass_1"] then - if minetest.registered_nodes["default:dry_grass_1"] then + for i = 4, 5 do minetest.override_item("default:dry_grass_" .. i, { drop = { max_items = 1, items = { {items = {"farming:seed_barley"}, rarity = 5}, - {items = {"farming:seed_rye"},rarity = 5}, + {items = {"farming:seed_rye"}, rarity = 5}, {items = {"default:dry_grass_1"}} } } }) end - end --- Override default Jungle Grass and have it drop Cotton and Rice Seeds +if minetest.registered_nodes["default:junglegrass"] then -minetest.override_item("default:junglegrass", { - drop = { - max_items = 1, - items = { - {items = {"farming:seed_cotton"}, rarity = 8}, - {items = {"farming:seed_rice"},rarity = 8}, - {items = {"default:junglegrass"}} + minetest.override_item("default:junglegrass", { + drop = { + max_items = 1, + items = { + {items = {"farming:seed_cotton"}, rarity = 8}, + {items = {"farming:seed_rice"}, rarity = 8}, + {items = {"default:junglegrass"}} + } } - } -}) + }) +end + +if farming.mcl then + + minetest.override_item("mcl_flowers:tallgrass", { + drop = { + max_items = 1, + items = { + {items = {"mcl_farming:wheat_seeds"}, rarity = 5}, + {items = {"farming:seed_oat"},rarity = 5}, + {items = {"farming:seed_barley"}, rarity = 5}, + {items = {"farming:seed_rye"},rarity = 5}, + {items = {"farming:seed_cotton"}, rarity = 8}, + {items = {"farming:seed_rice"},rarity = 8} + } + } + }) +end diff --git a/init.lua b/init.lua index 14744bc..6e67f89 100644 --- a/init.lua +++ b/init.lua @@ -582,9 +582,11 @@ farming.register_plant = function(name, def) for i = 1, def.steps do local base_rarity = 1 + if def.steps ~= 1 then base_rarity = 8 - (i - 1) * 7 / (def.steps - 1) end + local drop = { items = { {items = {mname .. ":" .. pname}, rarity = base_rarity}, @@ -596,7 +598,7 @@ farming.register_plant = function(name, def) local sel = farming.select local g = { - snappy = 3, flammable = 2, plant = 1, growing = 1, + handy = 1, snappy = 3, flammable = 2, plant = 1, growing = 1, attached_node = 1, not_in_creative_inventory = 1, } @@ -692,7 +694,7 @@ farming.rice = true -- Load new global settings if found inside mod folder -local input = io.open(farming.path.."/farming.conf", "r") +local input = io.open(farming.path .. "/farming.conf", "r") if input then dofile(farming.path .. "/farming.conf") input:close() @@ -700,24 +702,22 @@ end -- load new world-specific settings if found inside world folder local worldpath = minetest.get_worldpath() -input = io.open(worldpath.."/farming.conf", "r") +input = io.open(worldpath .. "/farming.conf", "r") if input then dofile(worldpath .. "/farming.conf") input:close() end +-- recipe items +dofile(farming.path .. "/items.lua") -- important items if farming.mtg then - dofile(farming.path.."/soil.lua") - dofile(farming.path.."/hoes.lua") - dofile(farming.path.."/grass.lua") -end - -if farming.mcl then - dofile(farming.path.."/mcl_grass.lua") + dofile(farming.path .. "/soil.lua") + dofile(farming.path .. "/hoes.lua") end +dofile(farming.path.."/grass.lua") dofile(farming.path.."/utensils.lua") -- default crops diff --git a/items.lua b/items.lua new file mode 100644 index 0000000..390eead --- /dev/null +++ b/items.lua @@ -0,0 +1,99 @@ + +-- add group function +local function add_groups(item, groups) + + local def = minetest.registered_items[item] + + if not def then return end + + local grp = def.groups + + for k, v in pairs(groups) do + grp[k] = v + end + + minetest.override_item(item, {groups = grp}) +end + +-- default recipe items +farming.recipe_items = { + + -- if utensils are disabled then use blank item + saucepan = farming.use_utensils and "farming:saucepan" or "", + pot = farming.use_utensils and "farming:pot" or "", + baking_tray = farming.use_utensils and "farming:baking_tray" or "", + skillet = farming.use_utensils and "farming:skillet" or "", + mortar_pestle = farming.use_utensils and "farming:mortar_pestle" or "", + cutting_board = farming.use_utensils and "farming:cutting_board" or "", + juicer = farming.use_utensils and "farming:juicer" or "", + mixing_bowl = farming.use_utensils and "farming:mixing_bowl" or "", + + water_source = "default:water_source", + river_water_source = "default:river_water_source", + bucket_empty = "bucket:bucket_empty", + bucket_water = "bucket:bucket_water", + bucket_river_water = "bucket:bucket_river_water", + drinking_glass = "vessels:drinking_glass", + glass_bottle = "vessels:glass_bottle", + sugar = "farming:sugar", + rose = "flowers:rose", + dye_red = "dye:red", + dye_pink = "dye:pink", + dye_orange = "dye:orange", + dye_green = "dye:green", + dye_brown = "dye:brown", + dye_blue = "dye:blue", + dye_violet = "dye:violet", + dye_yellow = "dye:yellow", + bowl = "farming:bowl", + flour = "group:food_flour", + bread = "farming:bread", + cactus = "default:cactus", + paper = "default:paper", + snow = "default:snow", +} + +-- change recipe items to mineclone variations +if farming.mcl then + + local a = farming.recipe_items + + a.water_source = "mcl_core:water_source" + a.river_water_source = "mclx_core:river_water_source" + a.bucket_empty = "mcl_buckets:bucket_empty" + a.bucket_water = "mcl_buckets:bucket_water" + a.bucket_river_water = "mcl_buckets:bucket_river_water" + a.drinking_glass = "mcl_potions:glass_bottle" + a.glass_bottle = "mcl_potions:glass_bottle" + a.sugar = "mcl_core:sugar" + a.rose = "mcl_flowers:rose_bush" + a.dye_red = "mcl_dye:red" + a.dye_pink = "mcl_dye:pink" + a.dye_orange = "mcl_dye:orange" + a.dye_green = "mcl_dye:green" + a.dye_brown = "mcl_dye:brown" + a.dye_blue = "mcl_dye:blue" + a.dye_violet = "mcl_dye:violet" + a.dye_yellow = "mcl_dye:yellow" + a.bowl = "mcl_core:bowl" + a.flour = "mcl_farming:bread" + a.bread = "mcl_farming:bread" + a.cactus = "mcl_core:cactus" + a.paper = "mcl_core:paper" + a.snow = "mcl_throwing:snowball" + + 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_cocoas:cocoa_beans", {food_cocoa = 1}) + add_groups("mcl_core:apple", {food_apple = 1}) + add_groups("mcl_core:bowl", {food_bowl = 1}) + add_groups("mcl_mobitems:chicken", {food_chicken_raw = 1}) + add_groups("mcl_mobitems:cooked_chicken", {food_chicken = 1}) + add_groups("mcl_mushrooms:mushroom_brown", {food_mushroom = 1}) + add_groups("mcl_farming:carrot_item", {food_carrot = 1}) + add_groups("mcl_mobitems:cooked_beef", {food_meat = 1}) + add_groups("mcl_mobitems:beef", {food_meat_raw = 1}) + add_groups("mcl_farming:potato_item", {food_potato = 1}) + add_groups("mcl_farming:bread", {food_bread = 1}) +end diff --git a/locale/farming.es.tr b/locale/farming.es.tr index 9d92ef7..e3d989a 100644 --- a/locale/farming.es.tr +++ b/locale/farming.es.tr @@ -1,176 +1,177 @@ # textdomain: farming -Artichoke= -Asparagus= -Barley Seed=Semilla de cebada -Barley=Cebada -Green Beans=Frijoles verdes -Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles) -Beetroot=Remolacha -Beetroot Soup=Sopa de remolacha -Blackberries= -Wild Blueberries=Arándanos silvestres -Blueberry Muffin=Muffin de arándanos -Blueberry Pie=Pastel de arándanos -Cabbage=Repollo -Carrot=Zanahoria -Carrot Juice=Jugo de zanahoria -Golden Carrot=Zanahoria dorada -Chili Pepper=Ají picante -Bowl of Chili=Tazón de chili -Chili Powder= -Raw Cocoa Beans= -Cocoa Beans=Granos de cacao -Cookie=Galleta -Bar of Dark Chocolate=Barra de chocolate negro -Chocolate Block=Bloque de chocolate -Coffee Beans=Granos de café -Cup of Coffee=Taza de café Banana=Banana -Banana Leaves=Hojas de banana +Banana Leaves=Hojas de Banana Orange=Naranja -Corn=Maíz -Corn on the Cob=Mazorca de maíz -Popcorn= -Cornstarch=Almidón de maíz -Bottle of Ethanol=Botella de etanol -Wild Cotton=Algodón salvaje -Cotton Seed=Semilla de algodón +Artichoke=Alcachofa +Asparagus=Esparragos +Barley Seed=Semillas de Cebada +Barley=Cebada +Green Beans=Frijoles +Bean Pole (place on soil before planting beans)=Varas para frijoles (colocar antes de plantar frijoles) +Beetroot=Remolacha +Beetroot Soup=Sopa de Remolacha +Blackberries=Zarzamoras +Wild Blueberries=Arándanos +Blueberry Muffin=Bizcocho de Arándanos +Blueberry Pie=Pastel de Arándanos +Cabbage=Coliflor +Carrot=Zanahoria +Carrot Juice=Zumo de Zanahoria +Golden Carrot=Zanahoria Dorada +Chili Pepper=Guindilla +Bowl of Chili=Tazón de chile +Chili Powder=Chile en polvo +Raw Cocoa Beans=Granos de Cacao Verde +Cocoa Beans=Granos de Cacao +Cookie=Galleta +Bar of Dark Chocolate=Barra de Chocolate amargo +Chocolate Block=Bloque de Chocolate +Coffee Beans=Granos de Café +Cup of Coffee=Taza de Café +Corn=Mazorca de Maiz +Corn on the Cob=Mazorca Frita +Popcorn=Palomitas +Cornstarch=Maicena +Bottle of Ethanol=Botella de Etanol +Wild Cotton=Algodón silvestre +Cotton Seed=Semillas de Algodón Cotton=Algodón -String=Guita +String=Cuerda Cucumber=Pepino -Eggplant= -Glass of Water= -Sugar=Azúcar -Sugar Cube= -Caramel= -Salt=Sal -Mayonnaise= -Rose Water=Agua de rosa -Turkish Delight=Delicia turca -Garlic Bread=Pan de ajo -Donut=Dona -Chocolate Donut=Dona de chocolate -Apple Donut=Dona de manzana -Porridge=Papilla -Jaffa Cake=Pastel de jaffa -Apple Pie=Pastel de manzana -Cactus Juice=Jugo de cactus -Pasta=Pasta -Mac & Cheese= -Spaghetti=Espaguetis -Bibimbap= -Burger= -Salad= -Triple Berry Smoothie= -Spanish Potatoes= -Potato omelet= -Paella= -Vanilla Flan= -Vegan Cheese= -Onigiri= -Gyoza= -Mochi= -Gingerbread Man= -Garlic clove=Diente de ajo +Eggplant=Berenjena +Garlic clove=Diente de Ajo Garlic=Ajo -Garlic Braid=Trenza de ajo -Ginger= +Garlic Braid=Ristra de Ajos +Ginger=Jengibre Grapes=Uvas -Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas) -Hemp Seed=Semilla de cáñamo -Hemp Leaf=Hoja de cáñamo -Bottle of Hemp Oil=Botella de aceite de cáñamo -Hemp Fibre=Fibra de cáñamo -Hemp Block=Bloque de cáñamo -Hemp Rope=Cuerda de cáñamo -Hoe=Azadón -Wooden Hoe=Azadón de madera -Stone Hoe=Azadón de piedra -Steel Hoe=Azadón de acero -Bronze Hoe=Azadón de bronze -Mese Hoe=Azadón de mese -Diamond Hoe=Azadón de diamante -Wood Hoe= -Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar) -Mithril Scythe (Use to harvest and replant crops)= -Seed=Semilla -Lettuce= -Melon Slice=Rebanada de sandía -Melon=Sandía -Mint Seeds=Semilla de menta -Mint Leaf=Hoja de menta -Mint Tea=Té de menta +Trellis (place on soil before planting grapes)=Emparrado (colocar antes de sembrar uvas) +Hemp Seed=Semillas de Cáñamo +Hemp Leaf=Hoja de Cáñamo +Bottle of Hemp Oil=Aceite de Cáñamo +Hemp Fibre=Fibra de Cáñamo +Hemp Block=Bloque de Cáñamo +Hemp Rope=Cuerda de Cáñamo +Lettuce=Lechuga +Melon Slice=Rodaja de Sandia +Melon=Sandia +Mint Seeds=Semillas de Menta +Mint Leaf=Hoja de Menta +Mint Tea=Té de Menta Onion=Cebolla -Onion Soup=Sopa de cebolla -Parsley= -Pea Pod=Vaina de guisantes -Pea Soup=Sopa de guisantes -Peppercorn=Grano de pimienta -Green Pepper= -Yellow Pepper= -Red Pepper= -Ground Pepper=Pimienta molida -Pineapple Top=Tapa de piña +Onion Soup=Sopa de Cebolla +Parsley=Perejil +Pea Pod=Vaina de Guisantes +Pea Soup=Sopa de Guisantes +Peppercorn=Pimienta en Grano +Green Pepper=Pimiento Verde +Yellow Pepper=Pimiento Amarillo +Red Pepper=Pimiento Rojo +Ground Pepper=Pimienta Molida +Pineapple Top=Semilla de Piña Pineapple=Piña -Pineapple Ring=Anillo de piña -Pineapple Juice=Jugo de piña +Pineapple Ring=Rodaja de Piña +Pineapple Juice=Zumito de Piña Potato=Patata -Baked Potato=Patata al horno -Cucumber and Potato Salad=Ensalada de pepino y patata -Pumpkin Slice=Pedazo de calabaza -Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar) -Scarecrow Bottom=Espantapájaros abajo -Pumpkin Bread=Pan de calabaza -Pumpkin Dough=Masa de calabaza +Baked Potato=Papa Asada +Cucumber and Potato Salad=Ensalada de Pepino y Patatas +Pumpkin Slice=Trozo de Calabaza +Jack 'O Lantern (punch to turn on and off)=Linterna Calabaza (golpear para encender o apagar) +Scarecrow Bottom=Cuerpo de Espantapájaros +Pumpkin Bread=Pan de Calabaza +Pumpkin Dough=Pasta de Calabaza Pumpkin=Calabaza -Raspberries=Frambuesa -Raspberry Smoothie=Batido de frambuesa +Raspberries=Frambuesas +Raspberry Smoothie=Crema de Frambuesas Rhubarb=Ruibarbo -Rhubarb Pie=Pastel de ruibarbo -Rice Seed= +Rhubarb Pie=Bizcocho de Ruibarbo +Rice Seed=Granos de Arroz Rice=Arroz -Rice Bread=Pan de arroz -Rice Flour=Harina de arroz -Rye seed=Semilla de centeno +Rice Bread=Pan de Arroz +Rice Flour=Harina de Arroz +Rye seed=Semillas de Centeno Rye=Centeno -Oat seed=Semilla de avena +Oat seed=Semillas de Avena Oats=Avena -Multigrain Flour=Harina multigrano -Multigrain Bread=Pan multicereales -Savanna Soil=Suelo de sabana -Wet Savanna Soil=Suelo humedo de savana -Soil=Suelo -Wet Soil=Suelo mojado -Soy Pod= -Soy Sauce= -Soy Milk= -Tofu= -Cooked Tofu= -Spinach= +Multigrain Flour=Harina Multigrano +Multigrain Bread=Pan Multigrano +Soy Pod=Vaina de Soja +Soy Sauce=Aceite de Soja +Soy Milk=Leche de Soja +Tofu=Tofu +Cooked Tofu=Tofu Cocinado +Spinach=Espinacas Strawberry=Fresa -Sunflower= -Sunflower Seeds= -Toasted Sunflower Seeds= -Bottle of Sunflower Oil= -Sunflower Seed Bread= +Sunflower=Girasol +Sunflower Seeds=Semillas de Girasol +Toasted Sunflower Seeds=Pipas de Girasol +Bottle of Sunflower Oil=Aceite de Girasol +Sunflower Seed Bread=Pan con Pipas Tomato=Tomate -Tomato Soup= -Wooden Bowl=Cuenco de madera -Saucepan=Cacerola -Cooking Pot=Olla -Baking Tray=Bandeja de hornear -Skillet=Sarten -Mortar and Pestle=Mortero y maja -Cutting Board=Tabla de cortar -Juicer=Exprimidor -Glass Mixing Bowl=Tazón de vidrio para mezclar -Vanilla= -Vanilla Extract= -Wheat Seed=Semilla de trigo +Tomato Soup=Sopa de Tomate +Vanilla=Vainilla +Vanilla Extract=Extracto de Vainilla +Wheat Seed=Semillas de Trigo Wheat=Trigo -Straw=Paja +Straw=Heno Flour=Harina Bread=Pan -Sliced Bread=Pan rebanado -Toast=Tostadas -Toast Sandwich=Emparedado de tostadas +Sliced Bread=Rebanada de Pan +Toast=Tostada +Toast Sandwich=Bocadillo de Pan +Glass of Water=Vaso de Agua +Sugar=Azucar +Sugar Cube=Bloque de Azucar +Caramel=Caramelo +Salt=Sal +Salt crystal=Cristal de Sal +Mayonnaise=Mayonesa +Rose Water=Agua de Rosas +Turkish Delight=Delicias Turcas +Garlic Bread=Pan con Ajito +Donut=Rosquilla +Chocolate Donut=Rosquilla de Chocolate +Apple Donut=Rosquilla de Manzana +Porridge=Gachas +Jaffa Cake=Galleta Jaffa +Apple Pie=Pastel de Manzana +Cactus Juice=Zumo de Cactus +Pasta=Pasta +Mac & Cheese=Pasta con queso +Spaghetti=Espaguetis +Bibimbap=Bibimbap +Burger=Hamburguesa +Salad=Ensalada +Triple Berry Smoothie=Helado Multifrutas +Spanish Potatoes=Tortilla Española +Potato omelet=Tortilla de Patatas +Paella=Paella +Vanilla Flan=Flan de Vainilla +Vegan Cheese=Queso Vegano +Onigiri=Onigiri +Gyoza=Empanadilla Japonesa +Mochi=Mochi +Gingerbread Man=Moñequito de Jengibre +Hoe=Azada +Wooden Hoe=Azada de Madera +Stone Hoe=Azada de Piedra +Steel Hoe=Azada de Acero +Bronze Hoe=Azada de Bronce +Mese Hoe=Azada de Mese +Diamond Hoe=Azada de Diamante +Wood Hoe=Azada de Madera +Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba Azada (usar o lanzar a tierra para ararla) +Mithril Scythe (Use to harvest and replant crops)=Guadaña de Mithril +Seed=Semilla +Savanna Soil=Tierra de Cultivo de Sabana +Wet Savanna Soil=Tierra de Cultivo de Sabana Humeda +Soil=Tierra de Cultivo +Wet Soil=Tierra de Cultivo Humeda +Wooden Bowl=Cuenco de Madera +Saucepan=Cazo +Cooking Pot=Olla +Baking Tray=Bandeja para Hornear +Skillet=Sartén +Mortar and Pestle=Mortero +Cutting Board=Tabla de cortar +Juicer=Exprimidor +Glass Mixing Bowl=Bol de Mezcla diff --git a/locale/template.txt b/locale/template.txt index 746a41e..d5fa9b6 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,4 +1,7 @@ # textdomain: farming +Banana= +Banana Leaves= +Orange= Artichoke= Asparagus= Barley Seed= @@ -25,9 +28,6 @@ Bar of Dark Chocolate= Chocolate Block= Coffee Beans= Cup of Coffee= -Banana= -Banana Leaves= -Orange= Corn= Corn on the Cob= Popcorn= @@ -39,38 +39,6 @@ Cotton= String= Cucumber= Eggplant= -Glass of Water= -Sugar= -Sugar Cube= -Caramel= -Salt= -Mayonnaise= -Rose Water= -Turkish Delight= -Garlic Bread= -Donut= -Chocolate Donut= -Apple Donut= -Porridge= -Jaffa Cake= -Apple Pie= -Cactus Juice= -Pasta= -Mac & Cheese= -Spaghetti= -Bibimbap= -Burger= -Salad= -Triple Berry Smoothie= -Spanish Potatoes= -Potato omelet= -Paella= -Vanilla Flan= -Vegan Cheese= -Onigiri= -Gyoza= -Mochi= -Gingerbread Man= Garlic clove= Garlic= Garlic Braid= @@ -83,17 +51,6 @@ Bottle of Hemp Oil= Hemp Fibre= Hemp Block= Hemp Rope= -Hoe= -Wooden Hoe= -Stone Hoe= -Steel Hoe= -Bronze Hoe= -Mese Hoe= -Diamond Hoe= -Wood Hoe= -Hoe Bomb (use or throw on grassy areas to hoe land)= -Mithril Scythe (Use to harvest and replant crops)= -Seed= Lettuce= Melon Slice= Melon= @@ -137,10 +94,6 @@ Oat seed= Oats= Multigrain Flour= Multigrain Bread= -Savanna Soil= -Wet Savanna Soil= -Soil= -Wet Soil= Soy Pod= Soy Sauce= Soy Milk= @@ -155,15 +108,6 @@ Bottle of Sunflower Oil= Sunflower Seed Bread= Tomato= Tomato Soup= -Wooden Bowl= -Saucepan= -Cooking Pot= -Baking Tray= -Skillet= -Mortar and Pestle= -Cutting Board= -Juicer= -Glass Mixing Bowl= Vanilla= Vanilla Extract= Wheat Seed= @@ -174,3 +118,60 @@ Bread= Sliced Bread= Toast= Toast Sandwich= +Glass of Water= +Sugar= +Sugar Cube= +Caramel= +Salt= +Salt crystal= +Mayonnaise= +Rose Water= +Turkish Delight= +Garlic Bread= +Donut= +Chocolate Donut= +Apple Donut= +Porridge= +Jaffa Cake= +Apple Pie= +Cactus Juice= +Pasta= +Mac & Cheese= +Spaghetti= +Bibimbap= +Burger= +Salad= +Triple Berry Smoothie= +Spanish Potatoes= +Potato omelet= +Paella= +Vanilla Flan= +Vegan Cheese= +Onigiri= +Gyoza= +Mochi= +Gingerbread Man= +Hoe= +Wooden Hoe= +Stone Hoe= +Steel Hoe= +Bronze Hoe= +Mese Hoe= +Diamond Hoe= +Wood Hoe= +Hoe Bomb (use or throw on grassy areas to hoe land)= +Mithril Scythe (Use to harvest and replant crops)= +Seed= +Savanna Soil= +Wet Savanna Soil= +Soil= +Wet Soil= +Wooden Bowl= +Saucepan= +Cooking Pot= +Baking Tray= +Skillet= +Mortar and Pestle= +Cutting Board= +Juicer= +Glass Mixing Bowl= diff --git a/mcl_grass.lua b/mcl_grass.lua deleted file mode 100644 index e80538a..0000000 --- a/mcl_grass.lua +++ /dev/null @@ -1,16 +0,0 @@ - --- Override mcl grass and have it drop Wheat and Oat Seeds - -minetest.override_item("mcl_flowers:tallgrass", { - drop = { - max_items = 1, - items = { - {items = {"mcl_farming:wheat_seeds"}, rarity = 5}, - {items = {"farming:seed_oat"},rarity = 5}, - {items = {"farming:seed_barley"}, rarity = 5}, - {items = {"farming:seed_rye"},rarity = 5}, - {items = {"farming:seed_cotton"}, rarity = 8}, - {items = {"farming:seed_rice"},rarity = 8} - } - } -})