From 02d10c376e593053a6f7dd837b4b48b04e6a3231 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Mon, 2 Dec 2019 10:23:20 +0000 Subject: [PATCH] added seed=2 group to plantable food items --- README.md | 3 ++- crops/beans.lua | 2 +- crops/beetroot.lua | 2 +- crops/blueberry.lua | 3 ++- crops/carrot.lua | 2 +- crops/chili.lua | 2 +- crops/cocoa.lua | 2 +- crops/coffee.lua | 2 +- crops/corn.lua | 2 +- crops/cucumber.lua | 2 +- crops/garlic.lua | 2 +- crops/grapes.lua | 2 +- crops/melon.lua | 2 +- crops/onion.lua | 2 +- crops/peas.lua | 2 +- crops/pepper.lua | 2 +- crops/pineapple.lua | 1 + crops/potato.lua | 2 +- crops/pumpkin.lua | 2 +- crops/raspberry.lua | 3 ++- crops/rhubarb.lua | 2 +- crops/tomato.lua | 2 +- init.lua | 4 ++-- 23 files changed, 27 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index f19550a..128bf76 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.42 - Soil needs water to be present within 3 blocks horizontally and 1 below to make wet soil, Jack 'o Lanterns now check protection, add chocolate block, scythe works on use instead of right-click +- 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items. +- 1.42 - Soil needs water to be present within 3 blocks horizontally and 1 below to make wet soil, Jack 'o Lanterns now check protection, add chocolate block. - 1.41 - Each crop has it's own spawn rate (can be changed in farming.conf) - 1.40 - Added Mithril Scythe to quick harvest and replant crops on right-click. Added Hoe's for MoreOres with Toolrank support. - 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod. Added Jaffa Cake and multigrain bread. diff --git a/crops/beans.lua b/crops/beans.lua index 5017248..c35b2cf 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -72,7 +72,7 @@ end minetest.register_craftitem("farming:beans", { description = S("Green Beans"), inventory_image = "farming_beans.png", - groups = {food_beans = 1, flammable = 2}, + groups = {seed = 2, food_beans = 1, flammable = 2}, on_use = minetest.item_eat(1), on_place = function(itemstack, placer, pointed_thing) diff --git a/crops/beetroot.lua b/crops/beetroot.lua index e1aa58e..0a20d88 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -5,7 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:beetroot", { description = S("Beetroot"), inventory_image = "farming_beetroot.png", - groups = {food_beetroot = 1, flammable = 2}, + groups = {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, diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 0b35343..fec0c12 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -5,7 +5,8 @@ local S = farming.intllib minetest.register_craftitem("farming:blueberries", { description = S("Blueberries"), inventory_image = "farming_blueberries.png", - groups = {food_blueberries = 1, food_blueberry = 1, food_berry = 1, flammable = 2}, + groups = {seed = 2, food_blueberries = 1, food_blueberry = 1, + food_berry = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1") end, diff --git a/crops/carrot.lua b/crops/carrot.lua index ec3ff8b..7df88ac 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -10,7 +10,7 @@ local S = farming.intllib minetest.register_craftitem("farming:carrot", { description = S("Carrot"), inventory_image = "farming_carrot.png", - groups = {food_carrot = 1, flammable = 2}, + groups = {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, diff --git a/crops/chili.lua b/crops/chili.lua index cade3b2..cdcfa7e 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -5,7 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:chili_pepper", { description = S("Chili Pepper"), inventory_image = "farming_chili_pepper.png", - groups = {food_chili_pepper = 1, flammable = 4}, + groups = {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, diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 3f54a89..243814b 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -67,7 +67,7 @@ end minetest.register_craftitem("farming:cocoa_beans", { description = S("Cocoa Beans"), inventory_image = "farming_cocoa_beans.png", - groups = {food_cocoa = 1, flammable = 2}, + groups = {seed = 2, food_cocoa = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") end, diff --git a/crops/coffee.lua b/crops/coffee.lua index 6d2fad8..2e2ed73 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -5,7 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:coffee_beans", { description = S("Coffee Beans"), inventory_image = "farming_coffee_beans.png", - groups = {food_coffee = 1, flammable = 2}, + groups = {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, diff --git a/crops/corn.lua b/crops/corn.lua index 1d3e21a..eef547a 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -10,7 +10,7 @@ local S = farming.intllib minetest.register_craftitem("farming:corn", { description = S("Corn"), inventory_image = "farming_corn.png", - groups = {food_corn = 1, flammable = 2}, + groups = {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, diff --git a/crops/cucumber.lua b/crops/cucumber.lua index b3761bd..8bd679a 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -10,7 +10,7 @@ local S = farming.intllib minetest.register_craftitem("farming:cucumber", { description = S("Cucumber"), inventory_image = "farming_cucumber.png", - groups = {food_cucumber = 1, flammable = 2}, + groups = {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, diff --git a/crops/garlic.lua b/crops/garlic.lua index 83884d0..ee841e5 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -11,7 +11,7 @@ local S = farming.intllib minetest.register_craftitem("farming:garlic_clove", { description = S("Garlic clove"), inventory_image = "crops_garlic_clove.png", - groups = {food_garlic_clove = 1, flammable = 3}, + groups = {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, diff --git a/crops/grapes.lua b/crops/grapes.lua index a41bb88..cc9d8aa 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -68,7 +68,7 @@ minetest.register_craftitem("farming:grapes", { description = S("Grapes"), inventory_image = "farming_grapes.png", on_use = minetest.item_eat(2), - groups = {food_grapes = 1, flammable = 3}, + groups = {seed = 2, food_grapes = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1") diff --git a/crops/melon.lua b/crops/melon.lua index 06056a0..3fda9f6 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -5,7 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:melon_slice", { description = S("Melon Slice"), inventory_image = "farming_melon_slice.png", - groups = {food_melon_slice = 1, flammable = 3}, + groups = {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, diff --git a/crops/onion.lua b/crops/onion.lua index ae36d0d..72a425e 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -11,7 +11,7 @@ local S = farming.intllib minetest.register_craftitem("farming:onion", { description = S("Onion"), inventory_image = "crops_onion.png", - groups = {food_onion = 1, flammable = 3}, + groups = {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, diff --git a/crops/peas.lua b/crops/peas.lua index e12253b..ffe21b3 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -7,7 +7,7 @@ local S = farming.intllib minetest.register_craftitem("farming:pea_pod", { description = S("Pea Pod"), inventory_image = "farming_pea_pod.png", - groups = {food_pea_pod = 1, flammable = 2}, + groups = {seed = 2, food_pea_pod = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pea_1") end diff --git a/crops/pepper.lua b/crops/pepper.lua index 19c7b05..6770888 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -11,7 +11,7 @@ local S = farming.intllib minetest.register_craftitem("farming:peppercorn", { description = S("Peppercorn"), inventory_image = "crops_peppercorn.png", - groups = {food_peppercorn = 1, flammable = 3}, + groups = {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, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 62d8216..5f3e078 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -5,6 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:pineapple_top", { description = S("Pineapple Top"), inventory_image = "farming_pineapple_top.png", + groups = {seed = 2, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1") end, diff --git a/crops/potato.lua b/crops/potato.lua index e81cce6..d9f3e14 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -10,7 +10,7 @@ local S = farming.intllib minetest.register_craftitem("farming:potato", { description = S("Potato"), inventory_image = "farming_potato.png", - groups = {food_potato = 1, flammable = 2}, + groups = {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, diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 508c2b2..1e937db 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -9,7 +9,7 @@ local S = farming.intllib minetest.register_craftitem("farming:pumpkin_slice", { description = S("Pumpkin Slice"), inventory_image = "farming_pumpkin_slice.png", - groups = {food_pumpkin_slice = 1, flammable = 2}, + groups = {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, diff --git a/crops/raspberry.lua b/crops/raspberry.lua index a72137b..8c909e4 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -5,7 +5,8 @@ local S = farming.intllib minetest.register_craftitem("farming:raspberries", { description = S("Raspberries"), inventory_image = "farming_raspberries.png", - groups = {food_raspberries = 1, food_raspberry = 1, food_berry = 1, flammable = 2}, + groups = {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") end, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index fdcd11b..dafb7e7 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -5,7 +5,7 @@ local S = farming.intllib minetest.register_craftitem("farming:rhubarb", { description = S("Rhubarb"), inventory_image = "farming_rhubarb.png", - groups = {food_rhubarb = 1, flammable = 2}, + groups = {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, diff --git a/crops/tomato.lua b/crops/tomato.lua index 573661d..c082328 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -10,7 +10,7 @@ local S = farming.intllib minetest.register_craftitem("farming:tomato", { description = S("Tomato"), inventory_image = "farming_tomato.png", - groups = {food_tomato = 1, flammable = 2}, + groups = {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, diff --git a/init.lua b/init.lua index 0769709..0625f0a 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20190728", + version = "20191202", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -278,7 +278,7 @@ end) -- Just in case a growing type or added node is missed (also catches existing -- nodes added to map before timers were incorporated). minetest.register_abm({ - nodenames = { "group:growing" }, + nodenames = {"group:growing"}, interval = 300, chance = 1, catch_up = false,