From 5ce62f46e7afe1363e6afab299209816020dda59 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 10 Dec 2020 15:35:18 +0000 Subject: [PATCH 1/5] add blackberry and lettuce --- mods.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index ace943f..3a574f7 100644 --- a/mods.lua +++ b/mods.lua @@ -40,7 +40,9 @@ if farming and farming.mod and farming.mod == "redo" then {"farming:oat_", 8}, {"farming:rice_", 8}, {"farming:mint_", 4}, - {"farming:cabbage_", 6} + {"farming:cabbage_", 6}, + {"farming:lettuce_", 5}, + {"farming:blackberry_", 4} }) end From fefe122dc9f5fce90f84922ee1fb7efda86390a2 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Dec 2020 20:05:25 +0000 Subject: [PATCH 2/5] added olive and lemon trees --- mods.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index 3a574f7..7983111 100644 --- a/mods.lua +++ b/mods.lua @@ -67,7 +67,9 @@ if minetest.get_modpath("ethereal") then {"ethereal:orange_tree_sapling", ethereal.grow_orange_tree, "soil"}, {"ethereal:bamboo_sprout", ethereal.grow_bamboo_tree, "soil"}, {"ethereal:birch_sapling", ethereal.grow_birch_tree, "soil"}, - {"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"} + {"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"}, + {"ethereal:lemon_tree_sapling", ethereal.grow_lemon_tree, "soil"}, + {"ethereal:olive_tree_sapling", ethereal.grow_olive_tree, "soil"} }) local grass = {"default:grass_3", "default:grass_4", "default:grass_5", ""} From 1aba553059646e412c5f971aed4bc14e5f94c609 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 09:20:21 +0000 Subject: [PATCH 3/5] amend pepper stages --- mods.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index 7983111..b0528e9 100644 --- a/mods.lua +++ b/mods.lua @@ -32,7 +32,7 @@ if farming and farming.mod and farming.mod == "redo" then {"farming:chili_", 8}, {"farming:garlic_", 5}, {"farming:onion_", 5}, - {"farming:pepper_", 5}, + {"farming:pepper_", 7}, {"farming:pineapple_", 8}, {"farming:pea_", 5}, {"farming:beetroot_", 5}, From 2ec11682920006b0e0ee2db77c1b147d3be91fd8 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 10:36:06 +0000 Subject: [PATCH 4/5] add vanilla and soy --- mods.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index b0528e9..9e3a63c 100644 --- a/mods.lua +++ b/mods.lua @@ -42,7 +42,9 @@ if farming and farming.mod and farming.mod == "redo" then {"farming:mint_", 4}, {"farming:cabbage_", 6}, {"farming:lettuce_", 5}, - {"farming:blackberry_", 4} + {"farming:blackberry_", 4}, + {"farming:vanilla_", 8}, + {"farming:soy_", 7} }) end From 30d0c02d8cc27d9ce601b513ead7094d334b1955 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 18:17:11 +0000 Subject: [PATCH 5/5] only use bonemeal items when actually used. --- init.lua | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/init.lua b/init.lua index 3a611be..6f28922 100644 --- a/init.lua +++ b/init.lua @@ -181,7 +181,7 @@ local function check_sapling(pos, nodename) if can_grow then particle_effect(pos) grow_tree(pos, saplings[n][2]) - return + return true end end end @@ -216,7 +216,7 @@ local function check_crops(pos, nodename, strength) particle_effect(pos) - return + return true end end end @@ -438,13 +438,13 @@ function bonemeal:on_use(pos, strength, node) default.grow_papyrus(pos, node) particle_effect(pos) - return + return true elseif node.name == "default:cactus" then default.grow_cactus(pos, node) particle_effect(pos) - return + return true end -- grow grass and flowers @@ -452,7 +452,7 @@ function bonemeal:on_use(pos, strength, node) or minetest.get_item_group(node.name, "sand") > 0 or minetest.get_item_group(node.name, "can_bonemeal") > 0 then check_soil(pos, node.name, strength) - return + return true end -- light check depending on strength (strength of 4 = no light needed) @@ -464,11 +464,13 @@ function bonemeal:on_use(pos, strength, node) if minetest.get_item_group(node.name, "sapling") > 0 and random(5 - strength) == 1 then check_sapling(pos, node.name) - return + return true end -- check for crop growth - check_crops(pos, node.name, strength) + if check_crops(pos, node.name, strength) then + return true + end end @@ -494,13 +496,14 @@ minetest.register_craftitem("bonemeal:mulch", { return end - -- take item if not in creative - if not bonemeal.is_creative(user:get_player_name()) then - itemstack:take_item() - end - -- call global on_use function with strength of 1 - bonemeal:on_use(pointed_thing.under, 1) + if bonemeal:on_use(pointed_thing.under, 1) then + + -- take item if not in creative + if not bonemeal.is_creative(user:get_player_name()) then + itemstack:take_item() + end + end return itemstack end @@ -524,13 +527,14 @@ minetest.register_craftitem("bonemeal:bonemeal", { return end - -- take item if not in creative - if not bonemeal.is_creative(user:get_player_name()) then - itemstack:take_item() - end - -- call global on_use function with strength of 2 - bonemeal:on_use(pointed_thing.under, 2) + if bonemeal:on_use(pointed_thing.under, 2) then + + -- take item if not in creative + if not bonemeal.is_creative(user:get_player_name()) then + itemstack:take_item() + end + end return itemstack end @@ -554,13 +558,14 @@ minetest.register_craftitem("bonemeal:fertiliser", { return end - -- take item if not in creative - if not bonemeal.is_creative(user:get_player_name()) then - itemstack:take_item() - end - -- call global on_use function with strength of 3 - bonemeal:on_use(pointed_thing.under, 3) + if bonemeal:on_use(pointed_thing.under, 3) then + + -- take item if not in creative + if not bonemeal.is_creative(user:get_player_name()) then + itemstack:take_item() + end + end return itemstack end