From 0e108c4b2ab7bc4a269f273747bf263d61896181 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 9 Dec 2020 10:22:41 +0000 Subject: [PATCH 1/8] add min_light and max_light settings and amend crop registered_plants tables --- README.md | 2 +- crops/barley.lua | 4 ++-- crops/beans.lua | 4 ++-- crops/beetroot.lua | 4 ++-- crops/blueberry.lua | 4 ++-- crops/cabbage.lua | 4 ++-- crops/carrot.lua | 4 ++-- crops/chili.lua | 4 ++-- crops/cocoa.lua | 4 ++-- crops/coffee.lua | 4 ++-- crops/corn.lua | 4 ++-- crops/cotton.lua | 4 ++-- crops/cucumber.lua | 4 ++-- crops/garlic.lua | 4 ++-- crops/grapes.lua | 4 ++-- crops/hemp.lua | 4 ++-- crops/melon.lua | 4 ++-- crops/mint.lua | 4 ++-- crops/onion.lua | 4 ++-- crops/peas.lua | 4 ++-- crops/pepper.lua | 4 ++-- crops/pineapple.lua | 4 ++-- crops/potato.lua | 4 ++-- crops/pumpkin.lua | 4 ++-- crops/raspberry.lua | 4 ++-- crops/rhubarb.lua | 4 ++-- crops/tomato.lua | 4 ++-- crops/wheat.lua | 4 ++-- farming.conf_example | 4 ++++ init.lua | 11 ++++++----- 30 files changed, 65 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 353d6f9..7afd0e7 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy +- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy, minmax light setting options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates - 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. diff --git a/crops/barley.lua b/crops/barley.lua index 69b3056..65d1f03 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -108,8 +108,8 @@ minetest.register_node("farming:barley_7", table.copy(def)) farming.registered_plants["farming:barley"] = { crop = "farming:barley", seed = "farming:seed_barley", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 7 } diff --git a/crops/beans.lua b/crops/beans.lua index b469d08..38d8fa9 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -226,8 +226,8 @@ minetest.register_node("farming:beanpole_5", table.copy(def)) farming.registered_plants["farming:beans"] = { crop = "farming:beanpole", seed = "farming:beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/beetroot.lua b/crops/beetroot.lua index f20cfea..ef57986 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -86,7 +86,7 @@ minetest.register_node("farming:beetroot_5", table.copy(def)) farming.registered_plants["farming:beetroot"] = { crop = "farming:beetroot", seed = "farming:beetroot", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 38053ad..e8d83c3 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -88,7 +88,7 @@ minetest.register_node("farming:blueberry_4", table.copy(def)) farming.registered_plants["farming:blueberries"] = { crop = "farming:blueberry", seed = "farming:blueberries", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 4a3c2e2..4e75d63 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -63,7 +63,7 @@ minetest.register_node("farming:cabbage_6", table.copy(def)) farming.registered_plants["farming:cabbage"] = { crop = "farming:cabbage", seed = "farming:cabbage", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 6 } diff --git a/crops/carrot.lua b/crops/carrot.lua index f19338c..8be1f4e 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -118,7 +118,7 @@ minetest.register_node("farming:carrot_8", table.copy(def)) farming.registered_plants["farming:carrot"] = { crop = "farming:carrot", seed = "farming:carrot", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/chili.lua b/crops/chili.lua index 867c945..4334556 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -95,7 +95,7 @@ minetest.register_node("farming:chili_8", table.copy(def)) farming.registered_plants["farming:chili_pepper"] = { crop = "farming:chili", seed = "farming:chili_pepper", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 9e8a404..72e37d0 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -194,8 +194,8 @@ minetest.register_node("farming:cocoa_4", table.copy(def)) farming.registered_plants["farming:cocoa_beans"] = { crop = "farming:cocoa", seed = "farming:cocoa_beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/coffee.lua b/crops/coffee.lua index f234573..f64369c 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -106,7 +106,7 @@ minetest.register_node("farming:coffee_5", table.copy(def)) farming.registered_plants["farming:coffee"] = { crop = "farming:coffee", seed = "farming:coffee_beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/corn.lua b/crops/corn.lua index 4835281..0999fb9 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -153,7 +153,7 @@ minetest.register_node("farming:corn_8", table.copy(def)) farming.registered_plants["farming:corn"] = { crop = "farming:corn", seed = "farming:corn", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/cotton.lua b/crops/cotton.lua index 067b444..6ea2e6f 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -172,8 +172,8 @@ minetest.register_node("farming:cotton_8", table.copy(def)) farming.registered_plants["farming:cotton"] = { crop = "farming:cotton", seed = "farming:seed_cotton", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/cucumber.lua b/crops/cucumber.lua index fc15e47..c5e70de 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -59,7 +59,7 @@ minetest.register_node("farming:cucumber_4", table.copy(def)) farming.registered_plants["farming:cucumber"] = { crop = "farming:cucumber", seed = "farming:cucumber", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/garlic.lua b/crops/garlic.lua index 7fe7565..162bace 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -129,7 +129,7 @@ minetest.register_node("farming:garlic_5", table.copy(def)) farming.registered_plants["farming:garlic"] = { crop = "farming:garlic", seed = "farming:garlic_clove", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/grapes.lua b/crops/grapes.lua index 5d13dc6..8c5e458 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -233,8 +233,8 @@ minetest.register_node("farming:grapes_8", table.copy(def)) farming.registered_plants["farming:grapes"] = { crop = "farming:grapes", seed = "farming:grapes", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/hemp.lua b/crops/hemp.lua index 03ed4d2..f8dfd0b 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -256,7 +256,7 @@ minetest.register_node("farming:hemp_8", table.copy(def)) farming.registered_plants["farming:hemp"] = { crop = "farming:hemp", seed = "farming:seed_hemp", - minlight = 13, - maxlight = 15, + mminlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/melon.lua b/crops/melon.lua index 6495a13..0549dd3 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -88,7 +88,7 @@ minetest.register_node("farming:melon_8", table.copy(def)) farming.registered_plants["farming:melon"] = { crop = "farming:melon", seed = "farming:melon_slice", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/mint.lua b/crops/mint.lua index ae0e670..5bc4021 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -101,7 +101,7 @@ minetest.register_node("farming:mint_4", table.copy(def)) farming.registered_plants["farming:mint"] = { crop = "farming:mint", seed = "farming:seed_mint", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/onion.lua b/crops/onion.lua index 30c9bc3..2a8c63f 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -90,7 +90,7 @@ minetest.register_node("farming:onion_5", table.copy(def)) farming.registered_plants["farming:onion"] = { crop = "farming:onion", seed = "farming:onion", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/peas.lua b/crops/peas.lua index 0c8e40c..7c6a83d 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -91,7 +91,7 @@ minetest.register_node("farming:pea_5", table.copy(def)) farming.registered_plants["farming:pea_pod"] = { crop = "farming:pea", seed = "farming:pea_pod", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/pepper.lua b/crops/pepper.lua index 4d5baf8..848c2ae 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -109,7 +109,7 @@ minetest.register_node("farming:pepper_5", table.copy(def)) farming.registered_plants["farming:pepper"] = { crop = "farming:pepper", seed = "farming:peppercorn", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/crops/pineapple.lua b/crops/pineapple.lua index f57ccf0..839a627 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -135,7 +135,7 @@ minetest.register_node("farming:pineapple_8", table.copy(def)) farming.registered_plants["farming:pineapple"] = { crop = "farming:pineapple", seed = "farming:pineapple_top", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/potato.lua b/crops/potato.lua index 8c087d0..a55ab29 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -106,7 +106,7 @@ minetest.register_node("farming:potato_4", table.copy(def)) farming.registered_plants["farming:potato"] = { crop = "farming:potato", seed = "farming:potato", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 1b0b8c4..5e29c01 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -200,7 +200,7 @@ minetest.register_alias("farming:pumpkin", "farming:pumpkin_8") farming.registered_plants["farming:pumpkin"] = { crop = "farming:pumpkin", seed = "farming:pumpkin_slice", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/raspberry.lua b/crops/raspberry.lua index 0914aa4..df1d3d9 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -74,7 +74,7 @@ minetest.register_node("farming:raspberry_4", table.copy(def)) farming.registered_plants["farming:raspberries"] = { crop = "farming:raspberry", seed = "farming:raspberries", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index bd44a71..073cc18 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -71,7 +71,7 @@ minetest.register_node("farming:rhubarb_3", table.copy(def)) farming.registered_plants["farming:rhubarb"] = { crop = "farming:rhubarb", seed = "farming:rhubarb", - minlight = 13, - maxlight = 15, + minlight = 10, + maxlight = 12, steps = 3 } diff --git a/crops/tomato.lua b/crops/tomato.lua index 7905828..47879b6 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -83,7 +83,7 @@ minetest.register_node("farming:tomato_8", table.copy(def)) farming.registered_plants["farming:tomato"] = { crop = "farming:tomato", seed = "farming:tomato", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/crops/wheat.lua b/crops/wheat.lua index 7a8f19b..e21d7f6 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -234,8 +234,8 @@ minetest.register_node("farming:wheat_8", table.copy(def)) farming.registered_plants["farming:wheat"] = { crop = "farming:wheat", seed = "farming:seed_wheat", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/farming.conf_example b/farming.conf_example index 68a7bcb..e5837b2 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -35,3 +35,7 @@ farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) farming.rarety = 0.002 + +-- default minimum and maximum light levels crops need to grow +farming.min_light = 12 +farming.max_light = 15 diff --git a/init.lua b/init.lua index fd2aa21..04ee74f 100644 --- a/init.lua +++ b/init.lua @@ -7,13 +7,15 @@ farming = { mod = "redo", - version = "20200702", + version = "20201209", path = minetest.get_modpath("farming"), select = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} }, - registered_plants = {} + registered_plants = {}, + min_light = 12, + max_light = 15 } @@ -332,9 +334,8 @@ function farming.plant_growth_timer(pos, elapsed, node_name) return true end - local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or 12 - local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or 15 - --print ("---", MIN_LIGHT, MAX_LIGHT) + local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or farming.min_light + local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or farming.max_light if max_growth == 1 or lambda < 2.0 then From 45b5a073e0e24dba064e99e85635be11795a9934 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 10 Dec 2020 15:37:44 +0000 Subject: [PATCH 2/8] Add lettuce and blackberries with recipes (thanks OgelGames) --- README.md | 3 +- crops/blackberry.lua | 62 ++++++++++++++++++++++++++ crops/lettuce.lua | 63 +++++++++++++++++++++++++++ farming.conf_example | 2 + food.lua | 65 ++++++++++++++++++++++++++++ init.lua | 6 ++- mapgen.lua | 2 + textures/farming_berry_smoothie.png | Bin 0 -> 215 bytes textures/farming_blackberry.png | Bin 0 -> 223 bytes textures/farming_blackberry_1.png | Bin 0 -> 121 bytes textures/farming_blackberry_2.png | Bin 0 -> 337 bytes textures/farming_blackberry_3.png | Bin 0 -> 324 bytes textures/farming_blackberry_4.png | Bin 0 -> 344 bytes textures/farming_burger.png | Bin 0 -> 480 bytes textures/farming_lettuce.png | Bin 0 -> 539 bytes textures/farming_lettuce_1.png | Bin 0 -> 110 bytes textures/farming_lettuce_2.png | Bin 0 -> 152 bytes textures/farming_lettuce_3.png | Bin 0 -> 186 bytes textures/farming_lettuce_4.png | Bin 0 -> 220 bytes textures/farming_lettuce_5.png | Bin 0 -> 248 bytes textures/farming_salad.png | Bin 0 -> 204 bytes 21 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 crops/blackberry.lua create mode 100644 crops/lettuce.lua create mode 100644 textures/farming_berry_smoothie.png create mode 100644 textures/farming_blackberry.png create mode 100644 textures/farming_blackberry_1.png create mode 100644 textures/farming_blackberry_2.png create mode 100644 textures/farming_blackberry_3.png create mode 100644 textures/farming_blackberry_4.png create mode 100644 textures/farming_burger.png create mode 100644 textures/farming_lettuce.png create mode 100644 textures/farming_lettuce_1.png create mode 100644 textures/farming_lettuce_2.png create mode 100644 textures/farming_lettuce_3.png create mode 100644 textures/farming_lettuce_4.png create mode 100644 textures/farming_lettuce_5.png create mode 100644 textures/farming_salad.png diff --git a/README.md b/README.md index 7afd0e7..622e2fc 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.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy, minmax light setting +- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames) +- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates - 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. diff --git a/crops/blackberry.lua b/crops/blackberry.lua new file mode 100644 index 0000000..f3de7ed --- /dev/null +++ b/crops/blackberry.lua @@ -0,0 +1,62 @@ + +local S = farming.intllib + +-- blackberries +minetest.register_craftitem("farming:blackberry", { + description = S("Blackberries"), + inventory_image = "farming_blackberry.png", + groups = {seed = 2, food_blackberries = 1, food_blackberry = 1, + food_berry = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:blackberry_1") + end, + on_use = minetest.item_eat(1), +}) + +local def = { + drawtype = "plantlike", + tiles = {"farming_blackberry_1.png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- stage 1 +minetest.register_node("farming:blackberry_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_blackberry_2.png"} +minetest.register_node("farming:blackberry_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_blackberry_3.png"} +minetest.register_node("farming:blackberry_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_blackberry_4.png"} +def.groups.growing = 0 +def.drop = { + items = { + {items = {'farming:blackberry 2'}, rarity = 1}, + {items = {'farming:blackberry'}, rarity = 2}, + {items = {'farming:blackberry'}, rarity = 3}, + } +} +minetest.register_node("farming:blackberry_4", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:blackberry"] = { + crop = "farming:blackberry", + seed = "farming:blackberry", + minlight = farming.min_light, + maxlight = farming.max_light, + steps = 4 +} diff --git a/crops/lettuce.lua b/crops/lettuce.lua new file mode 100644 index 0000000..080ad9c --- /dev/null +++ b/crops/lettuce.lua @@ -0,0 +1,63 @@ +local S = farming.intllib + +-- lettuce +minetest.register_craftitem("farming:lettuce", { + description = S("Lettuce"), + inventory_image = "farming_lettuce.png", + groups = {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, + on_use = minetest.item_eat(2), +}) + +local def = { + drawtype = "plantlike", + tiles = {"farming_lettuce_1.png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- stage 1 +minetest.register_node("farming:lettuce_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_lettuce_2.png"} +minetest.register_node("farming:lettuce_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_lettuce_3.png"} +minetest.register_node("farming:lettuce_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_lettuce_4.png"} +minetest.register_node("farming:lettuce_4", table.copy(def)) + +-- stage 5 +def.tiles = {"farming_lettuce_5.png"} +def.groups.growing = 0 +def.drop = { + items = { + {items = {'farming:lettuce 2'}, rarity = 1}, + {items = {'farming:lettuce 2'}, rarity = 2}, + } +} +minetest.register_node("farming:lettuce_5", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:lettuce"] = { + crop = "farming:lettuce", + seed = "farming:lettuce", + minlight = farming.min_light, + maxlight = farming.max_light, + steps = 5 +} diff --git a/farming.conf_example b/farming.conf_example index e5837b2..88331af 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -31,6 +31,8 @@ farming.peas = 0.001 farming.beetroot = 0.001 farming.mint = 0.005 farming.cabbage = 0.001 +farming.blackberry = 0.002 +farming.lettuce = 0.001 farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) diff --git a/food.lua b/food.lua index edf8045..b395448 100644 --- a/food.lua +++ b/food.lua @@ -373,3 +373,68 @@ minetest.register_craft({ replacements = {{"group:food_skillet", "farming:skillet"}} }) end + +-- Burger + +minetest.register_craftitem("farming:burger", { + description = S("Burger"), + inventory_image = "farming_burger.png", + on_use = minetest.item_eat(16), +}) + +if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then +minetest.register_craft({ + type = "shapeless", + output = "farming:burger", + recipe = { + "farming:bread", "group:food_meat", "group:food_cheese", + "group:food_tomato", "group:food_cucumber", "group:food_onion", + "group:food_lettuce" + } +}) +else +minetest.register_craft({ + type = "shapeless", + output = "farming:burger", + recipe = { + "farming:bread", "group:food_mushroom", "group:food_tomato", + "group:food_cucumber", "group:food_onion", "group:food_lettuce" + } +}) +end + +-- Salad + +minetest.register_craftitem("farming:salad", { + description = S("Salad"), + inventory_image = "farming_salad.png", + on_use = minetest.item_eat(8, "farming:bowl") +}) + +minetest.register_craft({ + output = "farming:salad", + type = "shapeless", + recipe = { + "group:food_bowl", "group:food_tomato", "group:food_cucumber", + "group:food_lettuce", "group:food_oil" + }, +}) + +-- Triple Berry Smoothie + +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} +}) + +minetest.register_craft({ + output = "farming:smoothie_berry", + type = "shapeless", + recipe = { + "group:food_raspberries", "group:food_blackberries", + "group:food_strawberry", "group:food_banana", + "vessels:drinking_glass" + } +}) diff --git a/init.lua b/init.lua index 04ee74f..98002ad 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20201209", + version = "20201210", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -629,6 +629,8 @@ farming.peas = 0.001 farming.beetroot = 0.001 farming.mint = 0.005 farming.cabbage = 0.001 +farming.blackberry = 0.002 +farming.lettuce = 0.001 farming.grains = true farming.rarety = 0.002 @@ -695,6 +697,8 @@ ddoo("chili.lua", farming.chili) ddoo("ryeoatrice.lua", farming.grains) ddoo("mint.lua", farming.mint) ddoo("cabbage.lua", farming.cabbage) +ddoo("blackberry.lua", farming.blackberry) +ddoo("lettuce.lua", farming.lettuce) dofile(farming.path .. "/food.lua") dofile(farming.path .. "/mapgen.lua") diff --git a/mapgen.lua b/mapgen.lua index ca7048d..e7c8118 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -50,6 +50,8 @@ register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot) register_plant("mint_4", 1, 75, {"default:dirt_with_grass", "default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint) register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage) +register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce) +register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry) if minetest.get_mapgen_setting("mg_name") == "v6" then diff --git a/textures/farming_berry_smoothie.png b/textures/farming_berry_smoothie.png new file mode 100644 index 0000000000000000000000000000000000000000..8da2fc558cfcd91c870daaeafc366bf99c9cdd6b GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~xd5LK*ZiW~ zDM1Ab!YeLbzHsZ#%_q+u|M>O2)jnrSL z;us<^b#A{U-vI*-7Q^FG|NcK@nVevrX~cVrQAOcb`^iIAi?!Z})NwK0vCZfX_?rFIbfO?)i=tUSIW3En>WIpW~MT&~OG%S3j3^P6?X zjMfTMw9X^k<0i^2slmy|22{jd666=m@E;Cp%WAIzg_As89780gPVM&=I-tPe z-0R@@uKvL>|I%BrHxHb4Fq-md{jGUdmK59MBz2uWe7?!cRmSmzNX=ahp_B>7yJiMD z#yz|^&CylucAC^OgUl*Ew$#-#1gEwsvwLgQN*Jy;|L`!@oN*uHYaOp=l|b7VJYD@< J);T3K0RVzaO*;Sp literal 0 HcmV?d00001 diff --git a/textures/farming_blackberry_1.png b/textures/farming_blackberry_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8dd8832c413ec885bcfa5095adf039a453f7e7f6 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJTYyi9>$ZR|6JHC@W!tw1D8f_{ z^tAUWSJ}-P}~R_6YDWFzYf1c1>t% Q1FB{4boFyt=akR{09E%McK`qY literal 0 HcmV?d00001 diff --git a/textures/farming_blackberry_2.png b/textures/farming_blackberry_2.png new file mode 100644 index 0000000000000000000000000000000000000000..7d3827c8d97185ec0db8cf221af027004b8bc3f0 GIT binary patch literal 337 zcmV-X0j~auP)$Mi>*=!79y!6Y_VXG%EC@kT5jj>Sj0vJBUa89k1+|z zw%hDflezQmoSDFX{C$|;#B>wN{eH(<%jcwe+v~k6COMMi$nkh%J9`>{>Dm+37rUXv z8S<7O$&t$izQ4L!k|VvI*D)jt?a{iD82tb!m%QB1=O;nX)BxfP z2?7`lLW+-@d95&>BZ}P4^+8oR1K)S6>2bHSr|A$>6&wmok|UZ=*PiI!qZILdh@yt9 zgZFqe#~Y|U#Ej=|`k}x? jkwer_{Pu4>of`cIIlYqYot4ea00000NkvXXu0mjfW)7Z) literal 0 HcmV?d00001 diff --git a/textures/farming_blackberry_3.png b/textures/farming_blackberry_3.png new file mode 100644 index 0000000000000000000000000000000000000000..7d89aa0cdc18c5d9029d298594c034c83d144f0c GIT binary patch literal 324 zcmV-K0lWT*P)Nha2V|HB!V+`K+evzw}nr+`OEy2s>hSTA$03fS01wWp* zZ2N|b8>A(8y#n7Kb1W^v^;*w9G{y{otZN;Z*D*tpbr@@zDw^YYOQa$KL~)Xv-jDysJ^x<#ufM6IU?Tg@4t^t=CX}x0h@wZH&wj@E`y8_hSuWps zU7Q1u*S_dk(Z;ev(0NuN<2gH5&MHJjRIq4cA*(FdG@+y=Vw!Mp$|@u+H)3j}oIyZ` ztL_4on3fi&CIJ5J0&l&Bx2qWd<2mwFoC47IRwSC2i#E2c=nc{mNsRpi3OYHQNnZPs qmUhq0V(W3ar0;>c?pnvw&H4*HAfTH^J+;070000z^JS;Zfg4I&avlS&~V+E`lJXbMpX5>knUjRdw48!aLhq85TF6hv** zQtU(xsTWf%7?L6pbyjEB$vDou6k(scJ7bf^Q{8tt=e&1+9y~RasAP7pUjU%SiK{L# zGmWa5yzE^F@s&tnmAD+$M#^L2YLuImo2VgXgc!gJbey6EK;SzvA1ei$X%DZUV&DH_ z(8r_U`dqCJ@eAZOcHzK^xjLEAtU%l84O*EC9;-qTa1!r=GM5kc@Ulz>#I1Wjv@ zajH3^RP!A|4BfnQ6p}A)Y0g&~*dX{ljhX0)U$Q z0RaA8LGFPp!FCfQ)jK@&t;O+={x00007|BHN`<0yP!vZ&=q5P0i8zXj(6KmF>*%5&(pbEy zSTvCoL?nt7uSQ!8ibww3fpulzi`k8N?M(p zk4Ib~(p*11F9Fbhz+gVLXJJ=43AFYs=;!q{XQfY_lbP^Gx! zWj=H9IN#T7hK|Jm$QN_i=4LR$*yIti$qBZ5OymQHd8J9H*$iqn13;hn1%T3@qV`3i zxe<{%j<|&dfN8auzBTRR<&_Vf^McO9`%hr!{Q-epcYw3wS9tzr5kfU=$3UIx=5k?S3cte%9ASsxp_r|{c z1FY-SfO9|~vG0@*G@5IeRts5pE9Y}Rx)M8X&|X5MK~nZ4`vRA)UiJr9KUe5&$~>A| d*^~TV>JR_TtfKPoDG&ev002ovPDHLkV1lZp`al2x literal 0 HcmV?d00001 diff --git a/textures/farming_lettuce_1.png b/textures/farming_lettuce_1.png new file mode 100644 index 0000000000000000000000000000000000000000..39ce983061b61535b9c3a27cb2f4829d543e6118 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rk*a2Ar`&K2@b$4? z56ff(V?CaCmfPjHRhU<;uh5U&?0~kDA{an^L HB{Ts5TXG_f literal 0 HcmV?d00001 diff --git a/textures/farming_lettuce_2.png b/textures/farming_lettuce_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0e4ab3039b52c3f7bb758be2e1f9c509436e611d GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`@t!V@Ar`&K2@>c3sD+ z@r{IrbR>`Dh6Ld`)9WW2rY-vQ|GxeIgGcKgZs-x5y&!$}sd~FKw>JO!|HdB-jg2;J zGB(sXxxX`1SD3F^GVbrc^B*3|Gap{Q|G(tCx}T>X+*s9gl{>;WH6bCPASd+a|L^8U lxX-Nd;rYG#eL^TVL((*j-SbaBasxVs!PC{xWt~$(697iBP8fnmyY0TYIs3UPH|ZS(E_KMFbAZWw`(JtU z#Gf}9gm*DWTMLJo?Rsdz>kxkC*twQaubU;^E1^xA(|0k=^1J6%i6CPnJCVvwr_QgOE!3qZ?$GGa4KPDvQWs6pv7(8A5T-G@yGywoP8Cuf- literal 0 HcmV?d00001 diff --git a/textures/farming_salad.png b/textures/farming_salad.png new file mode 100644 index 0000000000000000000000000000000000000000..febf40f3ed1ae4e6ed6944b938b74f1a16fb0e43 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0D`p z({oj8qU6r7vdR@Q9Jo8NYPrrUOBW5G1V>4bUogXe2)KGG#0V(n=jq}YA~AJquOnZB z0|)c=fK&hLb+~tZd~%jkF;O9P?S2Lik#wJlT^BTVC@qam%$S(6cJZ%{xdH4KEu&{V qJXY(p<^$XL*@n;apFc3ID`uR$h0#z;dD>i%J3L+eT-G@yGywokYepUb literal 0 HcmV?d00001 From 66acbf5458a31c84d7945352273901b95816be0b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Dec 2020 18:12:47 +0000 Subject: [PATCH 3/8] update texture credits in license.txt --- license.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/license.txt b/license.txt index 8584871..e963e11 100644 --- a/license.txt +++ b/license.txt @@ -142,3 +142,9 @@ Created by VanessaE and edited by SpaghettiToastBook (CC0): Created by mDiyo (Natura), modified by TenPlus1 (License: CC BY-SA 3.0): farming_barley.png + +Created by Felfa + farming_blackberry*.png + farming_lettuce*.png + farming_burger.png + farming_berry_smoothie.png From f2ab135c6b14f9d4719e7f8920c88e2b9f0a8f0c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 09:21:06 +0000 Subject: [PATCH 4/8] add red and yellow peppers (thanks Felfa) --- crops/pepper.lua | 48 ++++++++++++++++++++++++++---- textures/crops_pepper_plant_6.png | Bin 0 -> 423 bytes textures/crops_pepper_plant_7.png | Bin 0 -> 442 bytes textures/crops_pepper_red.png | Bin 0 -> 339 bytes textures/crops_pepper_yellow.png | Bin 0 -> 353 bytes 5 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 textures/crops_pepper_plant_6.png create mode 100644 textures/crops_pepper_plant_7.png create mode 100644 textures/crops_pepper_red.png create mode 100644 textures/crops_pepper_yellow.png diff --git a/crops/pepper.lua b/crops/pepper.lua index 848c2ae..66960cc 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -19,16 +19,32 @@ minetest.register_craftitem("farming:peppercorn", { -- green pepper minetest.register_craftitem("farming:pepper", { - description = S("Pepper"), + description = S("Green Pepper"), inventory_image = "crops_pepper.png", on_use = minetest.item_eat(2), groups = {food_pepper = 1, flammable = 3} }) +-- yellow pepper +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}, +}) + +-- red pepper +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}, +}) + minetest.register_craft({ type = "shapeless", output = "farming:peppercorn", - recipe = {"farming:pepper"} + recipe = {"group:food_pepper"} }) -- ground pepper @@ -93,11 +109,10 @@ minetest.register_node("farming:pepper_3", table.copy(def)) def.tiles = {"crops_pepper_plant_4.png"} minetest.register_node("farming:pepper_4", table.copy(def)) --- stage 5 +-- stage 5 (green pepper) def.tiles = {"crops_pepper_plant_5.png"} -def.groups.growing = 0 def.drop = { - items = { + max_items = 2, items = { {items = {"farming:pepper 2"}, rarity = 1}, {items = {"farming:pepper"}, rarity = 2}, {items = {"farming:pepper"}, rarity = 3} @@ -105,6 +120,29 @@ def.drop = { } minetest.register_node("farming:pepper_5", table.copy(def)) +-- stage 6 (yellow pepper) +def.tiles = {"crops_pepper_plant_6.png"} +def.drop = { + max_items = 2, items = { + {items = {'farming:pepper_yellow 2'}, rarity = 1}, + {items = {'farming:pepper_yellow'}, rarity = 2}, + {items = {'farming:pepper_yellow'}, rarity = 3}, + } +} +minetest.register_node("farming:pepper_6", table.copy(def)) + +-- stage 7 (red pepper) +def.tiles = {"crops_pepper_plant_7.png"} +def.groups.growing = 0 +def.drop = { + max_items = 2, items = { + {items = {'farming:pepper_red 2'}, rarity = 1}, + {items = {'farming:pepper_red'}, rarity = 2}, + {items = {'farming:pepper_red'}, rarity = 3}, + } +} +minetest.register_node("farming:pepper_7", table.copy(def)) + -- add to registered_plants farming.registered_plants["farming:pepper"] = { crop = "farming:pepper", diff --git a/textures/crops_pepper_plant_6.png b/textures/crops_pepper_plant_6.png new file mode 100644 index 0000000000000000000000000000000000000000..f2de13ae265e4172d6402761ea263c0de55d789b GIT binary patch literal 423 zcmV;Y0a*TtP)+jhHmS6<-8w1;s`Skrc5=Cs_CgETUMZvlId;^A99RvA;n?3yUC#rckgE zQds7p;7UZYQI@f|T=Q@@IdIvX;hwWIXJ!>4C>D@&U%yxLsIYs1#G5O9iUkBVgqH~R7Rmd;i4C?k?7+mb2U5-4Es{nI}N@~+8U@#%_>5s8j#=iw2YFWo}(1?I#j zt}Lz(-9Jwhz-|TUiA`60_M06xH#GU=6qU{)tq-U>!A1@xO^E=}rw(csUK{Xy7Cwcs z<5@XCtXN;b^gXRyF0wioXrj4XcTm2k<6;4ETi~{!CpNnkJ(a);Ql*3d#Fa(k-X*sR z>uYdVgUh5nWMVXkcze`QCeAKvGU&aa=5js2iI{RzrG$8G3$Jbc6EYawi=hfkNrNKk z9P;Lc6AdO#VQB{T=K0%=Q4c2mWvj=?LJ~fwY+{T4zqZD%vO)6&>W&-uv0tF)sMliQ Rf9C)I002ovPDHLkV1gknxkCT| literal 0 HcmV?d00001 diff --git a/textures/crops_pepper_plant_7.png b/textures/crops_pepper_plant_7.png new file mode 100644 index 0000000000000000000000000000000000000000..b94526ba0ab344bc168cb6a45528cc6d060231f1 GIT binary patch literal 442 zcmV;r0Y(0aP)(<%t5w7LhOUsEZ-9Q)4D(xT$G&AB@UuB9(V2m)u5nT-p)=!nak_ zFuXj%-Cpl0^c~OSGNL1G0o(VW@;P1&?wlst(YVj-JSKv!Lvc+I3&I;0n zgaAa9=JCpB=`=(t`pxyH=6Wm9VPe=tyjZU)8!wz_Qt`l-*|>r2DrdhqAzN;`kdVf+ zrtz%1ge;nleGCJwl75S1Hj&o`aN;If{5ys5AxIzU)^7au;NM?1wSkOIz{h|`WXyE6 k)pwOGp6;Ps@|}u`%)TQU4x;vvuZ@ z64Um(hMw*?^E34C{DYq)|JTRpSy}%VR^BBM^C0|decOYTJ>rrQ5)wg26_a|yYN~=> z+s8Ux+hF#4zg@Jp@-oJKOgv!uGdmRjs1&lbRq896@TA;nzA)R~;Kku10ZfLWa~cmy zWF6Quog->KyJG!EZsxSy(AI^~YEfQ7KCfy*j{fEQP_PrXf0wyh6&v4lF$$=JCwUqEh(Jd3VC29(B ieUX$9sL5H!!XQ`>VSFOoWC}2_7(8A5T-G@yGywqk>w*3N literal 0 HcmV?d00001 diff --git a/textures/crops_pepper_yellow.png b/textures/crops_pepper_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..c0273e437ea45346f39b836f6038b3d57a510eaf GIT binary patch literal 353 zcmV-n0iOPeP)9i=yvpSlTkU2`{XChM00000NkvXXu0mjf^tzi2 literal 0 HcmV?d00001 From 8ef5730b3f37f5c3b0dc9a249fe0677036995083 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 09:24:30 +0000 Subject: [PATCH 5/8] have random peppers colours appear in world --- mapgen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapgen.lua b/mapgen.lua index e7c8118..a09f951 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -126,7 +126,7 @@ minetest.register_decoration({ }, y_min = 5, y_max = 35, - decoration = {"farming:pepper_5"}, + decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"}, spawn_by = "group:tree", num_spawn_by = 1 }) From 2e18ef6ba613629290cd42abe45a4d2e6eece43f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 09:31:50 +0000 Subject: [PATCH 6/8] change few growing to nil and lettuce/cabbage drops --- crops/blackberry.lua | 2 +- crops/cabbage.lua | 4 ++-- crops/lettuce.lua | 4 ++-- crops/pepper.lua | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crops/blackberry.lua b/crops/blackberry.lua index f3de7ed..e2122fd 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -42,7 +42,7 @@ minetest.register_node("farming:blackberry_3", table.copy(def)) -- stage 4 def.tiles = {"farming_blackberry_4.png"} -def.groups.growing = 0 +def.groups.growing = nil def.drop = { items = { {items = {'farming:blackberry 2'}, rarity = 1}, diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 4e75d63..b57ac00 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -53,8 +53,8 @@ def.tiles = {"farming_cabbage_6.png"} def.groups.growing = nil def.drop = { max_items = 2, items = { - {items = {"farming:cabbage"}, rarity = 1}, - {items = {"farming:cabbage"}, rarity = 2} + {items = {"farming:cabbage 2"}, rarity = 1}, + {items = {"farming:cabbage 1"}, rarity = 2} } } minetest.register_node("farming:cabbage_6", table.copy(def)) diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 080ad9c..07ef43a 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -44,11 +44,11 @@ minetest.register_node("farming:lettuce_4", table.copy(def)) -- stage 5 def.tiles = {"farming_lettuce_5.png"} -def.groups.growing = 0 +def.groups.growing = nil def.drop = { items = { {items = {'farming:lettuce 2'}, rarity = 1}, - {items = {'farming:lettuce 2'}, rarity = 2}, + {items = {'farming:lettuce 1'}, rarity = 2}, } } minetest.register_node("farming:lettuce_5", table.copy(def)) diff --git a/crops/pepper.lua b/crops/pepper.lua index 66960cc..086a0c6 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -133,7 +133,7 @@ minetest.register_node("farming:pepper_6", table.copy(def)) -- stage 7 (red pepper) def.tiles = {"crops_pepper_plant_7.png"} -def.groups.growing = 0 +def.groups.growing = nil def.drop = { max_items = 2, items = { {items = {'farming:pepper_red 2'}, rarity = 1}, From a5b07379ce17548c4de16ecf457f32adc76c7e27 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 10:37:08 +0000 Subject: [PATCH 7/8] added vanilla, soy (thanks Felfa), added tofu, simplified porridge/burger recipe --- README.md | 2 +- crops/soy.lua | 171 +++++++++++++++++++++++++++ crops/vanilla.lua | 122 +++++++++++++++++++ farming.conf_example | 2 + food.lua | 59 ++------- init.lua | 6 +- license.txt | 3 + mapgen.lua | 4 + textures/farming_soy_1.png | Bin 0 -> 136 bytes textures/farming_soy_2.png | Bin 0 -> 142 bytes textures/farming_soy_3.png | Bin 0 -> 167 bytes textures/farming_soy_4.png | Bin 0 -> 188 bytes textures/farming_soy_5.png | Bin 0 -> 196 bytes textures/farming_soy_6.png | Bin 0 -> 221 bytes textures/farming_soy_7.png | Bin 0 -> 237 bytes textures/farming_soy_beans.png | Bin 0 -> 699 bytes textures/farming_soy_milk_glass.png | Bin 0 -> 185 bytes textures/farming_soy_pod.png | Bin 0 -> 645 bytes textures/farming_tofu.png | Bin 0 -> 175 bytes textures/farming_tofu_cooked.png | Bin 0 -> 174 bytes textures/farming_vanilla.png | Bin 0 -> 474 bytes textures/farming_vanilla_1.png | Bin 0 -> 126 bytes textures/farming_vanilla_2.png | Bin 0 -> 140 bytes textures/farming_vanilla_3.png | Bin 0 -> 152 bytes textures/farming_vanilla_4.png | Bin 0 -> 187 bytes textures/farming_vanilla_5.png | Bin 0 -> 186 bytes textures/farming_vanilla_6.png | Bin 0 -> 300 bytes textures/farming_vanilla_7.png | Bin 0 -> 309 bytes textures/farming_vanilla_8.png | Bin 0 -> 441 bytes textures/farming_vanilla_extract.png | Bin 0 -> 208 bytes 30 files changed, 319 insertions(+), 50 deletions(-) create mode 100644 crops/soy.lua create mode 100644 crops/vanilla.lua create mode 100644 textures/farming_soy_1.png create mode 100644 textures/farming_soy_2.png create mode 100644 textures/farming_soy_3.png create mode 100644 textures/farming_soy_4.png create mode 100644 textures/farming_soy_5.png create mode 100644 textures/farming_soy_6.png create mode 100644 textures/farming_soy_7.png create mode 100644 textures/farming_soy_beans.png create mode 100644 textures/farming_soy_milk_glass.png create mode 100644 textures/farming_soy_pod.png create mode 100644 textures/farming_tofu.png create mode 100644 textures/farming_tofu_cooked.png create mode 100644 textures/farming_vanilla.png create mode 100644 textures/farming_vanilla_1.png create mode 100644 textures/farming_vanilla_2.png create mode 100644 textures/farming_vanilla_3.png create mode 100644 textures/farming_vanilla_4.png create mode 100644 textures/farming_vanilla_5.png create mode 100644 textures/farming_vanilla_6.png create mode 100644 textures/farming_vanilla_7.png create mode 100644 textures/farming_vanilla_8.png create mode 100644 textures/farming_vanilla_extract.png diff --git a/README.md b/README.md index 622e2fc..e442aac 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames) +- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu - 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates diff --git a/crops/soy.lua b/crops/soy.lua new file mode 100644 index 0000000..cb71c67 --- /dev/null +++ b/crops/soy.lua @@ -0,0 +1,171 @@ + +local S = farming.intllib + +-- soy pod +minetest.register_craftitem("farming:soy_pod", { + description = S("Soy Pod"), + inventory_image = "farming_soy_pod.png", + groups = {seed = 2, 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 +}) + +minetest.register_craftitem("farming:soy_beans", { + description = S("Soy Beans"), + inventory_image = "farming_soy_beans.png", + groups = {food_soy = 1, flammable = 2}, + on_use = minetest.item_eat(1) +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:soy_beans", + recipe = {"farming:soy_pod"} +}) + +-- soy milk +minetest.register_node("farming:soy_milk", { + description = S("Soy Milk"), + drawtype = "plantlike", + tiles = {"farming_soy_milk_glass.png"}, + inventory_image = "farming_soy_milk_glass.png", + wield_image = "farming_soy_milk_glass.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + }, + on_use = minetest.item_eat(2, "vessels:drinking_glass"), + groups = { + vessel = 1, food_milk_glass = 1, dig_immediate = 3, + attached_node = 1, drink = 1 + }, + sounds = default.node_sound_glass_defaults() +}) + +minetest.register_craft( { + type = "shapeless", + output = "farming:soy_milk", + recipe = { + "group:food_soy", "group:food_soy", "group:food_soy", + "farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass" + }, + replacements = { + {"bucket:bucket_water", "bucket:bucket_empty"}, + {"farming:vanilla_extract", "vessels:glass_bottle"} + } +}) + +-- tofu +minetest.register_craftitem("farming:tofu", { + description = S("Tofu"), + inventory_image = "farming_tofu.png", + groups = {food_tofu = 1, food_meat_raw = 1, flammable = 2}, + on_use = minetest.item_eat(3) +}) + +minetest.register_craft({ + output = "farming:tofu", + type = "shapeless", + recipe = { + "farming:baking_tray", "group:food_soy", "group:food_soy", + "group:food_soy", "group:food_soy", "group:food_soy", + }, + replacements = {{"farming:baking_tray", "farming:baking_tray"}} +}) + +-- cooked tofu +minetest.register_craftitem("farming:tofu_cooked", { + description = S("Cooked Tofu"), + inventory_image = "farming_tofu_cooked.png", + groups = {food_meat = 1, flammable = 2}, + on_use = minetest.item_eat(6) +}) + +minetest.register_craft({ + type = "cooking", + output = "farming:tofu_cooked", + recipe = "farming:tofu", + cooktime = 5 +}) + +-- crop definition + +local def = { + drawtype = "plantlike", + tiles = {"farming_soy_1.png"}, + paramtype = "light", + paramtype2 = "meshoptions", + place_param2 = 3, + sunlight_propagates = true, + waving = 1, + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- stage 1 +minetest.register_node("farming:soy_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_soy_2.png"} +minetest.register_node("farming:soy_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_soy_3.png"} +minetest.register_node("farming:soy_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_soy_4.png"} +minetest.register_node("farming:soy_4", table.copy(def)) + +-- stage 5 +def.tiles = {"farming_soy_5.png"} +def.drop = { + max_items = 1, items = { + {items = {'farming:soy_pod'}, rarity = 1}, + } +} +minetest.register_node("farming:soy_5", table.copy(def)) + +-- stage 6 +def.tiles = {"farming_soy_6.png"} +def.drop = { + max_items = 3, items = { + {items = {'farming:soy_pod'}, rarity = 1}, + {items = {'farming:soy_pod'}, rarity = 2}, + {items = {'farming:soy_pod'}, rarity = 3}, + } +} +minetest.register_node("farming:soy_6", table.copy(def)) + +-- stage 7 +def.tiles = {"farming_soy_7.png"} +def.groups.growing = nil +def.drop = { + max_items = 5, items = { + {items = {'farming:soy_pod'}, rarity = 1}, + {items = {'farming:soy_pod'}, rarity = 2}, + {items = {'farming:soy_pod'}, rarity = 3}, + {items = {'farming:soy_pod'}, rarity = 4}, + {items = {'farming:soy_pod'}, rarity = 5} + } +} +minetest.register_node("farming:soy_7", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:soy_pod"] = { + crop = "farming:soy", + seed = "farming:soy_pod", + minlight = farming.min_light, + maxlight = farming.max_light, + steps = 7 +} diff --git a/crops/vanilla.lua b/crops/vanilla.lua new file mode 100644 index 0000000..17236a3 --- /dev/null +++ b/crops/vanilla.lua @@ -0,0 +1,122 @@ +local S = farming.intllib + +-- vanilla +minetest.register_craftitem("farming:vanilla", { + description = S("Vanilla"), + inventory_image = "farming_vanilla.png", + groups = {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, + on_use = minetest.item_eat(1), +}) + +-- crop definition +local def = { + drawtype = "plantlike", + tiles = {"farming_vanilla_1.png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- vanilla extract +minetest.register_node("farming:vanilla_extract", { + description = S("Vanilla Extract"), + drawtype = "plantlike", + tiles = {"farming_vanilla_extract.png"}, + inventory_image = "farming_vanilla_extract.png", + wield_image = "farming_vanilla_extract.png", + paramtype = "light", + is_ground_content = false, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} + }, + groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, + sounds = default.node_sound_glass_defaults(), +}) + +minetest.register_craft( { + output = "farming:vanilla_extract", + recipe = { + { "group:food_vanilla", "group:food_vanilla", "group:food_vanilla"}, + { "group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"}, + }, + replacements = { + {"bucket:bucket_water", "bucket:bucket_empty"}, + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:vanilla_extract", + burntime = 25, + replacements = {{ "farming:vanilla_extract", "vessels:glass_bottle" }} +}) + +-- stage 1 +minetest.register_node("farming:vanilla_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_vanilla_2.png"} +minetest.register_node("farming:vanilla_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_vanilla_3.png"} +minetest.register_node("farming:vanilla_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_vanilla_4.png"} +minetest.register_node("farming:vanilla_4", table.copy(def)) + +-- stage 5 +def.tiles = {"farming_vanilla_5.png"} +minetest.register_node("farming:vanilla_5", table.copy(def)) + +-- stage 6 +def.tiles = {"farming_vanilla_6.png"} +def.visual_scale = 1.9 +minetest.register_node("farming:vanilla_6", table.copy(def)) + +-- stage 7 +def.tiles = {"farming_vanilla_7.png"} +def.drop = { + items = { + {items = {'farming:vanilla'}, rarity = 1}, + {items = {'farming:vanilla'}, rarity = 2}, + {items = {'farming:vanilla'}, rarity = 3} + } +} +minetest.register_node("farming:vanilla_7", table.copy(def)) + +-- stage 8 (final) +def.tiles = {"farming_vanilla_8.png"} +def.groups.growing = nil +def.drop = { + items = { + {items = {'farming:vanilla 2'}, rarity = 1}, + {items = {'farming:vanilla 2'}, rarity = 2}, + {items = {'farming:vanilla 2'}, rarity = 2}, + {items = {'farming:vanilla 2'}, rarity = 3} + } +} +minetest.register_node("farming:vanilla_8", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:vanilla"] = { + crop = "farming:vanilla", + seed = "farming:vanilla", + minlight = farming.min_light, + maxlight = farming.max_light, + steps = 8 +} diff --git a/farming.conf_example b/farming.conf_example index 88331af..bea7ada 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -33,6 +33,8 @@ farming.mint = 0.005 farming.cabbage = 0.001 farming.blackberry = 0.002 farming.lettuce = 0.001 +farming.soy = 0.001 +farming.vanilla = 0.001 farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) diff --git a/food.lua b/food.lua index b395448..7089246 100644 --- a/food.lua +++ b/food.lua @@ -181,44 +181,18 @@ minetest.register_craftitem("farming:porridge", { on_use = minetest.item_eat(6, "farming:bowl") }) -minetest.after(0, function() - - local fluid = "group:water_bucket" - local fluid_return = { - {"group:water_bucket", "bucket:bucket_empty"}, - {"group:water_bucket_wooden", "bucket:bucket_empty"} +minetest.register_craft({ + type = "shapeless", + output = "farming:porridge", + recipe = { + "group:food_oats", "group:food_oats", "group:food_oats", + "group:food_oats", "group:food_bowl", "group:food_milk_glass" + }, + replacements = { + {"mobs:glass_milk", "vessels:drinking_glass"}, + {"farming:soy_milk", "vessels:drinking_glass"} } - - if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then - fluid = "group:food_milk" - fluid_return = { - {"mobs:bucket_milk", "bucket:bucket_empty"} - } - else - minetest.register_craft({ - type = "shapeless", - output = "farming:porridge", - recipe = { - "group:food_oats", "group:food_oats", "group:food_oats", - "group:food_oats", "group:food_bowl", "group:water_bucket_wooden" - }, - replacements = fluid_return - }) - end - - minetest.register_craft({ - type = "shapeless", - output = "farming:porridge", - recipe = { - "group:food_oats", "group:food_oats", "group:food_oats", - "group:food_oats", "group:food_bowl", fluid - }, - replacements = fluid_return - }) - - if minetest.get_modpath("bucket_wooden") then - end -end) +}) --= Jaffa Cake @@ -382,7 +356,6 @@ minetest.register_craftitem("farming:burger", { on_use = minetest.item_eat(16), }) -if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then minetest.register_craft({ type = "shapeless", output = "farming:burger", @@ -392,16 +365,6 @@ minetest.register_craft({ "group:food_lettuce" } }) -else -minetest.register_craft({ - type = "shapeless", - output = "farming:burger", - recipe = { - "farming:bread", "group:food_mushroom", "group:food_tomato", - "group:food_cucumber", "group:food_onion", "group:food_lettuce" - } -}) -end -- Salad diff --git a/init.lua b/init.lua index 98002ad..973c807 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20201210", + version = "20201213", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -630,6 +630,8 @@ farming.beetroot = 0.001 farming.mint = 0.005 farming.cabbage = 0.001 farming.blackberry = 0.002 +farming.soy = 0.001 +farming.vanilla = 0.001 farming.lettuce = 0.001 farming.grains = true farming.rarety = 0.002 @@ -698,6 +700,8 @@ ddoo("ryeoatrice.lua", farming.grains) ddoo("mint.lua", farming.mint) ddoo("cabbage.lua", farming.cabbage) ddoo("blackberry.lua", farming.blackberry) +ddoo("soy.lua", farming.soy) +ddoo("vanilla.lua", farming.vanilla) ddoo("lettuce.lua", farming.lettuce) dofile(farming.path .. "/food.lua") diff --git a/license.txt b/license.txt index e963e11..68bc1b1 100644 --- a/license.txt +++ b/license.txt @@ -128,6 +128,7 @@ Created by TenPlus1 (CC BY 3.0) farming_rhubarb.png farming_rhubarb_pie.png farming_hemp*.png + farming_tofu*.png Created by ademant (CC-BY-3.0) farming_rye*.png @@ -148,3 +149,5 @@ Created by Felfa farming_lettuce*.png farming_burger.png farming_berry_smoothie.png + farming_soy*.png + farming_vanilla*.png diff --git a/mapgen.lua b/mapgen.lua index a09f951..94c43a7 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -52,6 +52,10 @@ register_plant("mint_4", 1, 75, {"default:dirt_with_grass", register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage) register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce) register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry) +register_plant("soy_6", 20, 50, {"default:dirt_with_dry_grass", + "default:dirt_with_rainforest_litter", + "default:dry_dirt_with_dry_grass"}, "", -1, farming.soy) +register_plant("vanilla_7", 5, 35, nil, "", -1, farming.vanilla) if minetest.get_mapgen_setting("mg_name") == "v6" then diff --git a/textures/farming_soy_1.png b/textures/farming_soy_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9a64d873c17f90bd2c6d8270ad67b9736599a70e GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S0J4_ zg(0whyUldm&@1zg;-01{DK+&1A)v1HIPX%o-U3d5>t~CBz`qaoX8p4(AhXq ga%w+YL;=t~mJ$ZhH~LF+fa(}LUHx3vIVCg!03o|3OaK4? literal 0 HcmV?d00001 diff --git a/textures/farming_soy_3.png b/textures/farming_soy_3.png new file mode 100644 index 0000000000000000000000000000000000000000..e8f39ee561b43a3f695e9570044c3f01a778f51c GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0J4_ zg&}7i!}L>%f#nPj{?GjI|NMJb{cAu8_L3mKV21x-u(W>JZ=jH_r;B5V#MI;jiHrj$ zSkjFcZ}yyV;F-+SWnf^uP$NAp(ao4)?)d{=0S&y%85l$u8Ekeioy!DjWbkzLb6Mw< G&;$S?9y9d- literal 0 HcmV?d00001 diff --git a/textures/farming_soy_4.png b/textures/farming_soy_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3012c2afd630cb3c9965effcde16048f3412b625 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0J4_ zg&}7i!}L>%f#nP*UY9=jKl8)?^UL>~O#;eslmz(&GyI2utEWPYfMRx@E{-7*Q@8dS z@-ZlIFlRFU{okKz;F7S7ne+I>t{QHEX8na4nL8OO5})z4*}Q$iB}%y~cC literal 0 HcmV?d00001 diff --git a/textures/farming_soy_5.png b/textures/farming_soy_5.png new file mode 100644 index 0000000000000000000000000000000000000000..63f0ce493780eb0f190177970d2e2254176dbd8f GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0J4; zk0Esm!}L>%f#nQ+yH!uTE=^0R{Q;CVOY4{Y1`2t3x;TbNOr6{3$k*V& z!^Exo`@j176`gDEJ-N`rsp|4a*yFyR0A~ny!>7HqjBB1B{J%72&fZHKX3DRZynb-g m+5(Tc5___*zjmiE8Pu<^{i*$;rGGI+ZBxvXiWS0J6z z$sgCi*SpEUJDs~_snLNuWiyxB_RX@*ES1c!l@1VEat^47yCldjnBhMh)Rxs=1qugy zx;TbNOwH{JlIy@%vzN>NGXb~-G*qFjvz3y=@8-L9mM$v7W?I6c9c)I$ztaD0e F0sv4tP-OrB literal 0 HcmV?d00001 diff --git a/textures/farming_soy_7.png b/textures/farming_soy_7.png new file mode 100644 index 0000000000000000000000000000000000000000..eb47e325acce7115caed83c5511d0cb123c1abfc GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~l>na*S0G)~ z$)DZ8H)oSUSUUH_rAAAaSZB|(0{4F3^;^GJXi zP(0q##W6%;YHoiZUxNXMv!*Q1mw(@<9({2qsoq0Apy@>af?dKKZZnxR1T(hhH#8Iqr^*CBIqR!`w>Zx6KgLo*>g4{QTcXZoMfp W8GZJCWy=Rz#o+1c=d#Wzp$Pz4PFN8D literal 0 HcmV?d00001 diff --git a/textures/farming_soy_beans.png b/textures/farming_soy_beans.png new file mode 100644 index 0000000000000000000000000000000000000000..aedc04c9d620cbcb0448b06ea33bbc68a8608e0c GIT binary patch literal 699 zcmV;s0!00ZP)Px%bxA})R5*>TlHW^HaTvy*opZLG9XEAuXUr{{KdLP&BO_4?jWS$@|ARC|NB@9bharKky#jJi9KFnt%xaz`B2-mmsN@q$Jj*6uFXS43e0L69h>OW^MV+@MTx7N(VT{qmd^y%B!cR zlP`N}Wp7{Ot*ja|%*|GZ^Cn4B`^7|z-VCo^^l*G+@WH`ev#tEZh4#_a8NRXs4DT&QOWGxnp23I^BKba4Z)q?kV!x>7WYu%N$iH*?r hfQRFI@`eA4egjLb^6XQBF^K>G002ovPDHLkV1fwRMfU&z literal 0 HcmV?d00001 diff --git a/textures/farming_soy_milk_glass.png b/textures/farming_soy_milk_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..95c567dd6f0d9c241d7ff0989ef990ae1a38b4d2 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0Mf5 z+2f0sFZ}rR{m71`H!d8yb?4^VRdN@B66_^Ge!&d?!C-0qvfn@h6-1!Ob b&irI3RbdPiUBXcU8|tDnm{r-UW|7lTKf literal 0 HcmV?d00001 diff --git a/textures/farming_soy_pod.png b/textures/farming_soy_pod.png new file mode 100644 index 0000000000000000000000000000000000000000..eceeec53125bd396fb758a3647965747681cc589 GIT binary patch literal 645 zcmV;00($+4P)Px%KS@MER5*>5kxfWcVHAd+@6Nq9XU3ZHCrDb1l@3a2A&OIG+7ChnV=f|!pazm? z7qyBol#({mE^=dT3XB$Eltw9rXsCo_P8#K3ni@9RlrxRa-0!xD=toC7>-T-$bKWCZ zVd}2zvI90ua|Qq*0Pt3J0HCY{a0a`Ax)GeR$i)RrQzB)=7V&>n`VCP=u^b z)hA77R_@Sn=i|Bb!Xq08+8)eJtlH){b+u>H-+?MXd+l!CP0A)U8ge_L)8nq9lHoOL zllLoyp7z1k`(q#Mc_|37uvAx~u3~2|Ld5B+qVFqk1qL3~#{>Q>&lzo`r!D$s)}CZ2 zde~dlxpgUkf)I(AChqL@zIfZ}?97rAQHhvseEKTsbs!;4D%$7e%m9jF8pjbL;rYvH zS7?6L*WY|6G-2Iw03oavGvYa2^&)>c^RE*7YgDcKOKvklxPd4z;jQY-jAdMM8m{lr fo31(S|Ks@qa+24BmD2&j00000NkvXXu0mjfBGN0_ literal 0 HcmV?d00001 diff --git a/textures/farming_tofu.png b/textures/farming_tofu.png new file mode 100644 index 0000000000000000000000000000000000000000..aaa0a2cffe00a18607411e29f25af77de251f2a1 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=7=IPTRR>=f%qxzW@5> zDaz0U6k;q1@(X5gcy=QV$no=ZaSY+Oo_qE*;{gQ@=78IrEu4Q07|R-`y|E8wU03u_ zR!HNi#jMx!A{yBpN;x(}9b%g7dUA2a%!IytmtR6T5w|Z)G<~PC`g!iMs)|3%Z)~_; UJU+CWA80azr>mdKI;Vst00RR*+yDRo literal 0 HcmV?d00001 diff --git a/textures/farming_tofu_cooked.png b/textures/farming_tofu_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..23963cece530314547d491a87b4da8937e0ea616 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=1A}P7|^M=9YwR>?z!F zAjlIa#8?vK7tG-B>_!@p4!1d5I7MbU>~=8yeSXP-aJxIo zjZ@ZLPTtG==m$eeGt*+0X^S_OZPKVy^EoWyZ{O7%%D2m-4FoUP7pUXO@geCxZ{ySFy literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla.png b/textures/farming_vanilla.png new file mode 100644 index 0000000000000000000000000000000000000000..25596ade19a3057c4b18e1672a4b14271a598901 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|asqrpT!D1B ziD9|7I}m+&(E9)P6d;1KKh#3FKyqbY>ys;)|6j!Xf0OR0tN`Q!(f>=9FV-^rKP2$} z$ub~<7y@AcNuUCt2*hv*IkD*BX`p>7B|(0{4FCUslWUPX^#A|=pl?Ay^8f#JKrHuP z?pcn7h1`{Avx3&WU*2&8sQ!(oi(`mI@7_sgg_;a_T4tZIxO{A*u0-I+C42r`&sy@x zUsEPlPxjkuwFwsA*%=pP$r?m!SiTEmFzB^waj4#|yeR(B2c;yhNC73*)dF94$90Hw zy_z7$+hN&0bA^nYHIZbEi3P{eUU5nIep00i_>zopr0NHufH2?qr literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_1.png b/textures/farming_vanilla_1.png new file mode 100644 index 0000000000000000000000000000000000000000..fdd10c04e136639f3194c723910ce5f42377fce2 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H$efS0EkS zY@XU<|F=J@2*_bB3GxeO`2XJ};F=IYFYcVWOaKLnr4cped;g?4B8{ Q=|Fh~Pgg&ebxsLQ09dgdbN~PV literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_2.png b/textures/farming_vanilla_2.png new file mode 100644 index 0000000000000000000000000000000000000000..73ba2ca643878615a0865f33de5b9b1c1c44ee68 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S5F3p z;AZoTKG&jYer=0Gi<_erfl{m`L4Lsu|A9c}f*QyqDNh&25Q(YD2@-V;taH!zs2w_T fqC@cjPa-1&OAUjx*=wF+pehDWS3j3^P6X~Q rIn$$c;LMpbEs9Pn#n{5aG?*C#l^9&p_*drvRWo?H`njxgN@xNApI0qH literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_4.png b/textures/farming_vanilla_4.png new file mode 100644 index 0000000000000000000000000000000000000000..55858275be2e7e998c1935280c49747df187972d GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0LTI z&||@-goHN3>^A$%E{lq(&bbrZudXi* a)j39W3^V&4_?`h8#Ng@b=d#Wzp$P!}tU`SN literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_5.png b/textures/farming_vanilla_5.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac3ef73c4a488ca71fa21a7078dcf0eb88132a5 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0FuQ zURXk@ab>4v(*)1SvwaGi&HtSk@qhnyHyBo)uJmbYtk-zZb7Uja5`L%JVh;ayH~A$mJ$Bkvdlya@vs|)uM(tdi ZCT_DQ45fFno`LLT@O1TaS?83{1OS=pKT`kz literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_6.png b/textures/farming_vanilla_6.png new file mode 100644 index 0000000000000000000000000000000000000000..10a5bfd04d7e2f3194d0a7a96869833e9ef5233b GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(T!D0A zvB}!y$>l8;ix)>a$1D7LytcN}cH_ph{CbOqKEE|9(~29NDw}O5&+w`1aQgXwMQguj zcfZ%NsOtxSnuSY({DK+&V*oq*JGwyWCQlc~5R2Zo6Ai_f6**koJyj;9-rWA(KIej7 zYw}dR%jdpx%0HMdzvPOoB9qO$>_sadTn%3<>hNUmo5>arsy0a;ijiVoSKzM8^YYv; zD+bm2B`XxHeGXZPUj4$Sl;zUfF-z_J=P3L6YA+`oR$;wm5ZR-6m;aW!z?UfN$vaQ* ec}%|llcC<7+4H;G;T=HNFnGH9xvXZ+XTN_{G->{^?>yW9OIwFY%H z`M0e&*aFlnToU9L%D{D1{F6(#XRFl* ll$vCU6r}jFefai~W#>-j3-5#?YJtvT@O1TaS?83{1OU8ieLVmG literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_8.png b/textures/farming_vanilla_8.png new file mode 100644 index 0000000000000000000000000000000000000000..1801a976d42a9b189e171f5ce96534dad3900a17 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|oC178T!D0H zMtE6?^TP`zt&O36VVXs0q1D~-0r9r4pB($X5k(=w39_`gq z9a351HKQk^Fe&6YE0;IW6tR*ZzhH*{*g!~Q?_!|c%$_ceAr`$;C*I!Ftia>ST-3?( zBX>d&@mbeHRXa!f<_t51b7hjZfo?k`$(i zZs2r0vUmIYM!B2YnSLfLhN01~1x{sul5Uzy_e z&o{fzb{&;ie*4Siw4+Pk{VcK!<=US!tLevCwN`mEexccCncsgov&Azc)%&@9ZJe3r zQ(2R{)6drVh@WEEel~g6h0qUIlY(P3wANjC`pEg{+R^P literal 0 HcmV?d00001 diff --git a/textures/farming_vanilla_extract.png b/textures/farming_vanilla_extract.png new file mode 100644 index 0000000000000000000000000000000000000000..c0668ceffac6cc009d83cb5f746e01e538807a8d GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~l>na*S0G)P zAA9%yo#!u~-MW7H)~zdFzJ6-2FREZ;m~6su_44)OCy%XpcSIYgj;AEZFPP!~|NkF9 z0tq1SDYWziiaU9_IEF|}O-?w#C?OfR!{?07nw&Eyl+L_)lcV9)u;~Zu3=0cO%NZXz z3K)Mn2&&Ctx|3iR(9&JQ=o8&AFFConijRTIg6aBpjr%M>(-=Hm{an^LB{Ts5RIE?n literal 0 HcmV?d00001 From 79bf55ffd59bb16aa5217873c1a9257717610585 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 13 Dec 2020 11:33:15 +0000 Subject: [PATCH 8/8] update texture licenses (thanks OgelGames) --- license.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 68bc1b1..aa8a40e 100644 --- a/license.txt +++ b/license.txt @@ -144,10 +144,14 @@ Created by VanessaE and edited by SpaghettiToastBook (CC0): Created by mDiyo (Natura), modified by TenPlus1 (License: CC BY-SA 3.0): farming_barley.png +Created by OgelGames (CC BY-SA 4.0) + farming_berry_smoothie.png + farming_cactus_juice.png + farming_salad.png + Created by Felfa farming_blackberry*.png farming_lettuce*.png farming_burger.png - farming_berry_smoothie.png farming_soy*.png farming_vanilla*.png