From f1dd45d9037c94dba5b3fa05430c2325213529e5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 26 Jun 2023 11:04:43 +0100 Subject: [PATCH 01/34] tweak pineapple drops --- crops/pineapple.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 73cd6bc..f77bf5e 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -128,7 +128,7 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:pineapple"}, rarity = 1}, - {items = {"farming:pineapple"}, rarity = 10} + {items = {"farming:pineapple"}, rarity = 5} } } minetest.register_node("farming:pineapple_8", table.copy(def)) From b2d1289353b1676a5d2823f5007aca7217deb20e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 6 Jul 2023 13:01:40 +0100 Subject: [PATCH 02/34] tweak hemp block/stairs groups --- crops/hemp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crops/hemp.lua b/crops/hemp.lua index da5d568..dabbd9b 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -102,7 +102,7 @@ minetest.register_node("farming:hemp_block", { description = S("Hemp Block"), tiles = {"farming_hemp_block.png"}, paramtype = "light", - groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 2}, + groups = {snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, sounds = default.node_sound_leaves_defaults() }) @@ -121,14 +121,14 @@ if minetest.global_exists("stairs") then if stairs.mod and stairs.mod == "redo" then stairs.register_all("hemp_block", "farming:hemp_block", - {snappy = 1, flammable = 2}, + {snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, {"farming_hemp_block.png"}, "Hemp Block", default.node_sound_leaves_defaults()) else stairs.register_stair_and_slab("hemp_block", "farming:hemp_block", - {snappy = 1, flammable = 2}, + {snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, {"farming_hemp_block.png"}, "Hemp Block Stair", "Hemp Block Slab", From 8717625d0c259d7d28496c7095d96646e9e14696 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 13 Jul 2023 18:07:25 +0100 Subject: [PATCH 03/34] add 'farming_use_utensils' setting, added mayonnaise (thx felfa) --- README.md | 1 + crops/barley.lua | 4 +- crops/blueberry.lua | 4 +- crops/carrot.lua | 4 +- crops/chili.lua | 4 +- crops/coffee.lua | 4 +- crops/corn.lua | 9 ++- crops/lettuce.lua | 4 +- crops/melon.lua | 4 +- crops/mint.lua | 4 +- crops/onion.lua | 6 +- crops/pepper.lua | 6 +- crops/pineapple.lua | 10 ++-- crops/pumpkin.lua | 4 +- crops/rhubarb.lua | 4 +- crops/rice.lua | 4 +- crops/ryeoatrice.lua | 8 ++- crops/soy.lua | 11 ++-- crops/wheat.lua | 8 ++- food.lua | 121 ++++++++++++++++++++++++++++---------- init.lua | 5 +- license.txt | 1 + settingtypes.txt | 2 + textures/farming_mayo.png | Bin 0 -> 382 bytes 24 files changed, 167 insertions(+), 65 deletions(-) create mode 100644 textures/farming_mayo.png diff --git a/README.md b/README.md index 56c20d2..8744844 100644 --- a/README.md +++ b/README.md @@ -218,6 +218,7 @@ on an older map are enabled and growing properly. ### Changelog: +- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa) - 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube - 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock) - 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 diff --git a/crops/barley.lua b/crops/barley.lua index cf2d932..2697413 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -27,12 +27,14 @@ 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", "farming:mortar_pestle", ""} + {"farming:barley", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 1713bd1..ef19131 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -34,11 +34,13 @@ 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"}, - {"group:food_baking_tray", "", ""} + {"", tmp, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) diff --git a/crops/carrot.lua b/crops/carrot.lua index 0f53c87..1141bdc 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -25,11 +25,13 @@ 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}, {"group:food_carrot"}, - {"farming:juicer"}, {"vessels:drinking_glass"} }, replacements = { diff --git a/crops/chili.lua b/crops/chili.lua index 21aa371..547ca4c 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -40,10 +40,12 @@ 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", "farming:mortar_pestle"} + {"farming:chili_pepper", tmp} }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/coffee.lua b/crops/coffee.lua index 64d4e13..d0f2db5 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -32,10 +32,12 @@ 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_saucepan", "group:food_coffee", "group:food_water_glass"} + {"group:food_coffee", "group:food_water_glass", tmp} }, replacements = { {"group:food_saucepan", "farming:saucepan"} diff --git a/crops/corn.lua b/crops/corn.lua index b124e19..1390100 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -40,10 +40,12 @@ minetest.register_craftitem("farming:popcorn", { on_use = minetest.item_eat(4) }) +local tmp = farming.use_utensils and "farming:pot" or "" + minetest.register_craft({ output = "farming:popcorn", recipe = { - {"group:food_pot", "group:food_oil", "group:food_corn"} + {"group:food_oil", "group:food_corn", tmp} }, replacements = { {"group:food_pot", "farming:pot"}, @@ -58,10 +60,13 @@ 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 = { - {"group:food_mortar_pestle", "group:food_corn_cooked", "group:food_baking_tray"}, + {tmp, "group:food_corn_cooked", tmp2}, {"", "group:food_bowl", ""}, }, replacements = { diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 9e3d314..02f68c0 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -48,8 +48,8 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {'farming:lettuce 2'}, rarity = 1}, - {items = {'farming:lettuce 1'}, rarity = 2} + {items = {"farming:lettuce 2"}, rarity = 1}, + {items = {"farming:lettuce 1"}, rarity = 2} } } minetest.register_node("farming:lettuce_5", table.copy(def)) diff --git a/crops/melon.lua b/crops/melon.lua index dd81ecb..52b41b3 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -20,9 +20,11 @@ minetest.register_craft({ } }) +local tmp = farming.use_utensils and "farming:cutting_board" or "" + minetest.register_craft({ output = "farming:melon_slice 4", - recipe = {{"farming:cutting_board", "farming:melon_8"}}, + recipe = {{"farming:melon_8", tmp}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) diff --git a/crops/mint.lua b/crops/mint.lua index a0057a5..2352f51 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -35,11 +35,13 @@ 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", "farming:juicer", ""} + {"group:food_water_glass", tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/onion.lua b/crops/onion.lua index 2b6fd91..1884bae 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -26,12 +26,14 @@ 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_pot", "group:food_onion"}, - {"", "group:food_bowl", ""} + {"group:food_onion", "group:food_bowl", "group:food_onion"}, + {"", tmp, ""} }, replacements = {{"farming:pot", "farming:pot"}} }) diff --git a/crops/pepper.lua b/crops/pepper.lua index b5a4298..38a4806 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -66,12 +66,14 @@ 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"}, - {"farming:mortar_pestle"}, - {"vessels:glass_bottle"} + {"vessels:glass_bottle"}, + {tmp} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index f77bf5e..738e65f 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -50,13 +50,15 @@ minetest.register_craftitem("farming:pineapple_juice", { groups = {vessel = 1, drink = 1} }) +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"}, - {"", "farming:juicer", ""}, - {"", "vessels:drinking_glass", ""} + {"", "vessels:drinking_glass", ""}, + {"", tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -67,8 +69,8 @@ minetest.register_craft({ output = "farming:pineapple_juice 2", recipe = { {"group:food_pineapple", ""}, - {"farming:juicer", ""}, - {"vessels:drinking_glass", "vessels:drinking_glass"} + {"vessels:drinking_glass", "vessels:drinking_glass"}, + {tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index b32b17f..030bf16 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -20,9 +20,11 @@ minetest.register_craft({ } }) +local tmp = farming.use_utensils and "farming:cutting_board" or "" + minetest.register_craft({ output = "farming:pumpkin_slice 4", - recipe = {{"farming:cutting_board", "farming:pumpkin"}}, + recipe = {{"farming:pumpkin", tmp}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 989b72b..af251a9 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -19,10 +19,12 @@ 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 = { - {"farming:baking_tray", "group:food_sugar", ""}, + {tmp, "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_wheat", "group:food_wheat", "group:food_wheat"} }, diff --git a/crops/rice.lua b/crops/rice.lua index 892278d..986f956 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -49,11 +49,13 @@ minetest.register_craftitem("farming:rice_flour", { groups = {food_rice_flour = 1, flammable = 1} }) +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", "farming:mortar_pestle", ""} + {"farming:rice", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index ad2d5bc..2dd47c7 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -22,11 +22,13 @@ 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", "farming:mortar_pestle", ""} + {"farming:rye", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -54,7 +56,7 @@ minetest.register_craft({ output = "farming:flour", recipe = { {"farming:oat", "farming:oat", "farming:oat"}, - {"farming:oat", "farming:mortar_pestle", ""} + {"farming:oat", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -72,7 +74,7 @@ minetest.register_craft({ output = "farming:flour_multigrain", recipe = { "farming:wheat", "farming:barley", "farming:oat", - "farming:rye", "farming:mortar_pestle" + "farming:rye", tmp }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/soy.lua b/crops/soy.lua index 13c20af..5b6b431 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -33,13 +33,14 @@ minetest.register_node("farming:soy_sauce", { sounds = default.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"}, - {"", "group:food_juicer", ""}, - {"", "bucket:bucket_water", "vessels:glass_bottle"} + {tmp, "bucket:bucket_water", "vessels:glass_bottle"} }, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, @@ -88,11 +89,13 @@ minetest.register_craftitem("farming:tofu", { on_use = minetest.item_eat(3) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:tofu", recipe = { - {"farming:baking_tray", "group:food_soy", "group:food_soy"}, - {"group:food_soy", "group:food_soy", "group:food_soy"} + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"group:food_soy", "group:food_soy", tmp} }, replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) diff --git a/crops/wheat.lua b/crops/wheat.lua index d59e7e0..bab1c44 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -78,11 +78,13 @@ 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", "farming:mortar_pestle", ""} + {"farming:wheat", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -110,9 +112,11 @@ minetest.register_craftitem("farming:bread_slice", { 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 = {{"group:food_cutting_board", "farming:bread"}}, + recipe = {{"farming:bread", tmp}}, replacements = {{"group:food_cutting_board", "farming:cutting_board"}} }) diff --git a/food.lua b/food.lua index ca1ed16..9738577 100644 --- a/food.lua +++ b/food.lua @@ -1,7 +1,8 @@ local S = farming.intllib +local tmp ---= filter sea water into river water +-- filter sea water into river water minetest.register_craft({ output = "bucket:bucket_river_water", @@ -12,7 +13,7 @@ minetest.register_craft({ } }) ---= glass of water +-- glass of water minetest.register_craftitem("farming:glass_water", { description = S("Glass of Water"), @@ -53,7 +54,7 @@ if minetest.get_modpath("bucket_wooden") then }) end ---= Sugar +-- Sugar minetest.register_craftitem("farming:sugar", { description = S("Sugar"), @@ -90,7 +91,7 @@ minetest.register_craft({ recipe = {{"farming:sugar_cube"}} }) ---= Sugar caramel +-- Sugar caramel minetest.register_craftitem("farming:caramel", { description = S("Caramel"), @@ -104,7 +105,7 @@ minetest.register_craft({ recipe = "group:food_sugar" }) ---= Salt +-- Salt minetest.register_node("farming:salt", { description = S("Salt"), @@ -172,7 +173,7 @@ minetest.register_craft({ replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} }) ---= Salt Crystal +-- Salt Crystal minetest.register_node("farming:salt_crystal", { description = ("Salt crystal"), @@ -191,10 +192,12 @@ 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", "farming:mortar_pestle"} + {"farming:salt_crystal", tmp} }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) @@ -208,7 +211,36 @@ minetest.register_craft({ } }) ---= Rose Water +-- Mayonnaise + +minetest.register_node("farming:mayonnaise", { + description = S("Mayonnaise"), + drawtype = "plantlike", + tiles = {"farming_mayo.png"}, + inventory_image = "farming_mayo.png", + wield_image = "farming_mayo.png", + paramtype = "light", + is_ground_content = false, + walkable = false, + on_use = minetest.item_eat(3), + selection_box = { + 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}, + sounds = default.node_sound_glass_defaults() +}) + +minetest.register_craft({ + output = "farming:mayonnaise", + recipe = { + {"group:food_olive_oil", "group:food_lemon"}, + {"group:food_egg", "farming:salt"} + }, + replacements = {{"farming:olive_oil", "vessels:glass_bottle"}} +}) + +-- Rose Water minetest.register_node("farming:rose_water", { description = S("Rose Water"), @@ -227,12 +259,14 @@ minetest.register_node("farming:rose_water", { } }) +tmp = farming.use_utensils and "farming:pot" or "" + minetest.register_craft({ output = "farming:rose_water", recipe = { {"flowers:rose", "flowers:rose", "flowers:rose"}, {"flowers:rose", "flowers:rose", "flowers:rose"}, - {"group:food_water_glass", "group:food_pot", "vessels:glass_bottle"} + {"group:food_water_glass", tmp, "vessels:glass_bottle"} }, replacements = { {"group:food_water_glass", "vessels:drinking_glass"}, @@ -240,7 +274,7 @@ minetest.register_craft({ } }) ---= Turkish Delight +-- Turkish Delight minetest.register_craftitem("farming:turkish_delight", { description = S("Turkish Delight"), @@ -263,7 +297,7 @@ minetest.register_craft({ } }) ---= Garlic Bread +-- Garlic Bread minetest.register_craftitem("farming:garlic_bread", { description = S("Garlic Bread"), @@ -279,7 +313,7 @@ minetest.register_craft({ } }) ---= Donuts (thanks to Bockwurst for making the donut images) +-- Donuts (thanks to Bockwurst for making the donut images) minetest.register_craftitem("farming:donut", { description = S("Donut"), @@ -324,7 +358,7 @@ minetest.register_craft({ } }) ---= Porridge Oats +-- Porridge Oats minetest.register_craftitem("farming:porridge", { description = S("Porridge"), @@ -344,7 +378,7 @@ minetest.register_craft({ } }) ---= Jaffa Cake +-- Jaffa Cake minetest.register_craftitem("farming:jaffa_cake", { description = S("Jaffa Cake"), @@ -352,10 +386,12 @@ minetest.register_craftitem("farming:jaffa_cake", { on_use = minetest.item_eat(6) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:jaffa_cake 3", recipe = { - {"farming:baking_tray", "group:food_egg", "group:food_sugar"}, + {tmp, "group:food_egg", "group:food_sugar"}, {"group:food_flour", "group:food_cocoa", "group:food_orange"}, {"group:food_milk", "", ""} }, @@ -375,11 +411,13 @@ minetest.register_craftitem("farming:apple_pie", { on_use = minetest.item_eat(6) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:apple_pie", recipe = { {"group:food_flour", "group:food_sugar", "group:food_apple"}, - {"", "group:food_baking_tray", ""} + {"", tmp, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) @@ -399,11 +437,13 @@ minetest.register_craftitem("farming:cactus_juice", { end }) +tmp = farming.use_utensils and "farming:juicer" or "" + minetest.register_craft({ output = "farming:cactus_juice", recipe = { + {tmp}, {"default:cactus"}, - {"farming:juicer"}, {"vessels:drinking_glass"} }, replacements = { @@ -419,10 +459,12 @@ minetest.register_craftitem("farming:pasta", { groups = {food_pasta = 1} }) +tmp = farming.use_utensils and "farming:mixing_bowl" or "" + minetest.register_craft({ output = "farming:pasta", recipe = { - {"group:food_flour", "group:food_butter", "group:food_mixing_bowl"} + {"group:food_flour", "group:food_butter", tmp} }, replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}} }) @@ -461,10 +503,12 @@ minetest.register_craftitem("farming:spaghetti", { on_use = minetest.item_eat(8) }) +tmp = farming.use_utensils and "farming:saucepan" or "" + minetest.register_craft({ output = "farming:spaghetti", recipe = { - {"group:food_pasta", "group:food_saucepan", "group:food_tomato"}, + {"group:food_pasta", "group:food_tomato", tmp}, {"group:food_garlic_clove", "group:food_garlic_clove", ""} }, replacements = {{"group:food_saucepan", "farming:saucepan"}} @@ -478,10 +522,12 @@ minetest.register_craftitem("farming:bibimbap", { on_use = minetest.item_eat(8, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ output = "farming:bibimbap", recipe = { - {"group:food_skillet", "group:food_bowl", "group:food_egg"}, + {tmp, "group:food_bowl", "group:food_egg"}, {"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"}, {"group:food_carrot", "group:food_chili_pepper", ""} }, @@ -492,7 +538,7 @@ minetest.register_craft({ output = "farming:bibimbap", type = "shapeless", recipe = { - "group:food_skillet", "group:food_bowl", "group:food_mushroom", + tmp, "group:food_bowl", "group:food_mushroom", "group:food_rice", "group:food_cabbage", "group:food_carrot", "group:food_mushroom", "group:food_chili_pepper" }, @@ -560,13 +606,15 @@ minetest.register_craftitem("farming:spanish_potatoes", { on_use = minetest.item_eat(8, "farming:bowl"), }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ type = "shapeless", output = "farming:spanish_potatoes", recipe = { "farming:potato", "group:food_parsley", "farming:potato", "group:food_egg", "group:food_flour", "farming:onion", - "farming:garlic_clove", "group:food_bowl", "group:food_skillet" + "farming:garlic_clove", "group:food_bowl", tmp }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -579,12 +627,14 @@ minetest.register_craftitem("farming:potato_omelet", { on_use = minetest.item_eat(6, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ - type = "shapeless", output = "farming:potato_omelet", recipe = { - "group:food_egg", "farming:potato", "group:food_onion", - "group:food_skillet", "group:food_bowl"}, + {"group:food_egg", "farming:potato", "group:food_onion"}, + {tmp, "group:food_bowl", ""} + }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -596,12 +646,14 @@ minetest.register_craftitem("farming:paella", { on_use = minetest.item_eat(8, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ - type = "shapeless", output = "farming:paella", recipe = { - "group:food_rice", "dye:orange", "farming:pepper_red", - "group:food_peas", "group:food_chicken", "group:food_bowl", "group:food_skillet" + {"group:food_rice", "dye:orange", "farming:pepper_red"}, + {"group:food_peas", "group:food_chicken", "group:food_bowl"}, + {"", tmp, ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -637,13 +689,14 @@ minetest.register_craftitem("farming:cheese_vegan", { groups = {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", "group:food_pot", ""} + {"group:food_gelatin", tmp, ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, @@ -657,7 +710,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", "group:food_pot", ""} + {"group:food_gelatin", tmp, ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, @@ -691,12 +744,14 @@ minetest.register_craftitem("farming:gyoza", { groups = {flammable = 2} }) +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", "group:food_flour"}, - {"", "group:food_skillet", ""} + {"", tmp, ""} }, replacements = { @@ -713,11 +768,13 @@ minetest.register_craftitem("farming:mochi", { groups = {flammable = 2} }) +tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:mochi", recipe = { + {"", tmp, ""}, {"group:food_rice", "group:food_sugar", "group:food_rice"}, - {"", "group:food_mortar_pestle", ""}, {"", "farming:glass_water", ""} }, replacements = { diff --git a/init.lua b/init.lua index 653a4b2..0ed1b55 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230407", + version = "20230713", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -20,7 +20,8 @@ farming = { registered_plants = {}, min_light = 12, max_light = 15, - mapgen = minetest.get_mapgen_setting("mg_name") + mapgen = minetest.get_mapgen_setting("mg_name"), + use_utensils = minetest.settings:get_bool("farming_use_utensils") ~= false } diff --git a/license.txt b/license.txt index a44cef2..b593297 100644 --- a/license.txt +++ b/license.txt @@ -174,6 +174,7 @@ Created by Felfa (CC0) farming_spanish_potatoes.png farming_vanilla_flan.png farming_sunflower*.png + farming_mayo.png Created by gorlock (CC0) farming_salt_crystal.png diff --git a/settingtypes.txt b/settingtypes.txt index 05f50af..7573de9 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,2 +1,4 @@ # Contains a value used for speed of crop growth in seconds farming_stage_length (Farming Stage Length) float 160.0 + +farming_use_utensils (Use utensil recipes) bool true diff --git a/textures/farming_mayo.png b/textures/farming_mayo.png new file mode 100644 index 0000000000000000000000000000000000000000..c8e773b9fd38043f47db61a77148336917884466 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyt^qzFt{_1L1>Ly$42E+U7>fI+ zG%_#*J%9e_|NsAM*RC~8K6mciob%^5|NnoEfnhHLLk|Ok(>XBb|9=KUhB^O}ljqD~ zm>l?TInW^Sk|4ie2B1zXU_*EDeV~$yo-U3d7QI&|pA>6W;Bn-TjQMX={X{zHef3i=2BpOI2clsQR4ODPOiSp1aNcc!}8I2ewvv zCe2gIU7Q=wXy`baRHh|$tPnbIxr8%kMn1E}e(q5214?s*5>@v++iCClJZ9SbmIGfH z4O_My;5A6dQq&hT-llqFt3Ybv Date: Thu, 13 Jul 2023 18:54:02 +0100 Subject: [PATCH 04/34] add gingerbread man, tweak pineapple drops --- README.md | 2 +- crops/pineapple.lua | 2 +- food.lua | 17 +++++++++++++++++ license.txt | 1 + textures/farming_gingerbread_man.png | Bin 0 -> 264 bytes 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 textures/farming_gingerbread_man.png diff --git a/README.md b/README.md index 8744844..901a3bb 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ on an older map are enabled and growing properly. ### Changelog: -- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa) +- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa), added gingerbread man - 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube - 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock) - 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 diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 738e65f..e2209aa 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -130,7 +130,7 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:pineapple"}, rarity = 1}, - {items = {"farming:pineapple"}, rarity = 5} + {items = {"farming:pineapple"}, rarity = 2} } } minetest.register_node("farming:pineapple_8", table.copy(def)) diff --git a/food.lua b/food.lua index 9738577..be02a29 100644 --- a/food.lua +++ b/food.lua @@ -782,3 +782,20 @@ minetest.register_craft({ {"farming:glass_water", "vessels:drinking_glass"} } }) + +-- Gingerbread Man + +minetest.register_craftitem("farming:gingerbread_man", { + description = S("Gingerbread Man"), + inventory_image = "farming_gingerbread_man.png", + on_use = minetest.item_eat(2) +}) + +minetest.register_craft({ + output = "farming:gingerbread_man 3", + recipe = { + {"", "group:food_egg", ""}, + {"group:food_wheat", "group:food_ginger", "group:food_wheat"}, + {"group:food_sugar", "", "group:food_sugar"} + } +}) diff --git a/license.txt b/license.txt index b593297..546853f 100644 --- a/license.txt +++ b/license.txt @@ -142,6 +142,7 @@ Created by TenPlus1 (CC BY 3.0) farming_rhubarb.png farming_hemp*.png farming_tofu*.png + farming_gingerbread_man.png Created by ademant (CC-BY-3.0) farming_rye*.png diff --git a/textures/farming_gingerbread_man.png b/textures/farming_gingerbread_man.png new file mode 100644 index 0000000000000000000000000000000000000000..f037ae20da0ae704704e55d24c6f620a789d0725 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`=RI8l3f=@DxUjkG@F}%h3`vZB%zCnSTc`G3Z|Kbm`ft9< z^Djux$Jf*I3qG!o-)H#ae$_FK$?n$6G>eCVnEX&!Kr}2m<6mwQtOc3cc5P!g|^F!tOr+mdK II;Vst0OVq8tN;K2 literal 0 HcmV?d00001 From e6d31c9442b32fc6bfdcf9d0b8977f7388f4abbf Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 8 Aug 2023 17:31:31 +0100 Subject: [PATCH 05/34] remove intllib --- depends.txt | 5 -- description.txt | 1 - init.lua | 26 ++---- locale/de.txt | 196 ---------------------------------------- locale/es.txt | 195 ---------------------------------------- locale/fr.txt | 196 ---------------------------------------- locale/it.txt | 194 ---------------------------------------- locale/pt.txt | 195 ---------------------------------------- locale/ru.txt | 212 -------------------------------------------- locale/template.txt | 194 ---------------------------------------- locale/zh_CN.txt | 119 ------------------------- locale/zh_TW.txt | 119 ------------------------- mod.conf | 2 +- 13 files changed, 9 insertions(+), 1645 deletions(-) delete mode 100644 depends.txt delete mode 100644 description.txt delete mode 100644 locale/de.txt delete mode 100644 locale/es.txt delete mode 100644 locale/fr.txt delete mode 100644 locale/it.txt delete mode 100644 locale/pt.txt delete mode 100644 locale/ru.txt delete mode 100644 locale/template.txt delete mode 100644 locale/zh_CN.txt delete mode 100644 locale/zh_TW.txt diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 650885b..0000000 --- a/depends.txt +++ /dev/null @@ -1,5 +0,0 @@ -default -stairs? -intllib? -lucky_block? -toolranks? diff --git a/description.txt b/description.txt deleted file mode 100644 index 58bdc81..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds many plants and food to Minetest \ No newline at end of file diff --git a/init.lua b/init.lua index 0ed1b55..2d47e2c 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230713", + version = "20230808", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -36,24 +36,14 @@ local statistics = dofile(farming.path .. "/statistics.lua") -- Intllib local S -if minetest.get_translator ~= nil then +if minetest.get_translator then S = minetest.get_translator("farming") -- 5.x translation function -else - if minetest.get_modpath("intllib") then - dofile(minetest.get_modpath("intllib") .. "/init.lua") - if intllib.make_gettext_pair then - gettext, ngettext = intllib.make_gettext_pair() -- new gettext method - else - gettext = intllib.Getter() -- old text file method - end - S = gettext - else -- boilerplate function - S = function(str, ...) - local args = {...} - return str:gsub("@%d+", function(match) - return args[tonumber(match:sub(2))] - end) - end +else -- boilerplate function + S = function(str, ...) + local args = {...} + return str:gsub("@%d+", function(match) + return args[tonumber(match:sub(2))] + end) end end diff --git a/locale/de.txt b/locale/de.txt deleted file mode 100644 index b06202d..0000000 --- a/locale/de.txt +++ /dev/null @@ -1,196 +0,0 @@ -# German translation of the farming mod by TenPlus1 -# textdomain: farming -# author: Xanthin -# author: TheDarkTiger -# author: SwissalpS -# last update: 2022/Feb/26 - -###### folder . ###### - -### init.lua ### -Seed=Saatgut - -### compatibility.lua ### -Banana=Banane -Banana Leaves=Bananenblätter -Orange=Apfelsine -Strawberry=Erdbeere - -### food.lua ### -Sugar=Zucker -Salt=Salz -Rose Water=Rosenwasser -Turkish Delight=Lokum -Garlic Bread=Knoblauchbrot -Donut=Donut -Chocolate Donut=Schokodonut -Apple Donut=Apfeldonut -Porridge=Haferbrei -Jaffa Cake=Jaffakeks - -### hoes.lua ### -Hoe=Hacke -Wooden Hoe=Holzhacke -Stone Hoe=Steinhacke -Steel Hoe=Stahlhacke -Bronze Hoe=Bronzehacke -Mese Hoe=Mesehacke -Diamond Hoe=Diamanthacke -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen) -Mithril Scythe (Right-click to harvest and replant crops)=Mithril-Sense (Rechts-Klick zum Ernten und Wiedereinpflanzen) -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### -Soil=Ackerboden -Wet Soil=Bewässerter Ackerboden - -### utensils.lua ### -Wooden Bowl=Holzschale -Saucepan=Kasserolle -Cooking Pot=Kochtopf -Baking Tray=Kuchenblech -Skillet=Bratpfanne -Mortar and Pestle=Mörser und Stößel -Cutting Board=Schneidebrett -Juicer=Entsafter -Glass Mixing Bowl=Glasschüssel - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Gerstenkörner -Barley=Gerste - -### beans.lua ### -Green Beans=Grüne Bohnen -Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen) - -### beetroot.lua ### -Beetroot=Rote Beete -Beetroot Soup=Rote Beete Suppe - -### blueberry.lua ### -Blueberries=Blaubeeren -Blueberry Muffin=Blaubeermuffin -Blueberry Pie=Blaubeerkuchen - -### carrot.lua ## -Carrot=Möhre -Carrot Juice=Möhrensaft -Golden Carrot=Goldene Möhre - -### chili.lua ### -Chili Pepper=Chili -Bowl of Chili=Chili Schale - -### cocoa.lua ### -Cocoa Beans=Kakaobohne -Cookie=Keks -Bar of Dark Chocolate=Tafel Zartbitterschokolade -Chocolate Block=Schokoladenstück - -### coffee.lua ### -Coffee Beans=Kaffeebohnen -Cup of Coffee=Tasse Kaffee - -### corn.lua ### -Corn=Mais -Corn on the Cob=Maiskolben -Cornstarch=Speisestärke -Bottle of Ethanol=Flasche Ethanol - -### cotton.lua ### -Cotton Seed=Baumwollsamen -Cotton=Baumwolle -String=Faden - -### cucumber.lua ### -Cucumber=Gurke - -### garlic.lua ### -Garlic clove=Knoblauchzehe -Garlic=Knoblauch -Garlic Braid=Knoblauchzopf - -### grapes.lua ### -Grapes=Weintrauben -Trellis (place on soil before planting grapes)=Spalier (vor dem Pflanzen der Weintrauben auf den\nAckerboden stellen) - -### hemp.lua ### -Hemp Seed=Hanfsamen -Hemp Leaf=Hanfblatt -Bottle of Hemp Oil=Flasche mit Hanföl -Hemp Fibre=Hanffaser -Hemp Block=Hanfblock -Hemp Rope=Hanfseil - -### melon.lua ### -Melon Slice=Melonenscheibe -Melon=Melone - -### onion.lua ### -Onion=Zwiebel - -### peas.lua ### -Pea Pod=Erbsenschote -Peas=Erbsen -Pea Soup=Erbsensuppe - -### pepper.lua ### -Peppercorn=Pfefferkorn -Pepper=Pfeffer -Ground Pepper=Gemahlener Pfeffer - -### pinapple.lua ### -Pineapple Top=Ananasdeckel -Pineapple=Ananas -Pineapple Ring=Ananasscheibe -Pineapple Juice=Ananassaft - -### potato.lua ### -Potato=Kartoffel -Baked Potato=Ofenkartoffel -Cucumber and Potato Salad=Gurken und Tomatensalat - -### pumpkin.lua ### -Pumpkin Slice=Kürbisscheibe -Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten) -Scarecrow Bottom=Vogelscheuchengestell -Pumpkin Bread=Kürbisbrot -Pumpkin Dough=Kürbisteig -Pumpkin=Kürbis - -### raspberry.lua ### -Raspberries=Himbeeren -Raspberry Smoothie=Himbeersmoothie - -### rhubarb.lua ### -Rhubarb=Rhabarber -Rhubarb Pie=Rhabarberkuchen - -### ryeoatrice.lua ### -Rye=Roggen -Rye seed=Roggensaat -Oat=Hafer -Oat seed=Hafersamen -Rice=Reis -Rice grains=Reissaat -Rice Bread=Reiswaffel -Rice Flour=Reismehl -Multigrain Flour=Mehrkornmehl -Multigrain Bread=Mehrkornbrot - -### tomato.lua ### -Tomato=Tomate - -### wheat.lua ### -Wheat Seed=Weizenkörner -Wheat=Weizen -Straw=Stroh -Flour=Mehl -Bread=Brot -Sliced Bread=Geschnittenes Brot -Toast=Toast -Toast Sandwich=Toast Sandwich diff --git a/locale/es.txt b/locale/es.txt deleted file mode 100644 index f5e1ebc..0000000 --- a/locale/es.txt +++ /dev/null @@ -1,195 +0,0 @@ -# Translation of the farming mod by TenPlus1 -# textdomain: farming -# author: PICCORO Lenz McKAY -# author: SwissalpS -# last update: 2022/Feb/26 - -###### folder . ###### - -### init.lua ### -Seed=Semilla - -### compatibility.lua ### -Banana=Banana -Banana Leaves=Hojas de banana -Orange=Naranja -Strawberry=Fresa - -### food.lua ### -Sugar=Azúcar -Salt=Sal -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 - -### hoes.lua ### -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 -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar) -Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos) -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### -Soil=Suelo -Wet Soil=Suelo mojado - -### utensils.lua ### -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 - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Semilla de cebada -Barley=Cebada - -### beans.lua ### -Green Beans=Frijoles verdes -Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles) - -### beetroot.lua ### -Beetroot=Remolacha -Beetroot Soup=Sopa de remolacha - -### blueberry.lua ### -Blueberries=Arándanos -Blueberry Muffin=Muffin de arándanos -Blueberry Pie=Pastel de arándanos - -### carrot.lua ## -Carrot=Zanahoria -Carrot Juice=Jugo de zanahoria -Golden Carrot=Zanahoria dorada - -### chili.lua ### -Chili Pepper=Ají picante -Bowl of Chili=Tazón de chili - -### cocoa.lua ### -Cocoa Beans=Granos de cacao -Cookie=Galleta -Bar of Dark Chocolate=Barra de chocolate negro -Chocolate Block=Bloque de chocolate - -### coffee.lua ### -Coffee Beans=Granos de café -Cup of Coffee=Taza de café - -### corn.lua ### -Corn=Maíz -Corn on the Cob=Mazorca de maíz -Cornstarch=Almidón de maíz -Bottle of Ethanol=Botella de etanol - -### cotton.lua ### -Cotton Seed=Semilla de algodón -Cotton=Algodón -String=Guita - -### cucumber.lua ### -Cucumber=Pepino - -### garlic.lua ### -Garlic clove=Diente de ajo -Garlic=Ajo -Garlic Braid=Trenza de ajo - -### grapes.lua ### -Grapes=Uvas -Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas) - -### hemp.lua ### -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 - -### melon.lua ### -Melon Slice=Rebanada de sandía -Melon=Sandía - -### onion.lua ### -Onion=Cebolla - -### peas.lua ### -Pea Pod=Vaina de guisantes -Peas=Guisantes -Pea Soup=Sopa de guisantes - -### pepper.lua ### -Peppercorn=Grano de pimienta -Pepper=Pimienta -Ground Pepper=Pimienta molida - -### pinapple.lua ### -Pineapple Top=Tapa de piña -Pineapple=Piña -Pineapple Ring=Anillo de piña -Pineapple Juice=Jugo de piña - -### potato.lua ### -Potato=Patata -Baked Potato=Patata al horno -Cucumber and Potato Salad=Ensalada de pepino y patata - -### pumpkin.lua ### -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 -Pumpkin=Calabaza - -### raspberry.lua ### -Raspberries=Frambuesa -Raspberry Smoothie=Batido de frambuesa - -### rhubarb.lua ### -Rhubarb=Ruibarbo -Rhubarb Pie=Pastel de ruibarbo - -### ryeoatrice.lua ### -Rye=Centeno -Rye seed=Semilla de centeno -Oat=Avena -Oat seed=Semilla de avena -Rice=Arroz -Rice grains=Granos de arroz -Rice Bread=Pan de arroz -Rice Flour=Harina de arroz -Multigrain Flour=Harina multigrano -Multigrain Bread=Pan multicereales - -### tomato.lua ### -Tomato=Tomate - -### wheat.lua ### -Wheat Seed=Semilla de trigo -Wheat=Trigo -Straw=Paja -Flour=Harina -Bread=Pan -Sliced Bread=Pan rebanado -Toast=Tostadas -Toast Sandwich=Emparedado de tostadas diff --git a/locale/fr.txt b/locale/fr.txt deleted file mode 100644 index 95559a7..0000000 --- a/locale/fr.txt +++ /dev/null @@ -1,196 +0,0 @@ -# Traduction Française du mod farming par TenPlus1 -# textdomain: farming -# author: Papaou30 -# author: TheDarkTiger -# author: SwissalpS -# last update: 2022/Feb/26 - -###### folder . ###### - -### init.lua ### -Seed=Graine - -### compatibility.lua ### -Banana=Banane -Banana Leaves=Feuilles de banane -Orange=Orange -Strawberry=Fraise - -### food.lua ### -Sugar=Sucre -Salt=Sel -Rose Water=Eau de rose -Turkish Delight=Douceur turque -Garlic Bread=Pain à l'ail -Donut=Beignet -Chocolate Donut=Beignet au chocolat -Apple Donut=Beignet aux pommes -Porridge=Gruau de céréales -Jaffa Cake=Petit gâteau à l'orange "Jaffa" - -### hoes.lua ### -Hoe=Binette -Wooden Hoe=Binette en bois -Stone Hoe=Binette en pierre -Steel Hoe=Binette en acier -Bronze Hoe=Binette en bronze -Mese Hoe=Binette en mese -Diamond Hoe=Binette en diamant -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) -Mithril Scythe (Right-click to harvest and replant crops)=Faux en mithril (Récolte et replante des graines) -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### -Soil=Terre binnée -Wet Soil=Terre humide et binnée - -### utensils.lua ### -Wooden Bowl=Bol en bois -Saucepan=Casserole -Cooking Pot=Marmitte -Baking Tray=Lèche-frite -Skillet=Poêle -Mortar and Pestle=Mortier et pilon -Cutting Board=Planche à découper -Juicer=Presse-agrumes -Glass Mixing Bowl=Terrine en verre - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Graine d'orge -Barley=Orge - -### beans.lua ### -Green Beans=Haricots verts -Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots) - -### beetroot.lua ### -Beetroot=Betterave -Beetroot Soup=Soupe de betterave - -### blueberry.lua ### -Blueberries=Myrtilles -Blueberry Muffin=Muffin aux myrtilles -Blueberry Pie=Tarte aux myrtilles - -### carrot.lua ## -Carrot=Carotte -Carrot Juice=Jus de carotte -Golden Carrot=Carotte dorée - -### chili.lua ### -Chili Pepper=Piment fort -Bowl of Chili=Bol de chilli - -### cocoa.lua ### -Cocoa Beans=Fèves de cacao -Cookie=Biscuit -Bar of Dark Chocolate=Tablette de chocolat noir -Chocolate Block=Bloc de chocolat - -### coffee.lua ### -Coffee Beans=Grains de café -Cup of Coffee=Tasse de café - -### corn.lua ### -Corn=Maïs -Corn on the Cob=Cobette (maïs cuit) -Cornstarch=Fécule de maïs -Bottle of Ethanol=Bouteille d'éthanol - -### cotton.lua ### -Cotton Seed=Graines de coton -Cotton=Coton -String=Ficelle - -### cucumber.lua ### -Cucumber=Concombre - -### garlic.lua ### -Garlic clove=Gousse d'ail -Garlic=Tête d'ail -Garlic Braid=Ail tressé - -### grapes.lua ### -Grapes=Raisins -Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne) - -### hemp.lua ### -Hemp Seed=Graines de chanvre -Hemp Leaf=Feuille de chanvre -Bottle of Hemp Oil=Bouteille d'huile de chanvre -Hemp Fibre=Fibre de chanvre -Hemp Block=Bloc de chanvre -Hemp Rope=Corde de chanvre - -### melon.lua ### -Melon Slice=Tranche de melon -Melon=Melon - -### onion.lua ### -Onion=Oignon - -### peas.lua ### -Pea Pod=Cosse de petit-pois -Peas=Petit-pois -Pea Soup=Soupe de petit-pois - -### pepper.lua ### -Peppercorn=Grain de poivre -Pepper=Poivron -Ground Pepper=Poivre moulu - -### pinapple.lua ### -Pineapple Top=Pousse d'ananas -Pineapple=Ananas -Pineapple Ring=Tranche d'ananas -Pineapple Juice=Jus d'ananas - -### potato.lua ### -Potato=Pomme de terre -Baked Potato=Pomme de terre cuite -Cucumber and Potato Salad=Salade de pomme de terre et concombre - -### pumpkin.lua ### -Pumpkin Slice=Tranche de citrouille -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre) -Scarecrow Bottom=Base d'épouventail -Pumpkin Bread=Pain à la citrouille -Pumpkin Dough=Pâton de pain à la citrouille -Pumpkin=Citrouille - -### raspberry.lua ### -Raspberries=Framboises -Raspberry Smoothie=Smoothie aux framboises - -### rhubarb.lua ### -Rhubarb=Rhubarbe -Rhubarb Pie=Tarte à la rhubarbe - -### ryeoatrice.lua ### -Rye=Seigle -Rye seed=Grains de seigle -Oat=Orge -Oat seed=Grains d'orge -Rice=Riz -Rice grains=Grain de riz -Rice Bread=Pain de riz -Rice Flour=Farine de riz -Multigrain Flour=Farine multi-céréales -Multigrain Bread=Pain aux céréales - -### tomato.lua ### -Tomato=Tomate - -### wheat.lua ### -Wheat Seed=Grain de blé -Wheat=Blé -Straw=Paille -Flour=Farine -Bread=Pain -Sliced Bread=Tranche de pain -Toast=Pain grillé -Toast Sandwich=Sandwich au pain grillé diff --git a/locale/it.txt b/locale/it.txt deleted file mode 100644 index cbb6a2d..0000000 --- a/locale/it.txt +++ /dev/null @@ -1,194 +0,0 @@ -# Translation of the farming mod by TenPlus1 -# textdomain: farming -# author: (Hamlet) -# last update: 2020/Jun/02 - -###### folder . ###### - -### init.lua ### -Seed=Seme - -### compatibility.lua ### -Banana=Banana -Banana Leaves=Foglie di banano -Orange=Arancia -Strawberry=Fragola - -### food.lua ### -Sugar=Zucchero -Salt=Sale -Rose Water=Acqua di rose -Turkish Delight=Lokum -Garlic Bread=Pane all'aglio -Donut=Ciambella -Chocolate Donut=Ciambella al cioccolato -Apple Donut=Ciambella alla mela -Porridge=Porridge -Jaffa Cake=Torta di jaffa - -### hoes.lua ### -Hoe=Zappa -Wooden Hoe=Zappa di legno -Stone Hoe=Zappa di pietra -Steel Hoe=Zappa d'acciaio -Bronze Hoe=Zappa di bronzo -Mese Hoe=Zappa di mese -Diamond Hoe=Zappa di diamante -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba zappa (usala o lanciala sulle aree erbose per zappare il terreno) -Mithril Scythe (Right-click to harvest and replant crops)=Falce di mithril (clicca col destro per raccogliere e ripiantare le prose) -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### -Soil=Terreno coltivabile -Wet Soil=Terreno coltivabile bagnato - -### utensils.lua ### -Wooden Bowl=Ciotola di legno -Saucepan=Casseruola -Cooking Pot=Pentola da cottura -Baking Tray=Teglia da forno -Skillet=Padella -Mortar and Pestle=Mortaio e pestello -Cutting Board=Tagliere -Juicer=Spremiagrumi -Glass Mixing Bowl=Terrina di vetro - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Seme d'orzo -Barley=Orzo - -### beans.lua ### -Green Beans=Fagiolini -Bean Pole (place on soil before planting beans)=Palina per fagiolini (mettila sul terreno coltivabile prima di piantare i fagiolini) - -### beetroot.lua ### -Beetroot=Barbabietola -Beetroot Soup=Zuppa di barbabietola - -### blueberry.lua ### -Blueberries=Mirtilli -Blueberry Muffin=Focaccina di mirtilli -Blueberry Pie=Tortino di mirtilli - -### carrot.lua ## -Carrot=Carota -Carrot Juice=Succo di carota -Golden Carrot=Carota d'oro - -### chili.lua ### -Chili Pepper=Peperoncino -Bowl of Chili=Ciotola di peperoncino - -### cocoa.lua ### -Cocoa Beans=Chicchi di cacao -Cookie=Biscotto -Bar of Dark Chocolate=Barra di cioccolato fondente -Chocolate Block=Blocco di cioccolato - -### coffee.lua ### -Coffee Beans=Chicchi di caffè -Cup of Coffee=Tazza di caffè - -### corn.lua ### -Corn=Mais -Corn on the Cob=Pannocchia arrostita -Cornstarch=Amido di mais -Bottle of Ethanol=Bottiglia di alcol etilico - -### cotton.lua ### -Cotton Seed=Seme di cotone -Cotton=Cotone -String=Filo - -### cucumber.lua ### -Cucumber=Cetriolo - -### garlic.lua ### -Garlic clove=Spicchio d'aglio -Garlic=Aglio -Garlic Braid=Treccia d'aglio - -### grapes.lua ### -Grapes=Chicchi d'uva -Trellis (place on soil before planting grapes)=Graticcio (mettilo sul terreno coltivabile prima di piantare i chicchi d'uva) - -### hemp.lua ### -Hemp Seed=Seme di canapa -Hemp Leaf=Foglia di canapa -Bottle of Hemp Oil=Bottiglia d'olio di canapa -Hemp Fibre=Fibra di canapa -Hemp Block=Blocco di canapa -Hemp Rope=Corda di canapa - -### melon.lua ### -Melon Slice=Fetta d'anguria -Melon=Anguria - -### onion.lua ### -Onion=Cipolla - -### peas.lua ### -Pea Pod=Baccello di piselli -Peas=Piselli -Pea Soup=Zuppa di piselli - -### pepper.lua ### -Peppercorn=Grano di pepe -Pepper=Pepe -Ground Pepper=Pepe macinato - -### pinapple.lua ### -Pineapple Top=Cima d'ananas -Pineapple=Ananas -Pineapple Ring=Anello d'ananas -Pineapple Juice=Succo d'ananas - -### potato.lua ### -Potato=Patata -Baked Potato=Patata arrostita -Cucumber and Potato Salad=Insalata di patate e cetrioli - -### pumpkin.lua ### -Pumpkin Slice=Fetta di zucca -Jack 'O Lantern (punch to turn on and off)=Jack Lanterna (colpirlo per accenderlo e spegnerlo) -Scarecrow Bottom=Fondo dello spaventapasseri -Pumpkin Bread=Pane alla zucca -Pumpkin Dough=Pasta di zucca -Pumpkin=Zucca - -### raspberry.lua ### -Raspberries=Lamponi -Raspberry Smoothie=Purea di lamponi - -### rhubarb.lua ### -Rhubarb=Rabarbaro -Rhubarb Pie=Tortino al rabarbaro - -### ryeoatrice.lua ### -Rye=Segale -Rye seed=Seme di segale -Oat=Avena -Oat seed=Seme d'avena -Rice=Riso -Rice grains=Chicchi di riso -Rice Bread=Pane di riso -Rice Flour=Farina di riso -Multigrain Flour=Farina multicereale -Multigrain Bread=Pane multicereale - -### tomato.lua ### -Tomato=Pomodoro - -### wheat.lua ### -Wheat Seed=Seme di grano -Wheat=Grano -Straw=Paglia -Flour=Farina -Bread=Pane -Sliced Bread=Pane a fette -Toast=Pane tostato -Toast Sandwich=Panino di pane tostato diff --git a/locale/pt.txt b/locale/pt.txt deleted file mode 100644 index a4c504c..0000000 --- a/locale/pt.txt +++ /dev/null @@ -1,195 +0,0 @@ -# Portuguese translation of the farming mod by TenPlus1 -# textdomain: farming -# author: BrunoMine -# author: TheDarkTiger -# last update: 2020/Apr/26 - -###### folder . ###### - -### init.lua ### -Seed=Sementes - -### compatibility.lua ### -Banana= -Banana Leaves= -Orange= -Strawberry= - -### food.lua ### -Sugar=Açucar -Salt= -Rose Water= -Turkish Delight= -Garlic Bread= -Donut=Donut -Chocolate Donut=Donut de Chocolate -Apple Donut=Donut de Maça -Porridge= -Jaffa Cake= - -### hoes.lua ### -Hoe=Enxada -Wooden Hoe=Enxada de Madeira -Stone Hoe=Enxada de Pedra -Steel Hoe=Enxada de Aço -Bronze Hoe=Enxada de Bronze -Mese Hoe=Enxada de Mese -Diamond Hoe=Enxada de Diamante -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)= -Mithril Scythe (Right-click to harvest and replant crops)= -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### -Soil=Solo -Wet Soil=Solo Seco - -### utensils.lua ### -Wooden Bowl= -Saucepan= -Cooking Pot= -Baking Tray= -Skillet= -Mortar and Pestle= -Cutting Board= -Juicer= -Glass Mixing Bowl= - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Sementes de Cevada -Barley=Cevada - -### beans.lua ### -Green Beans=Feijoes Verdes -Bean Pole (place on soil before planting beans)=Apoio de feijao (coloque no solo antes de plantar feijao) - -### beetroot.lua ### -Beetroot= -Beetroot Soup= - -### blueberry.lua ### -Blueberries=Mirtilos -Blueberry Muffin=Muffin de Mirtilos -Blueberry Pie= - -### carrot.lua ## -Carrot=Cenoura -Carrot Juice= -Golden Carrot=Cenoura Dourada - -### chili.lua ### -Chili Pepper= -Bowl of Chili= - -### cocoa.lua ### -Cocoa Beans=Amendoas de Cacau -Cookie=Cookie -Bar of Dark Chocolate=Barra de Chocolate Preto -Chocolate Block= - -### coffee.lua ### -Coffee Beans=Grao de Cafe -Cup of Coffee=Xicara de Cafe - -### corn.lua ### -Corn=Milho -Corn on the Cob=Espiga de Milho -Cornstarch= -Bottle of Ethanol=Garrafa de Etanol - -### cotton.lua ### -Cotton Seed=Sementes de Algodao -Cotton=Algodao -String= - -### cucumber.lua ### -Cucumber=Pepino - -### garlic.lua ### -Garlic clove= -Garlic= -Garlic Braid= - -### grapes.lua ### -Grapes=Uvas -Trellis (place on soil before planting grapes)=Grade de Ripas (colocar no solo antes de plantar uvas) - -### hemp.lua ### -Hemp Seed=Sementes de Canhamo -Hemp Leaf=Folha de Canhamo -Bottle of Hemp Oil=Garrafa de Oleo de Canhamo -Hemp Fibre=Fibra de Canhamo -Hemp Block= -Hemp Rope=Corda de Canhamo - -### melon.lua ### -Melon Slice=Sementes de Melancia -Melon=Melancia - -### onion.lua ### -Onion= - -### peas.lua ### -Pea Pod= -Peas= -Pea Soup= - -### pepper.lua ### -Peppercorn= -Pepper= -Ground Pepper= - -### pinapple.lua ### -Pineapple Top= -Pineapple= -Pineapple Ring= -Pineapple Juice= - -### potato.lua ### -Potato=Batata -Baked Potato=Batata Cozida -Cucumber and Potato Salad= - -### pumpkin.lua ### -Pumpkin Slice=Pedaço de Abobora -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Socos para ligar e desligar) -Scarecrow Bottom= -Pumpkin Bread=Pao de Abobora -Pumpkin Dough=Massa de Abobora -Pumpkin=Abobora - -### raspberry.lua ### -Raspberries=Framboesa -Raspberry Smoothie=Batida de Framboesa - -### rhubarb.lua ### -Rhubarb=Ruibarbo -Rhubarb Pie=Torta de Ruibarbo - -### ryeoatrice.lua ### -Rye= -Rye seed= -Oat= -Oat seed= -Rice= -Rice grains= -Rice Bread= -Rice Flour= -Multigrain Flour= -Multigrain Bread= - -### tomato.lua ### -Tomato=Tomate - -### wheat.lua ### -Wheat Seed=Sementes de Trigo -Wheat=Trigo -Straw=Palha -Flour=Farinha -Bread=Pao -Sliced Bread= -Toast= -Toast Sandwich= diff --git a/locale/ru.txt b/locale/ru.txt deleted file mode 100644 index 8a181f5..0000000 --- a/locale/ru.txt +++ /dev/null @@ -1,212 +0,0 @@ -# Russian translation of the farming mod by TenPlus1 -# textdomain: farming -# author: codexp -# author: TheDarkTiger -# author: YELLOW -# last update: 2020/Jun/20 - -###### folder . ###### - -### init.lua ### -Seed=Семена - -### compatibility.lua ### -Banana=Банан -Banana Leaves=Листья банана -Orange=Апельсин -Strawberry=Земляника - -### food.lua ### -Sugar=Сахар -Salt=Соль -Rose Water=Розовая вода -Turkish Delight=Рахат-лукум -Garlic Bread=Чесночный хлеб -Donut=Пончик -Chocolate Donut=Шоколадный пончик -Apple Donut=Яблочный пончик -Porridge=Каша -Jaffa Cake=Яффский пирог -Apple Pie=Яблочный пирог -Cactus Juice=Кактусовый сок - -### hoes.lua ### -Hoe=Мотыга -Wooden Hoe=Деревянная мотыга -Stone Hoe=Каменная мотыга -Steel Hoe=Стальная мотыга -Bronze Hoe=Бронзовая мотыга -Mese Hoe=Магическая мотыга -Diamond Hoe=Алмазная мотыга -# Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Мотыгобомба (используйте или бросьте на траву для ее обработки) -Mithril Scythe (Right-click to harvest and replant crops)=Мифриловая коса (Щелкните правой кнопкой мыши для сбора и пересадки растений) -# Surcharge du mod [Toolranks] à faire # -%s Hoe=%s мотыга -Silver=Серебряная -Mithril=Мифриловая -Silver Hoe=Серебряная -Mithril Hoe=Мифриловая - -### soil.lua ### -Soil=Земля -Wet Soil=Увлажненная земля -Savanna Soil=Земля саванны -Wet Savanna Soil=Увлажненная земля саванны - -### utensils.lua ### -Wooden Bowl=Деревянная миска -Saucepan=Кастрюля -Cooking Pot=Котел -Baking Tray=Противень -Skillet=Сковорода -Mortar and Pestle=Ступка и пестик -Cutting Board=Разделочная доска -Juicer=Соковыжималка -Glass Mixing Bowl=Стеклянная чаша - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Семена ячменя -Barley=Ячмень - -### beans.lua ### -Green Beans=Зеленая фасоль -Bean Pole (place on soil before planting beans)=Жердь для бобовых (установите на почву перед посадкой бобовых) - -### beetroot.lua ### -Beetroot=Свекла -Beetroot Soup=Борщ - -### blueberry.lua ### -Blueberries=Голубика -Blueberry Muffin=Кекс с голубикой -Blueberry Pie=Пирог с голубикой - -### carrot.lua ## -Carrot=Морковь -Carrot Juice=Морковный сок -Golden Carrot=Золотая морковь - -### chili.lua ### -Chili Pepper=Перец чили -Bowl of Chili=Миска чили - -### cocoa.lua ### -Cocoa Beans=Какао-бобы -Cookie=Печенье -Bar of Dark Chocolate=Плитка темного шоколада -Chocolate Block=Шоколадный блок - -### coffee.lua ### -Coffee Beans=Кофейные зерна -Cup of Coffee=Чашка кофе - -### corn.lua ### -Corn=Кукуруза -Corn on the Cob=Початок кукурузы -Cornstarch=Кукурузный крахмал -Bottle of Ethanol=Бутылка спирта - -### cotton.lua ### -Wild Cotton=Дикорастущий хлопок -Cotton Seed=Семена хлопка -Cotton=Хлопок -String=Нить - -### cucumber.lua ### -Cucumber=Огурец - -### garlic.lua ### -Garlic clove=Зубчик чеснока -Garlic=Чеснок -Garlic Braid=Связка чеснока - -### grapes.lua ### -Grapes=Виноград -Trellis (place on soil before planting grapes)=Решетка (поставьте на почву перед посадкой винограда) - -### hemp.lua ### -Hemp Seed=Семена конопли -Hemp Leaf=Лист конопли -Bottle of Hemp Oil=Бутылка конопляного масла -Hemp Fibre=Конопляное волокно -Hemp Block=Блок конопли -Hemp Rope=Пеньковая веревка - -### melon.lua ### -Melon Slice=Долька арбуза -Melon=Арбуз - -### mint.lua ### -Mint Seeds=Семена мяты -Mint Leaf=Лист мяты -Mint Tea=Чай с мятой - -### onion.lua ### -Onion=Лук -Onion Soup=Луковый суп - -### peas.lua ### -Pea Pod=Стручок гороха -Peas=Горох -Pea Soup=Гороховый суп - -### pepper.lua ### -Peppercorn=Перчинка -Pepper=Перец -Ground Pepper=Молотый перец - -### pinapple.lua ### -Pineapple Top=Верхушка ананаса -Pineapple=Ананас -Pineapple Ring=Кольцо ананаса -Pineapple Juice=Ананасовый сок - -### potato.lua ### -Potato=Картофель -Baked Potato=Печеный картофель -Cucumber and Potato Salad=Салат из огурцов и картофеля - -### pumpkin.lua ### -Pumpkin Slice=Ломтик тыквы -Jack 'O Lantern (punch to turn on and off)=Светильник джека (удар для включения и выключения) -Scarecrow Bottom=Основание пугала -Pumpkin Bread=Тыквенный хлеб -Pumpkin Dough=Тыквенное тесто -Pumpkin=Тыква - -### raspberry.lua ### -Raspberries=Малина -Raspberry Smoothie=Малиновый смузи - -### rhubarb.lua ### -Rhubarb=Ревень -Rhubarb Pie=Пирог с ревенем - -### ryeoatrice.lua ### -Rye=Рожь -Rye seed=Зёрна ржи -Oat=Овес -Oat seed=Семена овса -Rice grains=Зёрна риса -Rice=Рис -Rice Bread=Рисовый хлеб -Rice Flour=Рисовая мука -Multigrain Flour=Мультизерновая мука -Multigrain Bread=Мультизерновой хлеб - -### tomato.lua ### -Tomato=Помидор - -### wheat.lua ### -Wheat Seed=Зёрна пшеницы -Wheat=Пшеница -Straw=Солома -Flour=Мука -Bread=Хлеб -Sliced Bread=Нарезанный хлеб -Toast=Тост -Toast Sandwich=Сэндвич diff --git a/locale/template.txt b/locale/template.txt deleted file mode 100644 index 905d9e0..0000000 --- a/locale/template.txt +++ /dev/null @@ -1,194 +0,0 @@ -# Translation of the farming mod by TenPlus1 -# textdomain: farming -# author: (you) -# last update: 2020/Apr/26 - -###### folder . ###### - -### init.lua ### -Seed= - -### compatibility.lua ### -Banana= -Banana Leaves= -Orange= -Strawberry= - -### food.lua ### -Sugar= -Salt= -Rose Water= -Turkish Delight= -Garlic Bread= -Donut= -Chocolate Donut= -Apple Donut= -Porridge= -Jaffa Cake= - -### hoes.lua ### -Hoe= -Wooden Hoe= -Stone Hoe= -Steel Hoe= -Bronze Hoe= -Mese Hoe= -Diamond Hoe= -# Surcharge du mod [Toolranks] faire # -Hoe Bomb (use or throw on grassy areas to hoe land)= -Mithril Scythe (Right-click to harvest and replant crops)= -# Surcharge du mod [Toolranks] faire # - -### soil.lua ### -Soil= -Wet Soil= - -### utensils.lua ### -Wooden Bowl= -Saucepan= -Cooking Pot= -Baking Tray= -Skillet= -Mortar and Pestle= -Cutting Board= -Juicer= -Glass Mixing Bowl= - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed= -Barley= - -### beans.lua ### -Green Beans= -Bean Pole (place on soil before planting beans)= - -### beetroot.lua ### -Beetroot= -Beetroot Soup= - -### blueberry.lua ### -Blueberries= -Blueberry Muffin= -Blueberry Pie= - -### carrot.lua ## -Carrot= -Carrot Juice= -Golden Carrot= - -### chili.lua ### -Chili Pepper= -Bowl of Chili= - -### cocoa.lua ### -Cocoa Beans= -Cookie= -Bar of Dark Chocolate= -Chocolate Block= - -### coffee.lua ### -Coffee Beans= -Cup of Coffee= - -### corn.lua ### -Corn= -Corn on the Cob= -Cornstarch= -Bottle of Ethanol= - -### cotton.lua ### -Cotton Seed= -Cotton= -String= - -### cucumber.lua ### -Cucumber= - -### garlic.lua ### -Garlic clove= -Garlic= -Garlic Braid= - -### grapes.lua ### -Grapes= -Trellis (place on soil before planting grapes)= - -### hemp.lua ### -Hemp Seed= -Hemp Leaf= -Bottle of Hemp Oil= -Hemp Fibre= -Hemp Block= -Hemp Rope= - -### melon.lua ### -Melon Slice= -Melon= - -### onion.lua ### -Onion= - -### peas.lua ### -Pea Pod= -Peas= -Pea Soup= - -### pepper.lua ### -Peppercorn= -Pepper= -Ground Pepper= - -### pinapple.lua ### -Pineapple Top= -Pineapple= -Pineapple Ring= -Pineapple Juice= - -### potato.lua ### -Potato= -Baked Potato= -Cucumber and Potato Salad= - -### pumpkin.lua ### -Pumpkin Slice= -Jack 'O Lantern (punch to turn on and off)= -Scarecrow Bottom= -Pumpkin Bread= -Pumpkin Dough= -Pumpkin= - -### raspberry.lua ### -Raspberries= -Raspberry Smoothie= - -### rhubarb.lua ### -Rhubarb= -Rhubarb Pie= - -### ryeoatrice.lua ### -Rye= -Rye seed= -Oat= -Oat seed= -Rice= -Rice grains= -Rice Bread= -Rice Flour= -Multigrain Flour= -Multigrain Bread= - -### tomato.lua ### -Tomato= - -### wheat.lua ### -Wheat Seed= -Wheat= -Straw= -Flour= -Bread= -Sliced Bread= -Toast= -Toast Sandwich= diff --git a/locale/zh_CN.txt b/locale/zh_CN.txt deleted file mode 100644 index 2ec4e55..0000000 --- a/locale/zh_CN.txt +++ /dev/null @@ -1,119 +0,0 @@ -Seed=种子 -Banana=香蕉 -Banana Leaves=香蕉叶 -Orange=橙色 -Strawberry=草莓 -Sugar=糖 -Salt=盐 -Rose Water=玫瑰汁 -Turkish Delight=土耳其软糖 -Garlic Bread=蒜香面包 -Donut=甜甜圈 -Chocolate Donut=巧克力甜甜圈 -Apple Donut=苹果甜甜圈 -Porridge=粥 -Jaffa Cake=佳发饼 -Hoe=锄头 -Wooden Hoe=木锄 -Stone Hoe=石锄 -Steel Hoe=钢锄头 -Bronze Hoe=青铜锄头 -Mese Hoe=黄石锄头 -Diamond Hoe=钻石锄 -Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上） -Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物） -Soil=土壤 -Wet Soil=湿土 -Wooden Bowl=木碗 -Saucepan=平底锅 -Cooking Pot=锅 -Baking Tray=烤盘 -Skillet=平底锅 -Mortar and Pestle=研钵 -Cutting Board=砧板 -Juicer=榨汁机 -Glass Mixing Bowl=搅拌杯 -Barley Seed=大麦种子 -Barley=大麦 -Green Beans=青豆 -Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上） -Beetroot=甜菜根 -Beetroot Soup=甜菜根汤 -Blueberries=蓝莓 -Blueberry Muffin=蓝莓松糕 -Blueberry Pie=蓝莓派 -Carrot=胡萝卜 -Carrot Juice=胡萝卜汁 -Golden Carrot=金萝卜 -Chili Pepper=辣椒 -Bowl of Chili=一碗辣椒 -Cocoa Beans=可可豆 -Cookie=曲奇 -Bar of Dark Chocolate=黑巧克力条 -Chocolate Block=巧克力块 -Coffee Beans=咖啡豆 -Cup of Coffee=一杯咖啡 -Corn=玉米 -Corn on the Cob=玉米棒 -Cornstarch=玉米淀粉 -Bottle of Ethanol=一瓶乙醇 -Cotton Seed=棉籽 -Cotton=棉花 -String=线 -Cucumber=黄瓜 -Garlic clove=蒜瓣 -Garlic=大蒜 -Garlic Braid=蒜辫 -Grapes=葡萄 -Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上） -Hemp Seed=大麻籽 -Hemp Leaf=大麻叶 -Bottle of Hemp Oil=一瓶大麻油 -Hemp Fibre=大麻纤维 -Hemp Block=麻块 -Hemp Rope=麻绳 -Melon Slice=西瓜片 -Melon=甜瓜 -Onion=洋葱 -Pea Pod=豌豆荚 -Peas=豌豆 -Pea Soup=豌豆汤 -Peppercorn=胡椒粉 -Pepper=胡椒粉 -Ground Pepper=胡椒粉 -Pineapple Top=菠萝上衣 -Pineapple=菠萝 -Pineapple Ring=菠萝圈 -Pineapple Juice=菠萝汁 -Potato=土豆 -Baked Potato=焗马铃薯 -Cucumber and Potato Salad=黄瓜土豆沙拉 -Pumpkin Slice=南瓜片 -Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关） -Scarecrow Bottom=稻草人屁股 -Pumpkin Bread=南瓜面包 -Pumpkin Dough=南瓜面团 -Pumpkin=南瓜 -Raspberries=覆盆子 -Raspberry Smoothie=覆盆子冰沙 -Rhubarb=大黄 -Rhubarb Pie=大黄派 -Rye=黑麦 -Rye seed=黑麦种子 -Oat=燕麦 -Oat seed=燕麦籽 -Rice=大米 -Rice grains=稻谷 -Rice Bread=米饭面包 -Rice Flour=米粉 -Multigrain Flour=多粒面粉 -Multigrain Bread=杂粮面包 -Tomato=番茄 -Wheat Seed=小麦种子 -Wheat=小麦 -Straw=稻草 -Flour=面粉 -Bread=面包 -Sliced Bread=切片面包 -Toast=烤面包片 -Toast Sandwich=三明治面包 diff --git a/locale/zh_TW.txt b/locale/zh_TW.txt deleted file mode 100644 index ef96d52..0000000 --- a/locale/zh_TW.txt +++ /dev/null @@ -1,119 +0,0 @@ -Seed=種子 -Banana=香蕉 -Banana Leaves=香蕉葉 -Orange=橙色 -Strawberry=草莓 -Sugar=糖 -Salt=鹽 -Rose Water=玫瑰汁 -Turkish Delight=土耳其軟糖 -Garlic Bread=蒜香麵包 -Donut=甜甜圈 -Chocolate Donut=巧克力甜甜圈 -Apple Donut=蘋果甜甜圈 -Porridge=粥 -Jaffa Cake=佳發餅 -Hoe=鋤頭 -Wooden Hoe=木鋤 -Stone Hoe=石鋤 -Steel Hoe=鋼鋤頭 -Bronze Hoe=青銅鋤頭 -Mese Hoe=黃石鋤頭 -Diamond Hoe=鑽石鋤 -Hoe Bomb (use or throw on grassy areas to hoe land)=鋤彈（在草地上使用或扔在鋤地上） -Mithril Scythe (Right-click to harvest and replant crops)=祕銀鐮刀（右擊可收穫並重新種植作物） -Soil=土壤 -Wet Soil=溼土 -Wooden Bowl=木碗 -Saucepan=平底鍋 -Cooking Pot=鍋 -Baking Tray=烤盤 -Skillet=平底鍋 -Mortar and Pestle=研缽 -Cutting Board=砧板 -Juicer=榨汁機 -Glass Mixing Bowl=攪拌杯 -Barley Seed=大麥種子 -Barley=大麥 -Green Beans=青豆 -Bean Pole (place on soil before planting beans)=豆杆（種豆前先放在土上） -Beetroot=甜菜根 -Beetroot Soup=甜菜根湯 -Blueberries=藍莓 -Blueberry Muffin=藍莓鬆糕 -Blueberry Pie=藍莓派 -Carrot=胡蘿蔔 -Carrot Juice=胡蘿蔔汁 -Golden Carrot=金蘿蔔 -Chili Pepper=辣椒 -Bowl of Chili=一碗辣椒 -Cocoa Beans=可可豆 -Cookie=曲奇 -Bar of Dark Chocolate=黑巧克力條 -Chocolate Block=巧克力塊 -Coffee Beans=咖啡豆 -Cup of Coffee=一杯咖啡 -Corn=玉米 -Corn on the Cob=玉米棒 -Cornstarch=玉米澱粉 -Bottle of Ethanol=一瓶乙醇 -Cotton Seed=棉籽 -Cotton=棉花 -String=字符串 -Cucumber=黃瓜 -Garlic clove=蒜瓣 -Garlic=大蒜 -Garlic Braid=蒜辮 -Grapes=葡萄 -Trellis (place on soil before planting grapes)=棚架（種植葡萄前先放在土壤上） -Hemp Seed=大麻籽 -Hemp Leaf=大麻葉 -Bottle of Hemp Oil=一瓶大麻油 -Hemp Fibre=大麻纖維 -Hemp Block=麻塊 -Hemp Rope=麻繩 -Melon Slice=西瓜片 -Melon=甜瓜 -Onion=洋蔥 -Pea Pod=豌豆莢 -Peas=豌豆 -Pea Soup=豌豆湯 -Peppercorn=胡椒粉 -Pepper=胡椒粉 -Ground Pepper=胡椒粉 -Pineapple Top=菠蘿上衣 -Pineapple=菠蘿 -Pineapple Ring=菠蘿圈 -Pineapple Juice=菠蘿汁 -Potato=土豆 -Baked Potato=焗馬鈴薯 -Cucumber and Potato Salad=黃瓜土豆沙拉 -Pumpkin Slice=南瓜片 -Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關） -Scarecrow Bottom=稻草人屁股 -Pumpkin Bread=南瓜麵包 -Pumpkin Dough=南瓜麵糰 -Pumpkin=南瓜 -Raspberries=覆盆子 -Raspberry Smoothie=覆盆子冰沙 -Rhubarb=大黃 -Rhubarb Pie=大黃派 -Rye=黑麥 -Rye seed=黑麥種子 -Oat=燕麥 -Oat seed=燕麥籽 -Rice=大米 -Rice grains=稻穀 -Rice Bread=米飯麵包 -Rice Flour=米粉 -Multigrain Flour=多粒麵粉 -Multigrain Bread=雜糧麵包 -Tomato=番茄 -Wheat Seed=小麥種子 -Wheat=小麥 -Straw=稻草 -Flour=麵粉 -Bread=麵包 -Sliced Bread=切片面包 -Toast=烤麵包片 -Toast Sandwich=三明治麵包 \ No newline at end of file diff --git a/mod.conf b/mod.conf index bc6a919..1e362ec 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = farming depends = default -optional_depends = stairs, intllib, lucky_block, toolranks +optional_depends = stairs, lucky_block, toolranks description = Adds many plants and food to Minetest From fa4ee488285197420298b8c9df4893efafd1ee58 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 14 Aug 2023 08:22:28 +0100 Subject: [PATCH 06/34] Update translations (thanks Niklp) --- README.md | 1 - compatibility.lua | 2 +- crops/artichoke.lua | 3 +- crops/asparagus.lua | 2 +- crops/barley.lua | 2 +- crops/beans.lua | 2 +- crops/beetroot.lua | 2 +- crops/blackberry.lua | 2 +- crops/blueberry.lua | 2 +- crops/cabbage.lua | 2 +- crops/carrot.lua | 2 +- crops/chili.lua | 2 +- crops/cocoa.lua | 2 +- crops/coffee.lua | 2 +- crops/corn.lua | 2 +- crops/cotton.lua | 2 +- crops/cucumber.lua | 2 +- crops/eggplant.lua | 2 +- crops/garlic.lua | 2 +- crops/ginger.lua | 2 +- crops/grapes.lua | 2 +- crops/hemp.lua | 2 +- crops/lettuce.lua | 3 +- crops/melon.lua | 2 +- crops/mint.lua | 2 +- crops/onion.lua | 2 +- crops/parsley.lua | 3 +- crops/peas.lua | 2 +- crops/pepper.lua | 2 +- crops/pineapple.lua | 2 +- crops/potato.lua | 2 +- crops/pumpkin.lua | 2 +- crops/raspberry.lua | 2 +- crops/rhubarb.lua | 2 +- crops/rice.lua | 2 +- crops/ryeoatrice.lua | 2 +- crops/soy.lua | 2 +- crops/spinach.lua | 2 +- crops/strawberry.lua | 2 +- crops/sunflower.lua | 3 +- crops/tomato.lua | 2 +- crops/vanilla.lua | 3 +- crops/wheat.lua | 2 +- food.lua | 2 +- hoes.lua | 2 +- init.lua | 18 +-- locale/farming.de.tr | 213 ++++++++++++++++----------- locale/farming.en.tr | 310 +++++++++++++++++++++++----------------- locale/farming.eo.tr | 288 +++++++++++++++++-------------------- locale/farming.es.tr | 212 ++++++++++++++++----------- locale/farming.fr.tr | 212 ++++++++++++++++----------- locale/farming.it.tr | 222 ++++++++++++++++------------ locale/farming.pt.tr | 258 +++++++++++++++++++-------------- locale/farming.ru.tr | 214 ++++++++++++++++----------- locale/farming.zh_CN.tr | 222 ++++++++++++++++------------ locale/farming.zh_TW.tr | 222 ++++++++++++++++------------ locale/template.txt | 176 +++++++++++++++++++++++ soil.lua | 2 +- utensils.lua | 2 +- 59 files changed, 1597 insertions(+), 1068 deletions(-) create mode 100644 locale/template.txt diff --git a/README.md b/README.md index 901a3bb..5fb45a5 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ be found at https://notabug.org/TenPlus1/bonemeal Optional dependences: * stairs -* intllib (only for older engines) * lucky_block (adds 47 lucky blocks) * toolranks diff --git a/compatibility.lua b/compatibility.lua index 425132e..e531796 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate --= Helpers diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 2dc5deb..0034026 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -1,4 +1,5 @@ -local S = farming.intllib + +local S = farming.translate -- item definition minetest.register_craftitem("farming:artichoke", { diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 5924037..a88b01a 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- asparagus minetest.register_craftitem("farming:asparagus", { diff --git a/crops/barley.lua b/crops/barley.lua index 2697413..6c317e0 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- barley seeds minetest.register_node("farming:seed_barley", { diff --git a/crops/beans.lua b/crops/beans.lua index 90a30bd..2c43d1c 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -4,7 +4,7 @@ CC-BY-SA-3.0 ]] -local S = farming.intllib +local S = farming.translate -- place beans local function place_beans(itemstack, placer, pointed_thing, plantname) diff --git a/crops/beetroot.lua b/crops/beetroot.lua index b8be3ef..ea7fd10 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- beetroot minetest.register_craftitem("farming:beetroot", { diff --git a/crops/blackberry.lua b/crops/blackberry.lua index 47dd08e..109ad5b 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- blackberries minetest.register_craftitem("farming:blackberry", { diff --git a/crops/blueberry.lua b/crops/blueberry.lua index ef19131..280e4dd 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- blueberries minetest.register_craftitem("farming:blueberries", { diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 622782b..6829493 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- cabbage minetest.register_craftitem("farming:cabbage", { diff --git a/crops/carrot.lua b/crops/carrot.lua index 1141bdc..f521f9c 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -4,7 +4,7 @@ https://forum.minetest.net/viewtopic.php?id=4990 ]] -local S = farming.intllib +local S = farming.translate -- carrot minetest.register_craftitem("farming:carrot", { diff --git a/crops/chili.lua b/crops/chili.lua index 547ca4c..13a34a9 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- chili pepper minetest.register_craftitem("farming:chili_pepper", { diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 47045d4..0372252 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- place cocoa local function place_cocoa(itemstack, placer, pointed_thing, plantname) diff --git a/crops/coffee.lua b/crops/coffee.lua index d0f2db5..8823e9d 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- coffee minetest.register_craftitem("farming:coffee_beans", { diff --git a/crops/corn.lua b/crops/corn.lua index 1390100..08fa275 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -4,7 +4,7 @@ http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1440575-1-2-5-generation-minecraft-beta-1-2-farming-and ]] -local S = farming.intllib +local S = farming.translate -- corn minetest.register_craftitem("farming:corn", { diff --git a/crops/cotton.lua b/crops/cotton.lua index f231f24..eb7b289 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- wild cotton as a source of cotton seed and a chance of cotton itself minetest.register_node("farming:cotton_wild", { diff --git a/crops/cucumber.lua b/crops/cucumber.lua index 3494b16..7acd28a 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -4,7 +4,7 @@ https://forum.minetest.net/viewtopic.php?id=3948 ]] -local S = farming.intllib +local S = farming.translate -- cucumber minetest.register_craftitem("farming:cucumber", { diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 7b6a8f3..20bdf07 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- eggplant minetest.register_craftitem("farming:eggplant", { diff --git a/crops/garlic.lua b/crops/garlic.lua index ca2005a..0e53c14 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -5,7 +5,7 @@ https://forum.minetest.net/viewtopic.php?f=9&t=19488 ]] -local S = farming.intllib +local S = farming.translate -- garlic clove minetest.register_craftitem("farming:garlic_clove", { diff --git a/crops/ginger.lua b/crops/ginger.lua index 7cfbd05..700c5cf 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- ginger minetest.register_craftitem("farming:ginger", { diff --git a/crops/grapes.lua b/crops/grapes.lua index 7622c0e..3d61332 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- place trellis local function place_grapes(itemstack, placer, pointed_thing, plantname) diff --git a/crops/hemp.lua b/crops/hemp.lua index dabbd9b..c7da66f 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- hemp seeds minetest.register_node("farming:seed_hemp", { diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 02f68c0..554ea2f 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -1,4 +1,5 @@ -local S = farming.intllib + +local S = farming.translate -- lettuce minetest.register_craftitem("farming:lettuce", { diff --git a/crops/melon.lua b/crops/melon.lua index 52b41b3..c373f3d 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- melon minetest.register_craftitem("farming:melon_slice", { diff --git a/crops/mint.lua b/crops/mint.lua index 2352f51..95bd97d 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- mint seed minetest.register_node("farming:seed_mint", { diff --git a/crops/onion.lua b/crops/onion.lua index 1884bae..cf08545 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -5,7 +5,7 @@ https://forum.minetest.net/viewtopic.php?f=9&t=19488 ]] -local S = farming.intllib +local S = farming.translate -- onion minetest.register_craftitem("farming:onion", { diff --git a/crops/parsley.lua b/crops/parsley.lua index e2dab3e..4aabbe8 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -1,4 +1,5 @@ -local S = farming.intllib + +local S = farming.translate -- item definition minetest.register_craftitem("farming:parsley", { diff --git a/crops/peas.lua b/crops/peas.lua index 00ff5e3..6cb212e 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- Textures for Pea crop and Peas were done by Andrey01 diff --git a/crops/pepper.lua b/crops/pepper.lua index 38a4806..5a5bba5 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -5,7 +5,7 @@ https://forum.minetest.net/viewtopic.php?f=9&t=19488 ]] -local S = farming.intllib +local S = farming.translate -- peppercorn (seed) minetest.register_craftitem("farming:peppercorn", { diff --git a/crops/pineapple.lua b/crops/pineapple.lua index e2209aa..f3d962c 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- pineapple top minetest.register_craftitem("farming:pineapple_top", { diff --git a/crops/potato.lua b/crops/potato.lua index dc69bff..e87f494 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -4,7 +4,7 @@ https://forum.minetest.net/viewtopic.php?id=3948 ]] -local S = farming.intllib +local S = farming.translate -- potato minetest.register_craftitem("farming:potato", { diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 030bf16..1f78e37 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- pumpkin slice minetest.register_craftitem("farming:pumpkin_slice", { diff --git a/crops/raspberry.lua b/crops/raspberry.lua index 6d85461..a2489f4 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- raspberries minetest.register_craftitem("farming:raspberries", { diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index af251a9..a0d6860 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- rhubarb minetest.register_craftitem("farming:rhubarb", { diff --git a/crops/rice.lua b/crops/rice.lua index 986f956..0951347 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- rice seed minetest.register_node("farming:seed_rice", { diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index 2dd47c7..3289757 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate --= A nice addition from Ademant's grain mod :) diff --git a/crops/soy.lua b/crops/soy.lua index 5b6b431..c955ea4 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- soy pod minetest.register_craftitem("farming:soy_pod", { diff --git a/crops/spinach.lua b/crops/spinach.lua index 528e7bf..92bf68c 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- spinach minetest.register_craftitem("farming:spinach", { diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 9e0792b..1e9ba6c 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- Strawberry (can also be planted as seed) minetest.register_craftitem(":ethereal:strawberry", { diff --git a/crops/sunflower.lua b/crops/sunflower.lua index c3cb6b1..403528c 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -1,4 +1,5 @@ -local S = farming.intllib + +local S = farming.translate -- sunflower minetest.register_craftitem("farming:sunflower", { diff --git a/crops/tomato.lua b/crops/tomato.lua index 5541067..c78293e 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -4,7 +4,7 @@ http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v2-9) ]] -local S = farming.intllib +local S = farming.translate -- tomato minetest.register_craftitem("farming:tomato", { diff --git a/crops/vanilla.lua b/crops/vanilla.lua index c5304e9..cb309ac 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -1,4 +1,5 @@ -local S = farming.intllib + +local S = farming.translate -- vanilla minetest.register_craftitem("farming:vanilla", { diff --git a/crops/wheat.lua b/crops/wheat.lua index bab1c44..99c02a3 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- wheat seeds minetest.register_node("farming:seed_wheat", { diff --git a/food.lua b/food.lua index be02a29..521c70f 100644 --- a/food.lua +++ b/food.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate local tmp -- filter sea water into river water diff --git a/hoes.lua b/hoes.lua index f508b56..ee683b5 100644 --- a/hoes.lua +++ b/hoes.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate local tr = minetest.get_modpath("toolranks") -- Hoe registration function diff --git a/init.lua b/init.lua index 2d47e2c..0260e92 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230808", + version = "20230814", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -34,20 +34,10 @@ end local statistics = dofile(farming.path .. "/statistics.lua") --- Intllib -local S -if minetest.get_translator then - S = minetest.get_translator("farming") -- 5.x translation function -else -- boilerplate function - S = function(str, ...) - local args = {...} - return str:gsub("@%d+", function(match) - return args[tonumber(match:sub(2))] - end) - end -end +-- Translation support +local S = minetest.get_translator("farming") -farming.intllib = S +farming.translate = S -- Utility Function diff --git a/locale/farming.de.tr b/locale/farming.de.tr index 61f315d..815e115 100644 --- a/locale/farming.de.tr +++ b/locale/farming.de.tr @@ -1,135 +1,176 @@ -# textdomain:farming -%s Hoe=%s Hacke -Apple Donut=Apfeldonut -Apple Pie=Apfelkuchen -Baked Potato=Ofenkartoffel -Baking Tray=Kuchenblech -Banana=Banane -Banana Leaves=Bananenblätter -Bar of Dark Chocolate=Tafel Zartbitterschokolade -Barley=Gerste +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=Gerstenkörner +Barley=Gerste +Green Beans=Grüne Bohnen Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen) Beetroot=Rote Beete Beetroot Soup=Rote Beete Suppe -Bibimbap=Bibimbap +Blackberries= Wild Blueberries=Wilde Blaubeeren Blueberry Muffin=Blaubeermuffin Blueberry Pie=Blaubeerkuchen -Bottle of Ethanol=Flasche Ethanol -Bottle of Hemp Oil=Flasche mit Hanföl -Bowl of Chili=Chili Schale -Bread=Brot -Bronze Hoe=Bronzehacke Cabbage=Kohl -Cactus Juice=Kaktussaft Carrot=Möhre Carrot Juice=Möhrensaft +Golden Carrot=Goldene Möhre Chili Pepper=Chili -Chocolate Block=Schokoladenstück -Chocolate Donut=Schokodonut +Bowl of Chili=Chili Schale +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Kakaobohne -Coffee Beans=Kaffeebohnen Cookie=Keks -Cooking Pot=Kochtopf +Bar of Dark Chocolate=Tafel Zartbitterschokolade +Chocolate Block=Schokoladenstück +Coffee Beans=Kaffeebohnen +Cup of Coffee=Tasse Kaffee +Banana=Banane +Banana Leaves=Bananenblätter +Orange=Apfelsine Corn=Mais Corn on the Cob=Maiskolben +Popcorn= Cornstarch=Speisestärke -Cotton=Baumwolle +Bottle of Ethanol=Flasche Ethanol +Wild Cotton=Wilde Baumwolle Cotton Seed=Baumwollsamen +Cotton=Baumwolle +String=Faden Cucumber=Gurke -Cucumber and Potato Salad=Kartoffelsalat mit Gurke -Cup of Coffee=Tasse Kaffee -Cutting Board=Schneidebrett -Diamond Hoe=Diamanthacke +Eggplant= +Glass of Water= +Sugar=Zucker +Sugar Cube= +Caramel= +Salt=Salz +Mayonnaise= +Rose Water=Rosenwasser +Turkish Delight=Lokum +Garlic Bread=Knoblauchbrot Donut=Donut -Flour=Mehl +Chocolate Donut=Schokodonut +Apple Donut=Apfeldonut +Porridge=Haferbrei +Jaffa Cake=Jaffakeks +Apple Pie=Apfelkuchen +Cactus Juice=Kaktussaft +Pasta=Pasta +Mac & Cheese= +Spaghetti=Spaghetti +Bibimbap=Bibimbap +Burger= +Salad=Salat +Triple Berry Smoothie= +Spanish Potatoes= +Potato omelet= +Paella= +Vanilla Flan= +Vegan Cheese= +Onigiri= +Gyoza= +Mochi= +Gingerbread Man= +Garlic clove=Knoblauchzehe Garlic=Knoblauch Garlic Braid=Knoblauchzopf -Garlic Bread=Knoblauchbrot -Garlic clove=Knoblauchzehe -Glass Mixing Bowl=Glasschüssel -Golden Carrot=Goldene Möhre +Ginger= Grapes=Weintrauben -Green Beans=Grüne Bohnen -Ground Pepper=Gemahlener Pfeffer -Hemp Block=Hanfblock -Hemp Fibre=Hanffaser -Hemp Leaf=Hanfblatt -Hemp Rope=Hanfseil +Trellis (place on soil before planting grapes)=Spalier (vor dem Pflanzen der Weintrauben auf den\nAckerboden stellen) Hemp Seed=Hanfsamen +Hemp Leaf=Hanfblatt +Bottle of Hemp Oil=Flasche mit Hanföl +Hemp Fibre=Hanffaser +Hemp Block=Hanfblock +Hemp Rope=Hanfseil Hoe=Hacke -Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen) -Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten) -Jaffa Cake=Jaffakeks -Juicer=Entsafter -Melon=Melone -Melon Slice=Melonenscheibe +Wooden Hoe=Holzhacke +Stone Hoe=Steinhacke +Steel Hoe=Stahlhacke +Bronze Hoe=Bronzehacke Mese Hoe=Mesehacke -Mint Leaf=Minzblatt +Diamond Hoe=Diamanthacke +Wood Hoe= +Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen) +Mithril Scythe (Use to harvest and replant crops)= +Seed=Saatgut +Lettuce= +Melon Slice=Melonenscheibe +Melon=Melone Mint Seeds=Minzsamen +Mint Leaf=Minzblatt Mint Tea=Minztee -Mithril Scythe (Right-click to harvest and replant crops)=Mithril-Sense (Rechts-Klick zum Ernten und Wiedereinpflanzen) -Mortar and Pestle=Mörser und Stößel -Multigrain Bread=Mehrkornbrot -Multigrain Flour=Mehrkornmehl -Oat seed=Hafersamen -Oats=Hafer Onion=Zwiebel Onion Soup=Zwiebelsuppe -Orange=Apfelsine -Pasta=Pasta +Parsley= Pea Pod=Erbsenschote Pea Soup=Erbsensuppe -Peas=Erbsen -Pepper=Pfeffer Peppercorn=Pfefferkorn -Pineapple=Ananas -Pineapple Juice=Ananassaft -Pineapple Ring=Ananasscheibe +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Gemahlener Pfeffer Pineapple Top=Ananasdeckel -Porridge=Haferbrei +Pineapple=Ananas +Pineapple Ring=Ananasscheibe +Pineapple Juice=Ananassaft Potato=Kartoffel -Pumpkin=Kürbis +Baked Potato=Ofenkartoffel +Cucumber and Potato Salad=Kartoffelsalat mit Gurke +Pumpkin Slice=Kürbisscheibe +Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten) +Scarecrow Bottom=Vogelscheuchengestell Pumpkin Bread=Kürbisbrot Pumpkin Dough=Kürbisteig -Pumpkin Slice=Kürbisscheibe +Pumpkin=Kürbis Raspberries=Himbeeren Raspberry Smoothie=Himbeersmoothie Rhubarb=Rhabarber Rhubarb Pie=Rhabarberkuchen +Rice Seed= Rice=Reis Rice Bread=Reiswaffel Rice Flour=Reismehl -Rice grains=Reissaat -Rose Water=Rosenwasser -Rye=Roggen Rye seed=Roggensaat -Salt=Salz -Salad=Salat -Saucepan=Kasserolle +Rye=Roggen +Oat seed=Hafersamen +Oats=Hafer +Multigrain Flour=Mehrkornmehl +Multigrain Bread=Mehrkornbrot Savanna Soil=Savannaerde -Scarecrow Bottom=Vogelscheuchengestell -Seed=Saatgut -Skillet=Bratpfanne -Sliced Bread=Geschnittenes Brot +Wet Savanna Soil=Feuchte Savannaerde Soil=Ackerboden -Spaghetti=Spaghetti -Steel Hoe=Stahlhacke -Stone Hoe=Steinhacke -Straw=Stroh +Wet Soil=Bewässerter Ackerboden +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=Erdbeere -String=Faden -Sugar=Zucker +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +Tomato=Tomate +Tomato Soup= +Wooden Bowl=Holzschale +Saucepan=Kasserolle +Cooking Pot=Kochtopf +Baking Tray=Kuchenblech +Skillet=Bratpfanne +Mortar and Pestle=Mörser und Stößel +Cutting Board=Schneidebrett +Juicer=Entsafter +Glass Mixing Bowl=Glasschüssel +Vanilla= +Vanilla Extract= +Wheat Seed=Weizenkörner +Wheat=Weizen +Straw=Stroh +Flour=Mehl +Bread=Brot +Sliced Bread=Geschnittenes Brot Toast=Toast Toast Sandwich=Toast Sandwich -Tomato=Tomate -Trellis (place on soil before planting grapes)=Spalier (vor dem Pflanzen der Weintrauben auf den\nAckerboden stellen) -Turkish Delight=Lokum -Wet Savanna Soil=Feuchte Savannaerde -Wet Soil=Bewässerter Ackerboden -Wheat=Weizen -Wheat Seed=Weizenkörner -Wild Cotton=Wilde Baumwolle -Wooden Bowl=Holzschale -Wooden Hoe=Holzhacke diff --git a/locale/farming.en.tr b/locale/farming.en.tr index 22df74a..746a41e 100644 --- a/locale/farming.en.tr +++ b/locale/farming.en.tr @@ -1,134 +1,176 @@ -# textdomain:farming -#%s Hoe= -#Apple Donut= -#Apple Pie= -#Baked Potato= -#Baking Tray= -#Banana= -#Banana Leaves= -#Bar of Dark Chocolate= -#Barley= -#Barley Seed= -#Bean Pole (place on soil before planting beans)= -#Beetroot= -#Beetroot Soup= -#Bibimbap= -#Wild Blueberries= -#Blueberry Muffin= -#Blueberry Pie= -#Bottle of Ethanol= -#Bottle of Hemp Oil= -#Bowl of Chili= -#Bread= -#Bronze Hoe= -#Cabbage= -#Cactus Juice= -#Carrot= -#Carrot Juice= -#Chili Pepper= -#Chocolate Block= -#Chocolate Donut= -#Cocoa Beans= -#Coffee Beans= -#Cookie= -#Cooking Pot= -#Corn= -#Corn on the Cob= -#Cornstarch= -#Cotton= -#Cotton Seed= -#Cucumber= -#Cucumber and Potato Salad= -#Cup of Coffee= -#Cutting Board= -#Diamond Hoe= -#Donut= -#Flour= -#Garlic= -#Garlic Braid= -#Garlic Bread= -#Garlic clove= -#Glass Mixing Bowl= -#Golden Carrot= -#Grapes= -#Green Beans= -#Ground Pepper= -#Hemp Block= -#Hemp Fibre= -#Hemp Leaf= -#Hemp Rope= -#Hemp Seed= -#Hoe= -#Hoe Bomb (use or throw on grassy areas to hoe land)= -#Jack 'O Lantern (punch to turn on and off)= -#Jaffa Cake= -#Juicer= -#Melon= -#Melon Slice= -#Mese Hoe= -#Mint Leaf= -#Mint Seeds= -#Mint Tea= -#Mithril Scythe (Right-click to harvest and replant crops)= -#Mortar and Pestle= -#Multigrain Bread= -#Multigrain Flour= -#Oat seed= -#Oats= -#Onion= -#Onion Soup= -#Orange= -#Pasta= -#Pea Pod= -#Pea Soup= -#Peas= -#Pepper= -#Peppercorn= -#Pineapple= -#Pineapple Juice= -#Pineapple Ring= -#Pineapple Top= -#Porridge= -#Potato= -#Pumpkin= -#Pumpkin Bread= -#Pumpkin Dough= -#Pumpkin Slice= -#Raspberries= -#Raspberry Smoothie= -#Rhubarb= -#Rhubarb Pie= -#Rice= -#Rice Bread= -#Rice Flour= -#Rice grains= -#Rose Water= -#Rye= -#Rye seed= -#Salt= -#Saucepan= -#Savanna Soil= -#Scarecrow Bottom= -#Seed= -#Skillet= -#Sliced Bread= -#Soil= -#Spaghetti= -#Steel Hoe= -#Stone Hoe= -#Straw= -#Strawberry= -#String= -#Sugar= -#Toast= -#Toast Sandwich= -#Tomato= -#Trellis (place on soil before planting grapes)= -#Turkish Delight= -#Wet Savanna Soil= -#Wet Soil= -#Wheat= -#Wheat Seed= -#Wild Cotton= -#Wooden Bowl= -#Wooden Hoe= +# textdomain: farming +Artichoke= +Asparagus= +Barley Seed= +Barley= +Green Beans= +Bean Pole (place on soil before planting beans)= +Beetroot= +Beetroot Soup= +Blackberries= +Wild Blueberries= +Blueberry Muffin= +Blueberry Pie= +Cabbage= +Carrot= +Carrot Juice= +Golden Carrot= +Chili Pepper= +Bowl of Chili= +Chili Powder= +Raw Cocoa Beans= +Cocoa Beans= +Cookie= +Bar of Dark Chocolate= +Chocolate Block= +Coffee Beans= +Cup of Coffee= +Banana= +Banana Leaves= +Orange= +Corn= +Corn on the Cob= +Popcorn= +Cornstarch= +Bottle of Ethanol= +Wild Cotton= +Cotton Seed= +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= +Ginger= +Grapes= +Trellis (place on soil before planting grapes)= +Hemp Seed= +Hemp Leaf= +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= +Mint Seeds= +Mint Leaf= +Mint Tea= +Onion= +Onion Soup= +Parsley= +Pea Pod= +Pea Soup= +Peppercorn= +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper= +Pineapple Top= +Pineapple= +Pineapple Ring= +Pineapple Juice= +Potato= +Baked Potato= +Cucumber and Potato Salad= +Pumpkin Slice= +Jack 'O Lantern (punch to turn on and off)= +Scarecrow Bottom= +Pumpkin Bread= +Pumpkin Dough= +Pumpkin= +Raspberries= +Raspberry Smoothie= +Rhubarb= +Rhubarb Pie= +Rice Seed= +Rice= +Rice Bread= +Rice Flour= +Rye seed= +Rye= +Oat seed= +Oats= +Multigrain Flour= +Multigrain Bread= +Savanna Soil= +Wet Savanna Soil= +Soil= +Wet Soil= +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= +Strawberry= +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +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= +Wheat= +Straw= +Flour= +Bread= +Sliced Bread= +Toast= +Toast Sandwich= diff --git a/locale/farming.eo.tr b/locale/farming.eo.tr index 0098ae6..75f8bd4 100644 --- a/locale/farming.eo.tr +++ b/locale/farming.eo.tr @@ -1,22 +1,50 @@ -# Translation of the farming mod by TenPlus1 # textdomain: farming -# author: Jolesh -# last update: 2022/11/04 - -###### folder . ###### - -### init.lua ### -Seed=Semo - -### compatibility.lua ### +Artichoke= +Asparagus= +Barley Seed=Hordea Semo +Barley=Hordeo +Green Beans=Verdaj Fazeoloj +Bean Pole (place on soil before planting beans)=Fazeola Poluso (metu sur grundo antaŭ planti fabojn) +Beetroot=Betoto +Beetroot Soup=Betota Supo +Blackberries= +Wild Blueberries= +Blueberry Muffin=Mirtila Mufino +Blueberry Pie=Mirtila Torto +Cabbage= +Carrot=Karoto +Carrot Juice=Karota Suko +Golden Carrot=Ora Karoto +Chili Pepper=Kapsiketo +Bowl of Chili=Bovlo da Kapsiketo +Chili Powder= +Raw Cocoa Beans= +Cocoa Beans=Kakaa Faboj +Cookie=Kuketo +Bar of Dark Chocolate=Stango de Malhela Ĉokolado +Chocolate Block=Bloko de Ĉokolado +Coffee Beans=Kafaj Seboj +Cup of Coffee=Taso da Kafo Banana=Banano Banana Leaves=Bananaj Folioj Orange=Oranĝo -Strawberry=Frago - -### food.lua ### +Corn=Maizo +Corn on the Cob=Maiza sur la Spadiko +Popcorn= +Cornstarch=Maizamelo +Bottle of Ethanol=Botelo da Etanolo +Wild Cotton= +Cotton Seed=Kotona Semo +Cotton=Kotono +String=Ŝnuro +Cucumber=Kukumo +Eggplant= +Glass of Water= Sugar=Sukero +Sugar Cube= +Caramel= Salt=Salo +Mayonnaise= Rose Water=Roza Akvo Turkish Delight=Turka Delico Garlic Bread=Ajla Pano @@ -25,8 +53,36 @@ Chocolate Donut=Ĉokolada Benjeto Apple Donut=Poma Benjeto Porridge=Kaĉo Jaffa Cake=Jafa Kuko - -### hoes.lua ### +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=Ajlokloko +Garlic=Ajlo +Garlic Braid=Ajla Plektaĵo +Ginger= +Grapes=Vinberoj +Trellis (place on soil before planting grapes)=Trellis (meti sur grundo antaŭ planti vinberojn) +Hemp Seed=Kanaba Semo +Hemp Leaf=Kanaba Folio +Bottle of Hemp Oil=Botelo da Kanaba Oleo +Hemp Fibre=Kanaba Fibro +Hemp Block=Kanaba Bloko +Hemp Rope=Kanaba Ŝnuro Hoe=Sarkilo Wooden Hoe=Ligna Sarkilo Stone Hoe=Ŝtona Sarkilo @@ -34,16 +90,71 @@ Steel Hoe=Ŝtala Sarkilo Bronze Hoe=Bronza Sarkilo Mese Hoe=Mesea Sarkilo Diamond Hoe=Diamanta Sarkilo -# Surcharge du mod [Toolranks] à faire # +Wood Hoe= Hoe Bomb (use or throw on grassy areas to hoe land)= -Mithril Scythe (Right-click to harvest and replant crops)= -# Surcharge du mod [Toolranks] à faire # - -### soil.lua ### +Mithril Scythe (Use to harvest and replant crops)= +Seed=Semo +Lettuce= +Melon Slice=Tranĉaĵo de Melono +Melon=Melono +Mint Seeds= +Mint Leaf= +Mint Tea= +Onion=Cepo +Onion Soup= +Parsley= +Pea Pod=Pizujo +Pea Soup=Piza Supo +Peppercorn=Piprograjno +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Muelita Pipro +Pineapple Top=Pinto de Ananaso +Pineapple=Ananaso +Pineapple Ring=Ananasa Ringo +Pineapple Juice=Ananasa Suko +Potato=Terpomo +Baked Potato=Bakita Terpomo +Cucumber and Potato Salad=Salato de Kukumo kaj Terpomo +Pumpkin Slice=Tranĉaĵo de Kukurbo +Jack 'O Lantern (punch to turn on and off)=Kukurba Lanterno (punu por ŝalti kaj malŝalti) +Scarecrow Bottom=Birdotimigilo Fundo +Pumpkin Bread=Kukurba Pano +Pumpkin Dough=Kukurba Pasto +Pumpkin=Kukurbo +Raspberries=Framboj +Raspberry Smoothie=Fraba Glataĵo +Rhubarb=Rabarbo +Rhubarb Pie=Rabarba Torto +Rice Seed= +Rice=Rizo +Rice Bread=Riza Pano +Rice Flour=Riza Faruno +Rye seed=Sekala Semo +Rye=Sekalo +Oat seed=Avena Semo +Oats= +Multigrain Flour=Multgrajna Faruno +Multigrain Bread=Multgrajna Pano +Savanna Soil= +Wet Savanna Soil= Soil=Tero Wet Soil=Malseka Tero - -### utensils.lua ### +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= +Strawberry=Frago +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +Tomato=Tomato +Tomato Soup= Wooden Bowl=Ligna Bovlo Saucepan=Kaserolo Cooking Pot=Kuirpoto @@ -53,137 +164,8 @@ Mortar and Pestle=Pistujo Cutting Board=Tranĉa Tabulo Juicer=Spremilo Glass Mixing Bowl=Vitra Miksa Bovlo - - -###### folder ./crops ###### - -### barley.lua ### -Barley Seed=Hordea Semo -Barley=Hordeo - -### beans.lua ### -Green Beans=Verdaj Fazeoloj -Bean Pole (place on soil before planting beans)=Fazeola Poluso (metu sur grundo antaŭ planti fabojn) - -### beetroot.lua ### -Beetroot=Betoto -Beetroot Soup=Betota Supo - -### blueberry.lua ### -Blueberries=Mirtiloj -Blueberry Muffin=Mirtila Mufino -Blueberry Pie=Mirtila Torto - -### carrot.lua ## -Carrot=Karoto -Carrot Juice=Karota Suko -Golden Carrot=Ora Karoto - -### chili.lua ### -Chili Pepper=Kapsiketo -Bowl of Chili=Bovlo da Kapsiketo - -### cocoa.lua ### -Cocoa Beans=Kakaa Faboj -Cookie=Kuketo -Bar of Dark Chocolate=Stango de Malhela Ĉokolado -Chocolate Block=Bloko de Ĉokolado - -### coffee.lua ### -Coffee Beans=Kafaj Seboj -Cup of Coffee=Taso da Kafo - -### corn.lua ### -Corn=Maizo -Corn on the Cob=Maiza sur la Spadiko -Cornstarch=Maizamelo -Bottle of Ethanol=Botelo da Etanolo - -### cotton.lua ### -Cotton Seed=Kotona Semo -Cotton=Kotono -String=Ŝnuro - -### cucumber.lua ### -Cucumber=Kukumo - -### garlic.lua ### -Garlic clove=Ajlokloko -Garlic=Ajlo -Garlic Braid=Ajla Plektaĵo - -### grapes.lua ### -Grapes=Vinberoj -Trellis (place on soil before planting grapes)=Trellis (meti sur grundo antaŭ planti vinberojn) - -### hemp.lua ### -Hemp Seed=Kanaba Semo -Hemp Leaf=Kanaba Folio -Bottle of Hemp Oil=Botelo da Kanaba Oleo -Hemp Fibre=Kanaba Fibro -Hemp Block=Kanaba Bloko -Hemp Rope=Kanaba Ŝnuro - -### melon.lua ### -Melon Slice=Tranĉaĵo de Melono -Melon=Melono - -### onion.lua ### -Onion=Cepo - -### peas.lua ### -Pea Pod=Pizujo -Peas=Pizoj -Pea Soup=Piza Supo - -### pepper.lua ### -Peppercorn=Piprograjno -Pepper=Pipro -Ground Pepper=Muelita Pipro - -### pinapple.lua ### -Pineapple Top=Pinto de Ananaso -Pineapple=Ananaso -Pineapple Ring=Ananasa Ringo -Pineapple Juice=Ananasa Suko - -### potato.lua ### -Potato=Terpomo -Baked Potato=Bakita Terpomo -Cucumber and Potato Salad=Salato de Kukumo kaj Terpomo - -### pumpkin.lua ### -Pumpkin Slice=Tranĉaĵo de Kukurbo -Jack 'O Lantern (punch to turn on and off)=Kukurba Lanterno (punu por ŝalti kaj malŝalti) -Scarecrow Bottom=Birdotimigilo Fundo -Pumpkin Bread=Kukurba Pano -Pumpkin Dough=Kukurba Pasto -Pumpkin=Kukurbo - -### raspberry.lua ### -Raspberries=Framboj -Raspberry Smoothie=Fraba Glataĵo - -### rhubarb.lua ### -Rhubarb=Rabarbo -Rhubarb Pie=Rabarba Torto - -### ryeoatrice.lua ### -Rye=Sekalo -Rye seed=Sekala Semo -Oat=Aveno -Oat seed=Avena Semo -Rice=Rizo -Rice grains=Rizaj grajnoj -Rice Bread=Riza Pano -Rice Flour=Riza Faruno -Multigrain Flour=Multgrajna Faruno -Multigrain Bread=Multgrajna Pano - -### tomato.lua ### -Tomato=Tomato - -### wheat.lua ### +Vanilla= +Vanilla Extract= Wheat Seed=Tritika Semo Wheat=Tritiko Straw=Pajlo diff --git a/locale/farming.es.tr b/locale/farming.es.tr index 773ac90..9d92ef7 100644 --- a/locale/farming.es.tr +++ b/locale/farming.es.tr @@ -1,134 +1,176 @@ -# textdomain:farming -%s Hoe=%s Azadón -Apple Donut=Dona de manzana -Apple Pie=Pastel de manzana -Baked Potato=Patata al horno -Baking Tray=Bandeja de hornear -Banana=Banana -Banana Leaves=Hojas de banana -Bar of Dark Chocolate=Barra de chocolate negro -Barley=Cebada +# 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 -#Bibimbap= +Blackberries= Wild Blueberries=Arándanos silvestres Blueberry Muffin=Muffin de arándanos Blueberry Pie=Pastel de arándanos -Bottle of Ethanol=Botella de etanol -Bottle of Hemp Oil=Botella de aceite de cáñamo -Bowl of Chili=Tazón de chili -Bread=Pan -Bronze Hoe=Azadón de bronze Cabbage=Repollo -Cactus Juice=Jugo de cactus Carrot=Zanahoria Carrot Juice=Jugo de zanahoria +Golden Carrot=Zanahoria dorada Chili Pepper=Ají picante -Chocolate Block=Bloque de chocolate -Chocolate Donut=Dona de chocolate +Bowl of Chili=Tazón de chili +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Granos de cacao -Coffee Beans=Granos de café Cookie=Galleta -Cooking Pot=Olla +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 +Orange=Naranja Corn=Maíz Corn on the Cob=Mazorca de maíz +Popcorn= Cornstarch=Almidón de maíz -Cotton=Algodón +Bottle of Ethanol=Botella de etanol +Wild Cotton=Algodón salvaje Cotton Seed=Semilla de algodón +Cotton=Algodón +String=Guita Cucumber=Pepino -Cucumber and Potato Salad=Ensalada de pepino y patata -Cup of Coffee=Taza de café -Cutting Board=Tabla de cortar -Diamond Hoe=Azadón de diamante +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 -Flour=Harina +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 Garlic=Ajo Garlic Braid=Trenza de ajo -Garlic Bread=Pan de ajo -Garlic clove=Diente de ajo -Glass Mixing Bowl=Tazón de vidrio para mezclar -Golden Carrot=Zanahoria dorada +Ginger= Grapes=Uvas -Green Beans=Frijoles verdes -Ground Pepper=Pimienta molida -Hemp Block=Bloque de cáñamo -Hemp Fibre=Fibra de cáñamo -Hemp Leaf=Hoja de cáñamo -Hemp Rope=Cuerda de cáñamo +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 -Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar) -Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar) -Jaffa Cake=Pastel de jaffa -Juicer=Exprimidor -Melon=Sandía -Melon Slice=Rebanada de sandía +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 -Mint Leaf=Hoja de menta +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 -Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos) -Mortar and Pestle=Mortero y maja -Multigrain Bread=Pan multicereales -Multigrain Flour=Harina multigrano -Oat seed=Semilla de avena -Oats=Avena Onion=Cebolla Onion Soup=Sopa de cebolla -Orange=Naranja -Pasta=Pasta +Parsley= Pea Pod=Vaina de guisantes Pea Soup=Sopa de guisantes -Peas=Guisantes -Pepper=Pimienta Peppercorn=Grano de pimienta -Pineapple=Piña -Pineapple Juice=Jugo de piña -Pineapple Ring=Anillo de piña +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Pimienta molida Pineapple Top=Tapa de piña -Porridge=Papilla +Pineapple=Piña +Pineapple Ring=Anillo de piña +Pineapple Juice=Jugo de piña Potato=Patata -Pumpkin=Calabaza +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 -Pumpkin Slice=Pedazo de calabaza +Pumpkin=Calabaza Raspberries=Frambuesa Raspberry Smoothie=Batido de frambuesa Rhubarb=Ruibarbo Rhubarb Pie=Pastel de ruibarbo +Rice Seed= Rice=Arroz Rice Bread=Pan de arroz Rice Flour=Harina de arroz -Rice grains=Granos de arroz -Rose Water=Agua de rosa -Rye=Centeno Rye seed=Semilla de centeno -Salt=Sal -Saucepan=Cacerola +Rye=Centeno +Oat seed=Semilla de avena +Oats=Avena +Multigrain Flour=Harina multigrano +Multigrain Bread=Pan multicereales Savanna Soil=Suelo de sabana -Scarecrow Bottom=Espantapájaros abajo -Seed=Semilla -Skillet=Sarten -Sliced Bread=Pan rebanado +Wet Savanna Soil=Suelo humedo de savana Soil=Suelo -Spaghetti=Espaguetis -Steel Hoe=Azadón de acero -Stone Hoe=Azadón de piedra -Straw=Paja +Wet Soil=Suelo mojado +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=Fresa -String=Guita -Sugar=Azúcar +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +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 +Wheat=Trigo +Straw=Paja +Flour=Harina +Bread=Pan +Sliced Bread=Pan rebanado Toast=Tostadas Toast Sandwich=Emparedado de tostadas -Tomato=Tomate -Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas) -Turkish Delight=Delicia turca -Wet Savanna Soil=Suelo humedo de savana -Wet Soil=Suelo mojado -Wheat=Trigo -Wheat Seed=Semilla de trigo -Wild Cotton=Algodón salvaje -Wooden Bowl=Cuenco de madera -Wooden Hoe=Azadón de madera diff --git a/locale/farming.fr.tr b/locale/farming.fr.tr index 4da1c81..7bdd760 100644 --- a/locale/farming.fr.tr +++ b/locale/farming.fr.tr @@ -1,134 +1,176 @@ -# textdomain:farming -%s Hoe=Binette de %s -Apple Donut=Beignet aux pommes -Apple Pie=Tarte aux pommes -Baked Potato=Pomme de terre cuite -Baking Tray=Lèche-frite -Banana=Banane -Banana Leaves=Feuilles de banane -Bar of Dark Chocolate=Tablette de chocolat noir -Barley=Orge +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=Graine d'orge +Barley=Orge +Green Beans=Haricots verts Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots) Beetroot=Betterave Beetroot Soup=Soupe de betterave -Bibimbap=Bibimbap +Blackberries= Wild Blueberries=Myrtilles sauvages Blueberry Muffin=Muffin aux myrtilles Blueberry Pie=Tarte aux myrtilles -Bottle of Ethanol=Bouteille d'éthanol -Bottle of Hemp Oil=Bouteille d'huile de chanvre -Bowl of Chili=Bol de chilli -Bread=Pain -Bronze Hoe=Binette en bronze Cabbage=Chou -Cactus Juice=Jus de cactus Carrot=Carotte Carrot Juice=Jus de carotte +Golden Carrot=Carotte dorée Chili Pepper=Piment fort -Chocolate Block=Bloc de chocolat -Chocolate Donut=Beignet au chocolat +Bowl of Chili=Bol de chilli +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Fèves de cacao -Coffee Beans=Grains de café Cookie=Biscuit -Cooking Pot=Marmitte +Bar of Dark Chocolate=Tablette de chocolat noir +Chocolate Block=Bloc de chocolat +Coffee Beans=Grains de café +Cup of Coffee=Tasse de café +Banana=Banane +Banana Leaves=Feuilles de banane +Orange=Orange Corn=Maïs Corn on the Cob=Cobette (maïs cuit) +Popcorn= Cornstarch=Fécule de maïs -Cotton=Coton +Bottle of Ethanol=Bouteille d'éthanol +Wild Cotton=Coton sauvage Cotton Seed=Graines de coton +Cotton=Coton +String=Ficelle Cucumber=Concombre -Cucumber and Potato Salad=Salade de pomme de terre et concombre -Cup of Coffee=Tasse de café -Cutting Board=Planche à découper -Diamond Hoe=Binette en diamant +Eggplant= +Glass of Water= +Sugar=Sucre +Sugar Cube= +Caramel= +Salt=Sel +Mayonnaise= +Rose Water=Eau de rose +Turkish Delight=Douceur turque +Garlic Bread=Pain à l'ail Donut=Beignet -Flour=Farine +Chocolate Donut=Beignet au chocolat +Apple Donut=Beignet aux pommes +Porridge=Gruau de céréales +Jaffa Cake=Petit gâteau à l'orange "Jaffa" +Apple Pie=Tarte aux pommes +Cactus Juice=Jus de cactus +Pasta=Pâtes +Mac & Cheese= +Spaghetti=Spaghetti +Bibimbap=Bibimbap +Burger= +Salad= +Triple Berry Smoothie= +Spanish Potatoes= +Potato omelet= +Paella= +Vanilla Flan= +Vegan Cheese= +Onigiri= +Gyoza= +Mochi= +Gingerbread Man= +Garlic clove=Gousse d'ail Garlic=Tête d'ail Garlic Braid=Ail tressé -Garlic Bread=Pain à l'ail -Garlic clove=Gousse d'ail -Glass Mixing Bowl=Terrine en verre -Golden Carrot=Carotte dorée +Ginger= Grapes=Raisins -Green Beans=Haricots verts -Ground Pepper=Poivre moulu -Hemp Block=Bloc de chanvre -Hemp Fibre=Fibre de chanvre -Hemp Leaf=Feuille de chanvre -Hemp Rope=Corde de chanvre +Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne) Hemp Seed=Graines de chanvre +Hemp Leaf=Feuille de chanvre +Bottle of Hemp Oil=Bouteille d'huile de chanvre +Hemp Fibre=Fibre de chanvre +Hemp Block=Bloc de chanvre +Hemp Rope=Corde de chanvre Hoe=Binette -Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre) -Jaffa Cake=Petit gâteau à l'orange "Jaffa" -Juicer=Presse-agrumes -Melon=Melon -Melon Slice=Tranche de melon +Wooden Hoe=Binette en bois +Stone Hoe=Binette en pierre +Steel Hoe=Binette en acier +Bronze Hoe=Binette en bronze Mese Hoe=Binette en mese -Mint Leaf=Feuille de menthe +Diamond Hoe=Binette en diamant +Wood Hoe= +Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) +Mithril Scythe (Use to harvest and replant crops)= +Seed=Graine +Lettuce= +Melon Slice=Tranche de melon +Melon=Melon Mint Seeds=Graine de menthe +Mint Leaf=Feuille de menthe Mint Tea=Thé à la menthe -Mithril Scythe (Right-click to harvest and replant crops)=Faux en mithril (Récolte et replante des graines) -Mortar and Pestle=Mortier et pilon -Multigrain Bread=Pain aux céréales -Multigrain Flour=Farine multi-céréales -Oat seed=Grains d'orge -Oats=Avoine Onion=Oignon Onion Soup=Soupe à l'oignon -Orange=Orange -Pasta=Pâtes +Parsley= Pea Pod=Cosse de petit-pois Pea Soup=Soupe de petit-pois -Peas=Petit-pois -Pepper=Poivron Peppercorn=Grain de poivre -Pineapple=Ananas -Pineapple Juice=Jus d'ananas -Pineapple Ring=Tranche d'ananas +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Poivre moulu Pineapple Top=Pousse d'ananas -Porridge=Gruau de céréales +Pineapple=Ananas +Pineapple Ring=Tranche d'ananas +Pineapple Juice=Jus d'ananas Potato=Pomme de terre -Pumpkin=Citrouille +Baked Potato=Pomme de terre cuite +Cucumber and Potato Salad=Salade de pomme de terre et concombre +Pumpkin Slice=Tranche de citrouille +Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre) +Scarecrow Bottom=Base d'épouventail Pumpkin Bread=Pain à la citrouille Pumpkin Dough=Pâton de pain à la citrouille -Pumpkin Slice=Tranche de citrouille +Pumpkin=Citrouille Raspberries=Framboises Raspberry Smoothie=Smoothie aux framboises Rhubarb=Rhubarbe Rhubarb Pie=Tarte à la rhubarbe +Rice Seed= Rice=Riz Rice Bread=Pain de riz Rice Flour=Farine de riz -Rice grains=Grain de riz -Rose Water=Eau de rose -Rye=Seigle Rye seed=Grains de seigle -Salt=Sel -Saucepan=Casserole +Rye=Seigle +Oat seed=Grains d'orge +Oats=Avoine +Multigrain Flour=Farine multi-céréales +Multigrain Bread=Pain aux céréales Savanna Soil=Terre de la savane binnée -Scarecrow Bottom=Base d'épouventail -Seed=Graine -Skillet=Poêle -Sliced Bread=Tranche de pain +Wet Savanna Soil=Terre humide et binnée de la savane Soil=Terre binnée -Spaghetti=Spaghetti -Steel Hoe=Binette en acier -Stone Hoe=Binette en pierre -Straw=Paille +Wet Soil=Terre humide et binnée +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=Fraise -String=Ficelle -Sugar=Sucre +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +Tomato=Tomate +Tomato Soup= +Wooden Bowl=Bol en bois +Saucepan=Casserole +Cooking Pot=Marmitte +Baking Tray=Lèche-frite +Skillet=Poêle +Mortar and Pestle=Mortier et pilon +Cutting Board=Planche à découper +Juicer=Presse-agrumes +Glass Mixing Bowl=Terrine en verre +Vanilla= +Vanilla Extract= +Wheat Seed=Grain de blé +Wheat=Blé +Straw=Paille +Flour=Farine +Bread=Pain +Sliced Bread=Tranche de pain Toast=Pain grillé Toast Sandwich=Sandwich au pain grillé -Tomato=Tomate -Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne) -Turkish Delight=Douceur turque -Wet Savanna Soil=Terre humide et binnée de la savane -Wet Soil=Terre humide et binnée -Wheat=Blé -Wheat Seed=Grain de blé -Wild Cotton=Coton sauvage -Wooden Bowl=Bol en bois -Wooden Hoe=Binette en bois diff --git a/locale/farming.it.tr b/locale/farming.it.tr index d041ac2..694b2e6 100644 --- a/locale/farming.it.tr +++ b/locale/farming.it.tr @@ -1,134 +1,176 @@ -# textdomain:farming -#%s Hoe= -Apple Donut=Ciambella alla mela -#Apple Pie= -Baked Potato=Patata arrostita -Baking Tray=Teglia da forno -Banana=Banana -Banana Leaves=Foglie di banano -Bar of Dark Chocolate=Barra di cioccolato fondente -Barley=Orzo +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=Seme d'orzo +Barley=Orzo +Green Beans=Fagiolini Bean Pole (place on soil before planting beans)=Palina per fagiolini (mettila sul terreno coltivabile prima di piantare i fagiolini) Beetroot=Barbabietola Beetroot Soup=Zuppa di barbabietola -#Bibimbap= +Blackberries= Wild Blueberries=Mirtilli Selvatici Blueberry Muffin=Focaccina di mirtilli Blueberry Pie=Tortino di mirtilli -Bottle of Ethanol=Bottiglia di alcol etilico -Bottle of Hemp Oil=Bottiglia d'olio di canapa -Bowl of Chili=Ciotola di peperoncino -Bread=Pane -Bronze Hoe=Zappa di bronzo -#Cabbage= -#Cactus Juice= +Cabbage= Carrot=Carota Carrot Juice=Succo di carota +Golden Carrot=Carota d'oro Chili Pepper=Peperoncino -Chocolate Block=Blocco di cioccolato -Chocolate Donut=Ciambella al cioccolato +Bowl of Chili=Ciotola di peperoncino +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Chicchi di cacao -Coffee Beans=Chicchi di caffè Cookie=Biscotto -Cooking Pot=Pentola da cottura +Bar of Dark Chocolate=Barra di cioccolato fondente +Chocolate Block=Blocco di cioccolato +Coffee Beans=Chicchi di caffè +Cup of Coffee=Tazza di caffè +Banana=Banana +Banana Leaves=Foglie di banano +Orange=Arancia Corn=Mais Corn on the Cob=Pannocchia arrostita +Popcorn= Cornstarch=Amido di mais -Cotton=Cotone +Bottle of Ethanol=Bottiglia di alcol etilico +Wild Cotton= Cotton Seed=Seme di cotone +Cotton=Cotone +String=Filo Cucumber=Cetriolo -Cucumber and Potato Salad=Insalata di patate e cetrioli -Cup of Coffee=Tazza di caffè -Cutting Board=Tagliere -Diamond Hoe=Zappa di diamante +Eggplant= +Glass of Water= +Sugar=Zucchero +Sugar Cube= +Caramel= +Salt=Sale +Mayonnaise= +Rose Water=Acqua di rose +Turkish Delight=Lokum +Garlic Bread=Pane all'aglio Donut=Ciambella -Flour=Farina +Chocolate Donut=Ciambella al cioccolato +Apple Donut=Ciambella alla mela +Porridge=Porridge +Jaffa Cake=Torta di jaffa +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=Spicchio d'aglio Garlic=Aglio Garlic Braid=Treccia d'aglio -Garlic Bread=Pane all'aglio -Garlic clove=Spicchio d'aglio -Glass Mixing Bowl=Terrina di vetro -Golden Carrot=Carota d'oro +Ginger= Grapes=Chicchi d'uva -Green Beans=Fagiolini -Ground Pepper=Pepe macinato -Hemp Block=Blocco di canapa -Hemp Fibre=Fibra di canapa -Hemp Leaf=Foglia di canapa -Hemp Rope=Corda di canapa +Trellis (place on soil before planting grapes)=Graticcio (mettilo sul terreno coltivabile prima di piantare i chicchi d'uva) Hemp Seed=Seme di canapa +Hemp Leaf=Foglia di canapa +Bottle of Hemp Oil=Bottiglia d'olio di canapa +Hemp Fibre=Fibra di canapa +Hemp Block=Blocco di canapa +Hemp Rope=Corda di canapa Hoe=Zappa -Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba zappa (usala o lanciala sulle aree erbose per zappare il terreno) -Jack 'O Lantern (punch to turn on and off)=Jack Lanterna (colpirlo per accenderlo e spegnerlo) -Jaffa Cake=Torta di jaffa -Juicer=Spremiagrumi -Melon=Anguria -Melon Slice=Fetta d'anguria +Wooden Hoe=Zappa di legno +Stone Hoe=Zappa di pietra +Steel Hoe=Zappa d'acciaio +Bronze Hoe=Zappa di bronzo Mese Hoe=Zappa di mese -#Mint Leaf= -#Mint Seeds= -#Mint Tea= -Mithril Scythe (Right-click to harvest and replant crops)=Falce di mithril (clicca col destro per raccogliere e ripiantare le prose) -Mortar and Pestle=Mortaio e pestello -Multigrain Bread=Pane multicereale -Multigrain Flour=Farina multicereale -Oat seed=Seme d'avena -#Oats= +Diamond Hoe=Zappa di diamante +Wood Hoe= +Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba zappa (usala o lanciala sulle aree erbose per zappare il terreno) +Mithril Scythe (Use to harvest and replant crops)= +Seed=Seme +Lettuce= +Melon Slice=Fetta d'anguria +Melon=Anguria +Mint Seeds= +Mint Leaf= +Mint Tea= Onion=Cipolla -#Onion Soup= -Orange=Arancia -#Pasta= +Onion Soup= +Parsley= Pea Pod=Baccello di piselli Pea Soup=Zuppa di piselli -Peas=Piselli -Pepper=Pepe Peppercorn=Grano di pepe -Pineapple=Ananas -Pineapple Juice=Succo d'ananas -Pineapple Ring=Anello d'ananas +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Pepe macinato Pineapple Top=Cima d'ananas -Porridge=Porridge +Pineapple=Ananas +Pineapple Ring=Anello d'ananas +Pineapple Juice=Succo d'ananas Potato=Patata -Pumpkin=Zucca +Baked Potato=Patata arrostita +Cucumber and Potato Salad=Insalata di patate e cetrioli +Pumpkin Slice=Fetta di zucca +Jack 'O Lantern (punch to turn on and off)=Jack Lanterna (colpirlo per accenderlo e spegnerlo) +Scarecrow Bottom=Fondo dello spaventapasseri Pumpkin Bread=Pane alla zucca Pumpkin Dough=Pasta di zucca -Pumpkin Slice=Fetta di zucca +Pumpkin=Zucca Raspberries=Lamponi Raspberry Smoothie=Purea di lamponi Rhubarb=Rabarbaro Rhubarb Pie=Tortino al rabarbaro +Rice Seed= Rice=Riso Rice Bread=Pane di riso Rice Flour=Farina di riso -Rice grains=Chicchi di riso -Rose Water=Acqua di rose -Rye=Segale Rye seed=Seme di segale -Salt=Sale -Saucepan=Casseruola -#Savanna Soil= -Scarecrow Bottom=Fondo dello spaventapasseri -Seed=Seme -Skillet=Padella -Sliced Bread=Pane a fette +Rye=Segale +Oat seed=Seme d'avena +Oats= +Multigrain Flour=Farina multicereale +Multigrain Bread=Pane multicereale +Savanna Soil= +Wet Savanna Soil= Soil=Terreno coltivabile -#Spaghetti= -Steel Hoe=Zappa d'acciaio -Stone Hoe=Zappa di pietra -Straw=Paglia +Wet Soil=Terreno coltivabile bagnato +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=Fragola -String=Filo -Sugar=Zucchero +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +Tomato=Pomodoro +Tomato Soup= +Wooden Bowl=Ciotola di legno +Saucepan=Casseruola +Cooking Pot=Pentola da cottura +Baking Tray=Teglia da forno +Skillet=Padella +Mortar and Pestle=Mortaio e pestello +Cutting Board=Tagliere +Juicer=Spremiagrumi +Glass Mixing Bowl=Terrina di vetro +Vanilla= +Vanilla Extract= +Wheat Seed=Seme di grano +Wheat=Grano +Straw=Paglia +Flour=Farina +Bread=Pane +Sliced Bread=Pane a fette Toast=Pane tostato Toast Sandwich=Panino di pane tostato -Tomato=Pomodoro -Trellis (place on soil before planting grapes)=Graticcio (mettilo sul terreno coltivabile prima di piantare i chicchi d'uva) -Turkish Delight=Lokum -#Wet Savanna Soil= -Wet Soil=Terreno coltivabile bagnato -Wheat=Grano -Wheat Seed=Seme di grano -#Wild Cotton= -Wooden Bowl=Ciotola di legno -Wooden Hoe=Zappa di legno diff --git a/locale/farming.pt.tr b/locale/farming.pt.tr index c2c2248..95afd02 100644 --- a/locale/farming.pt.tr +++ b/locale/farming.pt.tr @@ -1,134 +1,176 @@ -# textdomain:farming -#%s Hoe= -Apple Donut=Donut de Maça -#Apple Pie= -Baked Potato=Batata Cozida -#Baking Tray= -#Banana= -#Banana Leaves= -Bar of Dark Chocolate=Barra de Chocolate Preto -Barley=Cevada +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=Sementes de Cevada +Barley=Cevada +Green Beans=Feijoes Verdes Bean Pole (place on soil before planting beans)=Apoio de feijao (coloque no solo antes de plantar feijao) -#Beetroot= -#Beetroot Soup= -#Bibimbap= +Beetroot= +Beetroot Soup= +Blackberries= Wild Blueberries=Mirtilos Selvagens Blueberry Muffin=Muffin de Mirtilos -#Blueberry Pie= -Bottle of Ethanol=Garrafa de Etanol -Bottle of Hemp Oil=Garrafa de Oleo de Canhamo -#Bowl of Chili= -Bread=Pao -Bronze Hoe=Enxada de Bronze -#Cabbage= -#Cactus Juice= +Blueberry Pie= +Cabbage= Carrot=Cenoura -#Carrot Juice= -#Chili Pepper= -#Chocolate Block= -Chocolate Donut=Donut de Chocolate +Carrot Juice= +Golden Carrot=Cenoura Dourada +Chili Pepper= +Bowl of Chili= +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Amendoas de Cacau -Coffee Beans=Grao de Cafe Cookie=Cookie -#Cooking Pot= +Bar of Dark Chocolate=Barra de Chocolate Preto +Chocolate Block= +Coffee Beans=Grao de Cafe +Cup of Coffee=Xicara de Cafe +Banana= +Banana Leaves= +Orange= Corn=Milho Corn on the Cob=Espiga de Milho -#Cornstarch= -Cotton=Algodao +Popcorn= +Cornstarch= +Bottle of Ethanol=Garrafa de Etanol +Wild Cotton= Cotton Seed=Sementes de Algodao +Cotton=Algodao +String= Cucumber=Pepino -#Cucumber and Potato Salad= -Cup of Coffee=Xicara de Cafe -#Cutting Board= -Diamond Hoe=Enxada de Diamante +Eggplant= +Glass of Water= +Sugar=Açucar +Sugar Cube= +Caramel= +Salt= +Mayonnaise= +Rose Water= +Turkish Delight= +Garlic Bread= Donut=Donut -Flour=Farinha -#Garlic= -#Garlic Braid= -#Garlic Bread= -#Garlic clove= -#Glass Mixing Bowl= -Golden Carrot=Cenoura Dourada +Chocolate Donut=Donut de Chocolate +Apple Donut=Donut de Maça +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= +Ginger= Grapes=Uvas -Green Beans=Feijoes Verdes -#Ground Pepper= -#Hemp Block= -Hemp Fibre=Fibra de Canhamo -Hemp Leaf=Folha de Canhamo -Hemp Rope=Corda de Canhamo +Trellis (place on soil before planting grapes)=Grade de Ripas (colocar no solo antes de plantar uvas) Hemp Seed=Sementes de Canhamo +Hemp Leaf=Folha de Canhamo +Bottle of Hemp Oil=Garrafa de Oleo de Canhamo +Hemp Fibre=Fibra de Canhamo +Hemp Block= +Hemp Rope=Corda de Canhamo Hoe=Enxada -#Hoe Bomb (use or throw on grassy areas to hoe land)= -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Socos para ligar e desligar) -#Jaffa Cake= -#Juicer= -Melon=Melancia -Melon Slice=Sementes de Melancia +Wooden Hoe=Enxada de Madeira +Stone Hoe=Enxada de Pedra +Steel Hoe=Enxada de Aço +Bronze Hoe=Enxada de Bronze Mese Hoe=Enxada de Mese -#Mint Leaf= -#Mint Seeds= -#Mint Tea= -#Mithril Scythe (Right-click to harvest and replant crops)= -#Mortar and Pestle= -#Multigrain Bread= -#Multigrain Flour= -#Oat seed= -#Oats= -#Onion= -#Onion Soup= -#Orange= -#Pasta= -#Pea Pod= -#Pea Soup= -#Peas= -#Pepper= -#Peppercorn= -#Pineapple= -#Pineapple Juice= -#Pineapple Ring= -#Pineapple Top= -#Porridge= +Diamond Hoe=Enxada de Diamante +Wood Hoe= +Hoe Bomb (use or throw on grassy areas to hoe land)= +Mithril Scythe (Use to harvest and replant crops)= +Seed=Sementes +Lettuce= +Melon Slice=Sementes de Melancia +Melon=Melancia +Mint Seeds= +Mint Leaf= +Mint Tea= +Onion= +Onion Soup= +Parsley= +Pea Pod= +Pea Soup= +Peppercorn= +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper= +Pineapple Top= +Pineapple= +Pineapple Ring= +Pineapple Juice= Potato=Batata -Pumpkin=Abobora +Baked Potato=Batata Cozida +Cucumber and Potato Salad= +Pumpkin Slice=Pedaço de Abobora +Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Socos para ligar e desligar) +Scarecrow Bottom= Pumpkin Bread=Pao de Abobora Pumpkin Dough=Massa de Abobora -Pumpkin Slice=Pedaço de Abobora +Pumpkin=Abobora Raspberries=Framboesa Raspberry Smoothie=Batida de Framboesa Rhubarb=Ruibarbo Rhubarb Pie=Torta de Ruibarbo -#Rice= -#Rice Bread= -#Rice Flour= -#Rice grains= -#Rose Water= -#Rye= -#Rye seed= -#Salt= -#Saucepan= -#Savanna Soil= -#Scarecrow Bottom= -Seed=Sementes -#Skillet= -#Sliced Bread= +Rice Seed= +Rice= +Rice Bread= +Rice Flour= +Rye seed= +Rye= +Oat seed= +Oats= +Multigrain Flour= +Multigrain Bread= +Savanna Soil= +Wet Savanna Soil= Soil=Solo -#Spaghetti= -Steel Hoe=Enxada de Aço -Stone Hoe=Enxada de Pedra -Straw=Palha -#Strawberry= -#String= -Sugar=Açucar -#Toast= -#Toast Sandwich= -Tomato=Tomate -Trellis (place on soil before planting grapes)=Grade de Ripas (colocar no solo antes de plantar uvas) -#Turkish Delight= -#Wet Savanna Soil= Wet Soil=Solo Seco -Wheat=Trigo +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= +Strawberry= +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +Bottle of Sunflower Oil= +Sunflower Seed Bread= +Tomato=Tomate +Tomato Soup= +Wooden Bowl= +Saucepan= +Cooking Pot= +Baking Tray= +Skillet= +Mortar and Pestle= +Cutting Board= +Juicer= +Glass Mixing Bowl= +Vanilla= +Vanilla Extract= Wheat Seed=Sementes de Trigo -#Wild Cotton= -#Wooden Bowl= -Wooden Hoe=Enxada de Madeira +Wheat=Trigo +Straw=Palha +Flour=Farinha +Bread=Pao +Sliced Bread= +Toast= +Toast Sandwich= diff --git a/locale/farming.ru.tr b/locale/farming.ru.tr index dce5eb1..d7403e6 100644 --- a/locale/farming.ru.tr +++ b/locale/farming.ru.tr @@ -1,134 +1,176 @@ -# textdomain:farming -%s Hoe=%s мотыга -Apple Donut=Яблочный пончик -Apple Pie=Яблочный пирог -Baked Potato=Печеный картофель -Baking Tray=Противень -Banana=Банан -Banana Leaves=Листья банана -Bar of Dark Chocolate=Плитка темного шоколада -Barley=Ячмень +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=Семена ячменя +Barley=Ячмень +Green Beans=Зеленая фасоль Bean Pole (place on soil before planting beans)=Жердь для бобовых (установите на почву перед посадкой бобовых) Beetroot=Свекла Beetroot Soup=Борщ -#Bibimbap= +Blackberries= Wild Blueberries=Голубика Blueberry Muffin=Кекс с голубикой Blueberry Pie=Пирог с голубикой -Bottle of Ethanol=Бутылка спирта -Bottle of Hemp Oil=Бутылка конопляного масла -Bowl of Chili=Миска чили -Bread=Хлеб -Bronze Hoe=Бронзовая мотыга -#Cabbage= -Cactus Juice=Кактусовый сок +Cabbage= Carrot=Морковь Carrot Juice=Морковный сок +Golden Carrot=Золотая морковь Chili Pepper=Перец чили -Chocolate Block=Шоколадный блок -Chocolate Donut=Шоколадный пончик +Bowl of Chili=Миска чили +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=Какао-бобы -Coffee Beans=Кофейные зерна Cookie=Печенье -Cooking Pot=Котел +Bar of Dark Chocolate=Плитка темного шоколада +Chocolate Block=Шоколадный блок +Coffee Beans=Кофейные зерна +Cup of Coffee=Чашка кофе +Banana=Банан +Banana Leaves=Листья банана +Orange=Апельсин Corn=Кукуруза Corn on the Cob=Початок кукурузы +Popcorn= Cornstarch=Кукурузный крахмал -Cotton=Хлопок +Bottle of Ethanol=Бутылка спирта +Wild Cotton=Дикорастущий хлопок Cotton Seed=Семена хлопка +Cotton=Хлопок +String=Нить Cucumber=Огурец -Cucumber and Potato Salad=Салат из огурцов и картофеля -Cup of Coffee=Чашка кофе -Cutting Board=Разделочная доска -Diamond Hoe=Алмазная мотыга +Eggplant= +Glass of Water= +Sugar=Сахар +Sugar Cube= +Caramel= +Salt=Соль +Mayonnaise= +Rose Water=Розовая вода +Turkish Delight=Рахат-лукум +Garlic Bread=Чесночный хлеб Donut=Пончик -Flour=Мука +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=Связка чеснока -Garlic Bread=Чесночный хлеб -Garlic clove=Зубчик чеснока -Glass Mixing Bowl=Стеклянная чаша -Golden Carrot=Золотая морковь +Ginger= Grapes=Виноград -Green Beans=Зеленая фасоль -Ground Pepper=Молотый перец -Hemp Block=Блок конопли -Hemp Fibre=Конопляное волокно -Hemp Leaf=Лист конопли -Hemp Rope=Пеньковая веревка +Trellis (place on soil before planting grapes)=Решетка (поставьте на почву перед посадкой винограда) Hemp Seed=Семена конопли +Hemp Leaf=Лист конопли +Bottle of Hemp Oil=Бутылка конопляного масла +Hemp Fibre=Конопляное волокно +Hemp Block=Блок конопли +Hemp Rope=Пеньковая веревка Hoe=Мотыга -Hoe Bomb (use or throw on grassy areas to hoe land)=Мотыгобомба (используйте или бросьте на траву для ее обработки) -Jack 'O Lantern (punch to turn on and off)=Светильник джека (удар для включения и выключения) -Jaffa Cake=Яффский пирог -Juicer=Соковыжималка -Melon=Арбуз -Melon Slice=Долька арбуза +Wooden Hoe=Деревянная мотыга +Stone Hoe=Каменная мотыга +Steel Hoe=Стальная мотыга +Bronze Hoe=Бронзовая мотыга Mese Hoe=Магическая мотыга -Mint Leaf=Лист мяты +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=Арбуз Mint Seeds=Семена мяты +Mint Leaf=Лист мяты Mint Tea=Чай с мятой -Mithril Scythe (Right-click to harvest and replant crops)=Мифриловая коса (Щелкните правой кнопкой мыши для сбора и пересадки растений) -Mortar and Pestle=Ступка и пестик -Multigrain Bread=Мультизерновой хлеб -Multigrain Flour=Мультизерновая мука -Oat seed=Семена овса -#Oats= Onion=Лук Onion Soup=Луковый суп -Orange=Апельсин -#Pasta= +Parsley= Pea Pod=Стручок гороха Pea Soup=Гороховый суп -Peas=Горох -Pepper=Перец Peppercorn=Перчинка -Pineapple=Ананас -Pineapple Juice=Ананасовый сок -Pineapple Ring=Кольцо ананаса +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=Молотый перец Pineapple Top=Верхушка ананаса -Porridge=Каша +Pineapple=Ананас +Pineapple Ring=Кольцо ананаса +Pineapple Juice=Ананасовый сок Potato=Картофель -Pumpkin=Тыква +Baked Potato=Печеный картофель +Cucumber and Potato Salad=Салат из огурцов и картофеля +Pumpkin Slice=Ломтик тыквы +Jack 'O Lantern (punch to turn on and off)=Светильник джека (удар для включения и выключения) +Scarecrow Bottom=Основание пугала Pumpkin Bread=Тыквенный хлеб Pumpkin Dough=Тыквенное тесто -Pumpkin Slice=Ломтик тыквы +Pumpkin=Тыква Raspberries=Малина Raspberry Smoothie=Малиновый смузи Rhubarb=Ревень Rhubarb Pie=Пирог с ревенем +Rice Seed= Rice=Рис Rice Bread=Рисовый хлеб Rice Flour=Рисовая мука -Rice grains=Зёрна риса -Rose Water=Розовая вода -Rye=Рожь Rye seed=Зёрна ржи -Salt=Соль -Saucepan=Кастрюля +Rye=Рожь +Oat seed=Семена овса +Oats= +Multigrain Flour=Мультизерновая мука +Multigrain Bread=Мультизерновой хлеб Savanna Soil=Земля саванны -Scarecrow Bottom=Основание пугала -Seed=Семена -Skillet=Сковорода -Sliced Bread=Нарезанный хлеб +Wet Savanna Soil=Увлажненная земля саванны Soil=Земля -#Spaghetti= -Steel Hoe=Стальная мотыга -Stone Hoe=Каменная мотыга -Straw=Солома +Wet Soil=Увлажненная земля +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=Земляника -String=Нить -Sugar=Сахар +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +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=Зёрна пшеницы +Wheat=Пшеница +Straw=Солома +Flour=Мука +Bread=Хлеб +Sliced Bread=Нарезанный хлеб Toast=Тост Toast Sandwich=Сэндвич -Tomato=Помидор -Trellis (place on soil before planting grapes)=Решетка (поставьте на почву перед посадкой винограда) -Turkish Delight=Рахат-лукум -Wet Savanna Soil=Увлажненная земля саванны -Wet Soil=Увлажненная земля -Wheat=Пшеница -Wheat Seed=Зёрна пшеницы -Wild Cotton=Дикорастущий хлопок -Wooden Bowl=Деревянная миска -Wooden Hoe=Деревянная мотыга diff --git a/locale/farming.zh_CN.tr b/locale/farming.zh_CN.tr index adc97fe..b773d32 100644 --- a/locale/farming.zh_CN.tr +++ b/locale/farming.zh_CN.tr @@ -1,134 +1,176 @@ -# textdomain:farming -#%s Hoe= -Apple Donut=苹果甜甜圈 -#Apple Pie= -Baked Potato=焗马铃薯 -Baking Tray=烤盘 -Banana=香蕉 -Banana Leaves=香蕉叶 -Bar of Dark Chocolate=黑巧克力条 -Barley=大麦 +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=大麦种子 +Barley=大麦 +Green Beans=青豆 Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上） Beetroot=甜菜根 Beetroot Soup=甜菜根汤 -#Bibimbap= +Blackberries= Wild Blueberries=蓝莓 Blueberry Muffin=蓝莓松糕 Blueberry Pie=蓝莓派 -Bottle of Ethanol=一瓶乙醇 -Bottle of Hemp Oil=一瓶大麻油 -Bowl of Chili=一碗辣椒 -Bread=面包 -Bronze Hoe=青铜锄头 -#Cabbage= -#Cactus Juice= +Cabbage= Carrot=胡萝卜 Carrot Juice=胡萝卜汁 +Golden Carrot=金萝卜 Chili Pepper=辣椒 -Chocolate Block=巧克力块 -Chocolate Donut=巧克力甜甜圈 +Bowl of Chili=一碗辣椒 +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=可可豆 -Coffee Beans=咖啡豆 Cookie=曲奇 -Cooking Pot=锅 +Bar of Dark Chocolate=黑巧克力条 +Chocolate Block=巧克力块 +Coffee Beans=咖啡豆 +Cup of Coffee=一杯咖啡 +Banana=香蕉 +Banana Leaves=香蕉叶 +Orange=橙色 Corn=玉米 Corn on the Cob=玉米棒 +Popcorn= Cornstarch=玉米淀粉 -Cotton=棉花 +Bottle of Ethanol=一瓶乙醇 +Wild Cotton= Cotton Seed=棉籽 +Cotton=棉花 +String=线 Cucumber=黄瓜 -Cucumber and Potato Salad=黄瓜土豆沙拉 -Cup of Coffee=一杯咖啡 -Cutting Board=砧板 -Diamond Hoe=钻石锄 +Eggplant= +Glass of Water= +Sugar=糖 +Sugar Cube= +Caramel= +Salt=盐 +Mayonnaise= +Rose Water=玫瑰汁 +Turkish Delight=土耳其软糖 +Garlic Bread=蒜香面包 Donut=甜甜圈 -Flour=面粉 +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=蒜辫 -Garlic Bread=蒜香面包 -Garlic clove=蒜瓣 -Glass Mixing Bowl=搅拌杯 -Golden Carrot=金萝卜 +Ginger= Grapes=葡萄 -Green Beans=青豆 -Ground Pepper=胡椒粉 -Hemp Block=麻块 -Hemp Fibre=大麻纤维 -Hemp Leaf=大麻叶 -Hemp Rope=麻绳 +Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上） Hemp Seed=大麻籽 +Hemp Leaf=大麻叶 +Bottle of Hemp Oil=一瓶大麻油 +Hemp Fibre=大麻纤维 +Hemp Block=麻块 +Hemp Rope=麻绳 Hoe=锄头 -Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上） -Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关） -Jaffa Cake=佳发饼 -Juicer=榨汁机 -Melon=甜瓜 -Melon Slice=西瓜片 +Wooden Hoe=木锄 +Stone Hoe=石锄 +Steel Hoe=钢锄头 +Bronze Hoe=青铜锄头 Mese Hoe=黄石锄头 -#Mint Leaf= -#Mint Seeds= -#Mint Tea= -Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物） -Mortar and Pestle=研钵 -Multigrain Bread=杂粮面包 -Multigrain Flour=多粒面粉 -Oat seed=燕麦籽 -#Oats= +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=甜瓜 +Mint Seeds= +Mint Leaf= +Mint Tea= Onion=洋葱 -#Onion Soup= -Orange=橙色 -#Pasta= +Onion Soup= +Parsley= Pea Pod=豌豆荚 Pea Soup=豌豆汤 -Peas=豌豆 -Pepper=胡椒粉 Peppercorn=胡椒粉 -Pineapple=菠萝 -Pineapple Juice=菠萝汁 -Pineapple Ring=菠萝圈 +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=胡椒粉 Pineapple Top=菠萝上衣 -Porridge=粥 +Pineapple=菠萝 +Pineapple Ring=菠萝圈 +Pineapple Juice=菠萝汁 Potato=土豆 -Pumpkin=南瓜 +Baked Potato=焗马铃薯 +Cucumber and Potato Salad=黄瓜土豆沙拉 +Pumpkin Slice=南瓜片 +Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关） +Scarecrow Bottom=稻草人屁股 Pumpkin Bread=南瓜面包 Pumpkin Dough=南瓜面团 -Pumpkin Slice=南瓜片 +Pumpkin=南瓜 Raspberries=覆盆子 Raspberry Smoothie=覆盆子冰沙 Rhubarb=大黄 Rhubarb Pie=大黄派 +Rice Seed= Rice=大米 Rice Bread=米饭面包 Rice Flour=米粉 -Rice grains=稻谷 -Rose Water=玫瑰汁 -Rye=黑麦 Rye seed=黑麦种子 -Salt=盐 -Saucepan=平底锅 -#Savanna Soil= -Scarecrow Bottom=稻草人屁股 -Seed=种子 -Skillet=平底锅 -Sliced Bread=切片面包 +Rye=黑麦 +Oat seed=燕麦籽 +Oats= +Multigrain Flour=多粒面粉 +Multigrain Bread=杂粮面包 +Savanna Soil= +Wet Savanna Soil= Soil=土壤 -#Spaghetti= -Steel Hoe=钢锄头 -Stone Hoe=石锄 -Straw=稻草 +Wet Soil=湿土 +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=草莓 -String=线 -Sugar=糖 +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +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=小麦种子 +Wheat=小麦 +Straw=稻草 +Flour=面粉 +Bread=面包 +Sliced Bread=切片面包 Toast=烤面包片 Toast Sandwich=三明治面包 -Tomato=番茄 -Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上） -Turkish Delight=土耳其软糖 -#Wet Savanna Soil= -Wet Soil=湿土 -Wheat=小麦 -Wheat Seed=小麦种子 -#Wild Cotton= -Wooden Bowl=木碗 -Wooden Hoe=木锄 diff --git a/locale/farming.zh_TW.tr b/locale/farming.zh_TW.tr index 1ec8279..07a874a 100644 --- a/locale/farming.zh_TW.tr +++ b/locale/farming.zh_TW.tr @@ -1,134 +1,176 @@ -# textdomain:farming -#%s Hoe= -Apple Donut=蘋果甜甜圈 -#Apple Pie= -Baked Potato=焗馬鈴薯 -Baking Tray=烤盤 -Banana=香蕉 -Banana Leaves=香蕉葉 -Bar of Dark Chocolate=黑巧克力條 -Barley=大麥 +# textdomain: farming +Artichoke= +Asparagus= Barley Seed=大麥種子 +Barley=大麥 +Green Beans=青豆 Bean Pole (place on soil before planting beans)=豆杆（種豆前先放在土上） Beetroot=甜菜根 Beetroot Soup=甜菜根湯 -#Bibimbap= +Blackberries= Wild Blueberries=藍莓 Blueberry Muffin=藍莓鬆糕 Blueberry Pie=藍莓派 -Bottle of Ethanol=一瓶乙醇 -Bottle of Hemp Oil=一瓶大麻油 -Bowl of Chili=一碗辣椒 -Bread=麵包 -Bronze Hoe=青銅鋤頭 -#Cabbage= -#Cactus Juice= +Cabbage= Carrot=胡蘿蔔 Carrot Juice=胡蘿蔔汁 +Golden Carrot=金蘿蔔 Chili Pepper=辣椒 -Chocolate Block=巧克力塊 -Chocolate Donut=巧克力甜甜圈 +Bowl of Chili=一碗辣椒 +Chili Powder= +Raw Cocoa Beans= Cocoa Beans=可可豆 -Coffee Beans=咖啡豆 Cookie=曲奇 -Cooking Pot=鍋 +Bar of Dark Chocolate=黑巧克力條 +Chocolate Block=巧克力塊 +Coffee Beans=咖啡豆 +Cup of Coffee=一杯咖啡 +Banana=香蕉 +Banana Leaves=香蕉葉 +Orange=橙色 Corn=玉米 Corn on the Cob=玉米棒 +Popcorn= Cornstarch=玉米澱粉 -Cotton=棉花 +Bottle of Ethanol=一瓶乙醇 +Wild Cotton= Cotton Seed=棉籽 +Cotton=棉花 +String=字符串 Cucumber=黃瓜 -Cucumber and Potato Salad=黃瓜土豆沙拉 -Cup of Coffee=一杯咖啡 -Cutting Board=砧板 -Diamond Hoe=鑽石鋤 +Eggplant= +Glass of Water= +Sugar=糖 +Sugar Cube= +Caramel= +Salt=鹽 +Mayonnaise= +Rose Water=玫瑰汁 +Turkish Delight=土耳其軟糖 +Garlic Bread=蒜香麵包 Donut=甜甜圈 -Flour=麵粉 +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=蒜辮 -Garlic Bread=蒜香麵包 -Garlic clove=蒜瓣 -Glass Mixing Bowl=攪拌杯 -Golden Carrot=金蘿蔔 +Ginger= Grapes=葡萄 -Green Beans=青豆 -Ground Pepper=胡椒粉 -Hemp Block=麻塊 -Hemp Fibre=大麻纖維 -Hemp Leaf=大麻葉 -Hemp Rope=麻繩 +Trellis (place on soil before planting grapes)=棚架（種植葡萄前先放在土壤上） Hemp Seed=大麻籽 +Hemp Leaf=大麻葉 +Bottle of Hemp Oil=一瓶大麻油 +Hemp Fibre=大麻纖維 +Hemp Block=麻塊 +Hemp Rope=麻繩 Hoe=鋤頭 -Hoe Bomb (use or throw on grassy areas to hoe land)=鋤彈（在草地上使用或扔在鋤地上） -Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關） -Jaffa Cake=佳發餅 -Juicer=榨汁機 -Melon=甜瓜 -Melon Slice=西瓜片 +Wooden Hoe=木鋤 +Stone Hoe=石鋤 +Steel Hoe=鋼鋤頭 +Bronze Hoe=青銅鋤頭 Mese Hoe=黃石鋤頭 -#Mint Leaf= -#Mint Seeds= -#Mint Tea= -Mithril Scythe (Right-click to harvest and replant crops)=祕銀鐮刀（右擊可收穫並重新種植作物） -Mortar and Pestle=研缽 -Multigrain Bread=雜糧麵包 -Multigrain Flour=多粒麵粉 -Oat seed=燕麥籽 -#Oats= +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=甜瓜 +Mint Seeds= +Mint Leaf= +Mint Tea= Onion=洋蔥 -#Onion Soup= -Orange=橙色 -#Pasta= +Onion Soup= +Parsley= Pea Pod=豌豆莢 Pea Soup=豌豆湯 -Peas=豌豆 -Pepper=胡椒粉 Peppercorn=胡椒粉 -Pineapple=菠蘿 -Pineapple Juice=菠蘿汁 -Pineapple Ring=菠蘿圈 +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper=胡椒粉 Pineapple Top=菠蘿上衣 -Porridge=粥 +Pineapple=菠蘿 +Pineapple Ring=菠蘿圈 +Pineapple Juice=菠蘿汁 Potato=土豆 -Pumpkin=南瓜 +Baked Potato=焗馬鈴薯 +Cucumber and Potato Salad=黃瓜土豆沙拉 +Pumpkin Slice=南瓜片 +Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關） +Scarecrow Bottom=稻草人屁股 Pumpkin Bread=南瓜麵包 Pumpkin Dough=南瓜麵糰 -Pumpkin Slice=南瓜片 +Pumpkin=南瓜 Raspberries=覆盆子 Raspberry Smoothie=覆盆子冰沙 Rhubarb=大黃 Rhubarb Pie=大黃派 +Rice Seed= Rice=大米 Rice Bread=米飯麵包 Rice Flour=米粉 -Rice grains=稻穀 -Rose Water=玫瑰汁 -Rye=黑麥 Rye seed=黑麥種子 -Salt=鹽 -Saucepan=平底鍋 -#Savanna Soil= -Scarecrow Bottom=稻草人屁股 -Seed=種子 -Skillet=平底鍋 -Sliced Bread=切片面包 +Rye=黑麥 +Oat seed=燕麥籽 +Oats= +Multigrain Flour=多粒麵粉 +Multigrain Bread=雜糧麵包 +Savanna Soil= +Wet Savanna Soil= Soil=土壤 -#Spaghetti= -Steel Hoe=鋼鋤頭 -Stone Hoe=石鋤 -Straw=稻草 +Wet Soil=溼土 +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= Strawberry=草莓 -String=字符串 -Sugar=糖 +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +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=小麥種子 +Wheat=小麥 +Straw=稻草 +Flour=麵粉 +Bread=麵包 +Sliced Bread=切片面包 Toast=烤麵包片 Toast Sandwich=三明治麵包 -Tomato=番茄 -Trellis (place on soil before planting grapes)=棚架（種植葡萄前先放在土壤上） -Turkish Delight=土耳其軟糖 -#Wet Savanna Soil= -Wet Soil=溼土 -Wheat=小麥 -Wheat Seed=小麥種子 -#Wild Cotton= -Wooden Bowl=木碗 -Wooden Hoe=木鋤 diff --git a/locale/template.txt b/locale/template.txt new file mode 100644 index 0000000..746a41e --- /dev/null +++ b/locale/template.txt @@ -0,0 +1,176 @@ +# textdomain: farming +Artichoke= +Asparagus= +Barley Seed= +Barley= +Green Beans= +Bean Pole (place on soil before planting beans)= +Beetroot= +Beetroot Soup= +Blackberries= +Wild Blueberries= +Blueberry Muffin= +Blueberry Pie= +Cabbage= +Carrot= +Carrot Juice= +Golden Carrot= +Chili Pepper= +Bowl of Chili= +Chili Powder= +Raw Cocoa Beans= +Cocoa Beans= +Cookie= +Bar of Dark Chocolate= +Chocolate Block= +Coffee Beans= +Cup of Coffee= +Banana= +Banana Leaves= +Orange= +Corn= +Corn on the Cob= +Popcorn= +Cornstarch= +Bottle of Ethanol= +Wild Cotton= +Cotton Seed= +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= +Ginger= +Grapes= +Trellis (place on soil before planting grapes)= +Hemp Seed= +Hemp Leaf= +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= +Mint Seeds= +Mint Leaf= +Mint Tea= +Onion= +Onion Soup= +Parsley= +Pea Pod= +Pea Soup= +Peppercorn= +Green Pepper= +Yellow Pepper= +Red Pepper= +Ground Pepper= +Pineapple Top= +Pineapple= +Pineapple Ring= +Pineapple Juice= +Potato= +Baked Potato= +Cucumber and Potato Salad= +Pumpkin Slice= +Jack 'O Lantern (punch to turn on and off)= +Scarecrow Bottom= +Pumpkin Bread= +Pumpkin Dough= +Pumpkin= +Raspberries= +Raspberry Smoothie= +Rhubarb= +Rhubarb Pie= +Rice Seed= +Rice= +Rice Bread= +Rice Flour= +Rye seed= +Rye= +Oat seed= +Oats= +Multigrain Flour= +Multigrain Bread= +Savanna Soil= +Wet Savanna Soil= +Soil= +Wet Soil= +Soy Pod= +Soy Sauce= +Soy Milk= +Tofu= +Cooked Tofu= +Spinach= +Strawberry= +Sunflower= +Sunflower Seeds= +Toasted Sunflower Seeds= +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= +Wheat= +Straw= +Flour= +Bread= +Sliced Bread= +Toast= +Toast Sandwich= diff --git a/soil.lua b/soil.lua index ed557ee..d20cd57 100644 --- a/soil.lua +++ b/soil.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- default dry soil node diff --git a/utensils.lua b/utensils.lua index f9b2d29..251d415 100644 --- a/utensils.lua +++ b/utensils.lua @@ -1,5 +1,5 @@ -local S = farming.intllib +local S = farming.translate -- wooden bowl From 581a1bbaeffddf8b1dfb769e89b8e45e49756150 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 14 Aug 2023 08:24:20 +0100 Subject: [PATCH 07/34] update mod.conf --- mod.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod.conf b/mod.conf index 1e362ec..188dced 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,5 @@ name = farming +description = Adds many new plants and food into Minetest. depends = default optional_depends = stairs, lucky_block, toolranks -description = Adds many plants and food to Minetest +min_minetest_version = 5.0 From df64f1117f9e1b290e3ce59e19dc0b563d3e60fe Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 31 Aug 2023 07:53:19 +0100 Subject: [PATCH 08/34] add initial MineClone2 support (thx usrib) --- api.txt | 2 +- crops/artichoke.lua | 6 ++--- crops/asparagus.lua | 6 ++--- crops/barley.lua | 6 ++--- crops/beans.lua | 12 +++++----- crops/beetroot.lua | 6 ++--- crops/blackberry.lua | 10 +++++---- crops/blueberry.lua | 12 +++++----- crops/cabbage.lua | 6 ++--- crops/carrot.lua | 6 ++--- crops/chili.lua | 8 +++---- crops/cocoa.lua | 21 ++++++++++-------- crops/coffee.lua | 8 +++---- crops/corn.lua | 8 +++---- crops/cotton.lua | 13 ++++++----- crops/cucumber.lua | 6 ++--- crops/eggplant.lua | 6 ++--- crops/garlic.lua | 8 +++---- crops/ginger.lua | 8 +++---- crops/grapes.lua | 16 +++++++------- crops/hemp.lua | 18 +++++++-------- crops/lettuce.lua | 6 ++--- crops/melon.lua | 10 ++++----- crops/mint.lua | 9 +++++--- crops/onion.lua | 8 +++---- crops/parsley.lua | 6 ++--- crops/peas.lua | 8 ++++--- crops/pepper.lua | 8 +++---- crops/pineapple.lua | 6 ++--- crops/potato.lua | 6 ++--- crops/pumpkin.lua | 20 ++++++++--------- crops/raspberry.lua | 6 ++--- crops/rhubarb.lua | 6 ++--- crops/rice.lua | 9 +++++--- crops/soy.lua | 10 ++++----- crops/spinach.lua | 6 ++--- crops/strawberry.lua | 8 ++++--- crops/sunflower.lua | 12 +++++----- crops/tomato.lua | 6 ++--- crops/vanilla.lua | 8 +++---- crops/wheat.lua | 8 +++---- food.lua | 10 ++++----- init.lua | 52 +++++++++++++++++++++++++++++++++++++------- mcl_grass.lua | 16 ++++++++++++++ mod.conf | 3 +-- 45 files changed, 256 insertions(+), 183 deletions(-) create mode 100644 mcl_grass.lua diff --git a/api.txt b/api.txt index cd8cc76..37cf534 100644 --- a/api.txt +++ b/api.txt @@ -41,7 +41,7 @@ The farming API allows you to easily register plants and hoes. steps = 8, -- How many steps the plant has to grow, until it can be harvested -- ^ Always provide a plant texture for each step, format: modname_plantname_i.png (i = stepnumber) minlight = 13, -- Minimum light to grow - maxlight = default.LIGHT_MAX -- Maximum light to grow + maxlight = minetest.LIGHT_MAX -- Maximum light to grow } Note: Any crops registered with the above function will use the new growing routines, also if crops are manually added with the {growing=1} group they will also grow. diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 0034026..0831eaf 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 = {seed = 2, food_artichoke = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -24,10 +24,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/asparagus.lua b/crops/asparagus.lua index a88b01a..001c723 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 = {seed = 2, food_asparagus = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -26,10 +26,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/barley.lua b/crops/barley.lua index 6c317e0..6ac4cc7 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -8,7 +8,7 @@ minetest.register_node("farming:seed_barley", { inventory_image = "farming_barley_seed.png", wield_image = "farming_barley_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1}, + groups = {compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -53,10 +53,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/beans.lua b/crops/beans.lua index 2c43d1c..8851dc6 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -71,7 +71,7 @@ end minetest.register_craftitem("farming:beans", { description = S("Green Beans"), inventory_image = "farming_beans.png", - groups = {seed = 2, food_beans = 1, flammable = 2}, + groups = {compostability = 65, 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") @@ -97,8 +97,8 @@ minetest.register_node("farming:beanpole", { sunlight_propagates = true, drop = "farming:beanpole", selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = default.node_sound_leaves_defaults(), + groups = {handy = 1, snappy = 3, flammable = 2, attached_node = 1}, + sounds = farming.sounds.node_sound_leaves_defaults(), on_place = function(itemstack, placer, pointed_thing) @@ -186,10 +186,10 @@ local def = { }, selection_box = farming.select, groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, + handy = 1, snappy = 3, flammable = 3, not_in_creative_inventory = 1, attached_node = 1, growing = 1, plant = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 @@ -252,7 +252,7 @@ minetest.register_node("farming:beanbush", { snappy = 3, flammable = 2, plant = 1, attached_node = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() }) -- mapgen diff --git a/crops/beetroot.lua b/crops/beetroot.lua index ea7fd10..8b7dd8c 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:beetroot", { description = S("Beetroot"), inventory_image = "farming_beetroot.png", - groups = {seed = 2, food_beetroot = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -45,10 +45,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/blackberry.lua b/crops/blackberry.lua index 109ad5b..f9ace9e 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -5,8 +5,10 @@ local S = farming.translate 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}, + groups = { + compostability = 65, 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, @@ -23,10 +25,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 280e4dd..1810f77 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -5,8 +5,10 @@ local S = farming.translate minetest.register_craftitem("farming:blueberries", { description = S("Wild Blueberries"), inventory_image = "farming_blueberries.png", - groups = {seed = 2, food_blueberries = 1, food_blueberry = 1, - food_berry = 1, flammable = 2}, + groups = { + compostability = 65,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, @@ -47,7 +49,7 @@ minetest.register_craft({ -- Blue Dye minetest.register_craft({ - output = "dye:blue", + output = farming.mcl and "mcl_dye:blue" or "dye:blue", recipe = {{"farming:blueberries"}} }) @@ -62,10 +64,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 6829493..dbe7989 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 = {seed = 2, food_cabbage = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -23,10 +23,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/carrot.lua b/crops/carrot.lua index f521f9c..fb61000 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -10,7 +10,7 @@ local S = farming.translate minetest.register_craftitem("farming:carrot", { description = S("Carrot"), inventory_image = "farming_carrot.png", - groups = {seed = 2, food_carrot = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -63,10 +63,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } diff --git a/crops/chili.lua b/crops/chili.lua index 13a34a9..2dead5d 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:chili_pepper", { description = S("Chili Pepper"), inventory_image = "farming_chili_pepper.png", - groups = {seed = 2, food_chili_pepper = 1, flammable = 4}, + groups = {compostability = 65, 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 +29,7 @@ minetest.register_craft({ -- chili can be used for red dye minetest.register_craft({ - output = "dye:red", + output = farming.mcl and "mcl_dye:red" or "dye:red", recipe = {{"farming:chili_pepper"}} }) @@ -63,10 +63,10 @@ local def = { waving = 1, selection_box = farming.select, groups = { - snappy = 3, flammable = 4, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 4, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 0372252..cbe6454 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -26,7 +26,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname) end -- check if pointing at jungletree - if under.name ~= "default:jungletree" + if (under.name ~= "default:jungletree" and under.name ~= "mcl_core:jungletree") or minetest.get_node(pt.above).name ~= "air" then return end @@ -67,7 +67,7 @@ end minetest.register_craftitem("farming:cocoa_beans_raw", { description = S("Raw Cocoa Beans"), inventory_image = "farming_cocoa_beans.png^[brighten", - groups = {seed = 1, flammable = 2}, + groups = {compostability = 65, seed = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") end @@ -87,7 +87,7 @@ minetest.register_craft({ }) minetest.register_craft( { - output = "dye:brown 2", + output = farming.mcl and "mcl_dye:brown 2" or "dye:brown 2", recipe = {{"farming:cocoa_beans"}} }) @@ -125,7 +125,7 @@ minetest.register_node("farming:chocolate_block", { tiles = {"farming_chocolate_block.png"}, is_ground_content = false, groups = {cracky = 2, oddly_breakable_by_hand = 2}, - sounds = default.node_sound_stone_defaults() + sounds = farming.sounds.node_sound_stone_defaults() }) minetest.register_craft({ @@ -154,13 +154,14 @@ local def = { }, drop = {}, groups = { - snappy = 3, flammable = 2, plant = 1, growing = 1, + handy = 1, snappy = 3, flammable = 2, plant = 1, growing = 1, not_in_creative_inventory = 1, leafdecay = 1, leafdecay_drop = 1 }, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), growth_check = function(pos, node_name) - if minetest.find_node_near(pos, 1, {"default:jungletree"}) then + if minetest.find_node_near(pos, 1, + {"default:jungletree", "mcl_core:jungletree"}) then return false -- can grow end @@ -218,14 +219,16 @@ minetest.register_on_generated(function(minp, maxp) end local pos, dir - local cocoa = minetest.find_nodes_in_area(minp, maxp, "default:jungletree") + local cocoa = minetest.find_nodes_in_area(minp, maxp, + {"default:jungletree", "mcl_core:jungletree"}) for n = 1, #cocoa do pos = cocoa[n] if minetest.find_node_near(pos, 1, - {"default:jungleleaves", "moretrees:jungletree_leaves_green"}) then + {"default:jungleleaves", "moretrees:jungletree_leaves_green", + "mcl_core:jungleleaves"}) then dir = random(80) diff --git a/crops/coffee.lua b/crops/coffee.lua index 8823e9d..002121b 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:coffee_beans", { description = S("Coffee Beans"), inventory_image = "farming_coffee_beans.png", - groups = {seed = 2, food_coffee = 1, flammable = 2}, + groups = {compostability = 65, 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 @@ -26,7 +26,7 @@ minetest.register_node("farming:coffee_cup", { }, groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1}, on_use = minetest.item_eat(2, "vessels:drinking_glass"), - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup") @@ -57,10 +57,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/corn.lua b/crops/corn.lua index 08fa275..6b1d89b 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -10,7 +10,7 @@ local S = farming.translate minetest.register_craftitem("farming:corn", { description = S("Corn"), inventory_image = "farming_corn.png", - groups = {seed = 2, food_corn = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -90,7 +90,7 @@ minetest.register_node("farming:bottle_ethanol", { 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() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_craft( { @@ -121,10 +121,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/cotton.lua b/crops/cotton.lua index eb7b289..d1aba32 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -13,14 +13,14 @@ minetest.register_node("farming:cotton_wild", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, attached_node = 1, flammable = 4}, + groups = {handy = 1, snappy = 3, attached_node = 1, flammable = 4}, drop = { items = { {items = {"farming:cotton"}, rarity = 2}, {items = {"farming:seed_cotton"}, rarity = 1} } }, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16} @@ -34,7 +34,10 @@ minetest.register_node("farming:seed_cotton", { inventory_image = "farming_cotton_seed.png", wield_image = "farming_cotton_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1}, + groups = { + compostability = 65, seed = 1, snappy = 3, attached_node = 1, + flammable = 4, growing = 1 + }, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -103,10 +106,10 @@ local def = { waving = 1, selection_box = farming.select, groups = { - snappy = 3, flammable = 4, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 4, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/cucumber.lua b/crops/cucumber.lua index 7acd28a..5edd356 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 = {seed = 2, food_cucumber = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -27,10 +27,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 20bdf07..8cdf2e3 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 = {seed = 2, food_eggplant = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -25,10 +25,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/garlic.lua b/crops/garlic.lua index 0e53c14..d750598 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 = {seed = 2, food_garlic_clove = 1, flammable = 3}, + groups = {compostability = 65, 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 @@ -54,7 +54,7 @@ minetest.register_node("farming:garlic_braid", { "crops_garlic_braid.png","crops_garlic_braid.png" }, groups = {vessel = 1, dig_immediate = 3, flammable = 3}, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -92,10 +92,10 @@ local def = { drop = "", selection_box = farming.select, groups = { - snappy = 3, flammable = 3, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 3, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/ginger.lua b/crops/ginger.lua index 700c5cf..c7ba67a 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 = {seed = 2, food_ginger = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -24,10 +24,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 @@ -64,7 +64,7 @@ farming.registered_plants["farming:ginger"] = { crop = "farming:ginger", seed = "farming:ginger", minlight = 5, - maxlight = default.LIGHT_MAX, + maxlight = minetest.LIGHT_MAX, steps = 4 } diff --git a/crops/grapes.lua b/crops/grapes.lua index 3d61332..7afa68d 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -67,7 +67,7 @@ minetest.register_craftitem("farming:grapes", { description = S("Grapes"), inventory_image = "farming_grapes.png", on_use = minetest.item_eat(2), - groups = {seed = 2, food_grapes = 1, flammable = 3}, + groups = {compostability = 65, 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 +75,7 @@ minetest.register_craftitem("farming:grapes", { -- grapes can be used for violet dye minetest.register_craft({ - output = "dye:violet", + output = farming.mcl and "mcl_dye:violet" or "dye:violet", recipe = {{"farming:grapes"}} }) @@ -92,8 +92,8 @@ minetest.register_node("farming:trellis", { sunlight_propagates = true, drop = "farming:trellis", selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = default.node_sound_leaves_defaults(), + groups = {handy = 1, snappy = 3, flammable = 2, attached_node = 1}, + sounds = farming.sounds.node_sound_leaves_defaults(), on_place = function(itemstack, placer, pointed_thing) @@ -181,10 +181,10 @@ local def = { }, selection_box = farming.select, groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, + handy = 1, snappy = 3, flammable = 3, not_in_creative_inventory = 1, attached_node = 1, growing = 1, plant = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 @@ -256,10 +256,10 @@ minetest.register_node("farming:grapebush", { }, 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 = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() }) -- mapgen diff --git a/crops/hemp.lua b/crops/hemp.lua index c7da66f..b06431e 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -8,7 +8,7 @@ minetest.register_node("farming:seed_hemp", { inventory_image = "farming_hemp_seed.png", wield_image = "farming_hemp_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1}, + groups = {compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -41,7 +41,7 @@ minetest.register_node("farming:hemp_oil", { 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}, - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_craft( { @@ -102,8 +102,8 @@ minetest.register_node("farming:hemp_block", { description = S("Hemp Block"), tiles = {"farming_hemp_block.png"}, paramtype = "light", - groups = {snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, - sounds = default.node_sound_leaves_defaults() + groups = {handy = 1, snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + sounds = farming.sounds.node_sound_leaves_defaults() }) minetest.register_craft( { @@ -124,7 +124,7 @@ if minetest.global_exists("stairs") then {snappy = 2, oddly_breakable_by_hand = 1, flammable = 2}, {"farming_hemp_block.png"}, "Hemp Block", - default.node_sound_leaves_defaults()) + farming.sounds.node_sound_leaves_defaults()) else stairs.register_stair_and_slab("hemp_block", "farming:hemp_block", @@ -132,7 +132,7 @@ if minetest.global_exists("stairs") then {"farming_hemp_block.png"}, "Hemp Block Stair", "Hemp Block Slab", - default.node_sound_leaves_defaults()) + farming.sounds.node_sound_leaves_defaults()) end end @@ -166,7 +166,7 @@ minetest.register_node("farming:hemp_rope", { inventory_image = "farming_hemp_rope.png", drawtype = "plantlike", groups = {flammable = 2, choppy = 3, oddly_breakable_by_hand = 3}, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7} @@ -195,10 +195,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 554ea2f..09265d9 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 = {seed = 2, food_lettuce = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -22,10 +22,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/melon.lua b/crops/melon.lua index c373f3d..0fdb328 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:melon_slice", { description = S("Melon Slice"), inventory_image = "farming_melon_slice.png", - groups = {seed = 2, food_melon_slice = 1, flammable = 3}, + groups = {compostability = 65, 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, @@ -39,10 +39,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 @@ -81,11 +81,11 @@ minetest.register_node("farming:melon_8", { "farming_melon_side.png" }, groups = { - food_melon = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, + food_melon = 1, handy = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, flammable = 2, plant = 1 }, drop = "farming:melon_8", - sounds = default.node_sound_wood_defaults(), + sounds = farming.sounds.node_sound_wood_defaults(), paramtype2 = "facedir", on_place = minetest.rotate_node }) diff --git a/crops/mint.lua b/crops/mint.lua index 95bd97d..b93b3e7 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -8,7 +8,10 @@ minetest.register_node("farming:seed_mint", { inventory_image = "farming_mint_seeds.png", wield_image = "farming_mint_seeds.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1, flammable = 2}, + groups = { + compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1, + flammable = 2 + }, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -60,10 +63,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/onion.lua b/crops/onion.lua index cf08545..ae404ea 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -11,7 +11,7 @@ local S = farming.translate minetest.register_craftitem("farming:onion", { description = S("Onion"), inventory_image = "crops_onion.png", - groups = {seed = 2, food_onion = 1, flammable = 3}, + groups = {compostability = 65, 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, @@ -40,7 +40,7 @@ minetest.register_craft({ -- yellow dye minetest.register_craft({ - output = "dye:yellow", + output = farming.mcl and "mcl_dye:yellow" or "dye:yellow", recipe = {{"group:food_onion"}} }) @@ -59,10 +59,10 @@ local def = { waving = 1, selection_box = farming.select, groups = { - snappy = 3, flammable = 3, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 3, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/parsley.lua b/crops/parsley.lua index 4aabbe8..2b678ee 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 = {seed = 2, food_parsley = 1, flammable = 2}, + groups = {compostability = 65, 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 @@ -23,10 +23,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/peas.lua b/crops/peas.lua index 6cb212e..5fd3029 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -7,7 +7,9 @@ local S = farming.translate minetest.register_craftitem("farming:pea_pod", { description = S("Pea Pod"), inventory_image = "farming_pea_pod.png", - groups = {seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2}, + groups = { + compostability = 65, 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") end, @@ -47,10 +49,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/pepper.lua b/crops/pepper.lua index 5a5bba5..c6a154a 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -11,7 +11,7 @@ local S = farming.translate minetest.register_craftitem("farming:peppercorn", { description = S("Peppercorn"), inventory_image = "crops_peppercorn.png", - groups = {seed = 1, food_peppercorn = 1, flammable = 3}, + groups = {compostability = 65, 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 @@ -59,7 +59,7 @@ minetest.register_node("farming:pepper_ground", { vessel = 1, food_pepper_ground = 1, dig_immediate = 3, attached_node = 1 }, - sounds = default.node_sound_defaults(), + sounds = farming.sounds.node_sound_defaults(), selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} @@ -92,10 +92,10 @@ local def = { drop = "", selection_box = farming.select, groups = { - snappy = 3, flammable = 3, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 3, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/pineapple.lua b/crops/pineapple.lua index f3d962c..ed67b3f 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:pineapple_top", { description = S("Pineapple Top"), inventory_image = "farming_pineapple_top.png", - groups = {seed = 2, flammable = 2}, + groups = {compostability = 65, seed = 2, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1") end @@ -90,10 +90,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/potato.lua b/crops/potato.lua index e87f494..56b6804 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 = {seed = 2, food_potato = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -68,10 +68,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 1f78e37..714cd8c 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 = {seed = 2, food_pumpkin_slice = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -37,8 +37,8 @@ minetest.register_node("farming:jackolantern", { "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_off.png" }, paramtype2 = "facedir", - groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = default.node_sound_wood_defaults(), + 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 "" if minetest.is_protected(pos, name) then return end @@ -53,13 +53,13 @@ minetest.register_node("farming:jackolantern_on", { "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_on.png" }, - light_source = default.LIGHT_MAX - 1, + light_source = minetest.LIGHT_MAX - 1, paramtype2 = "facedir", groups = { - snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, + handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1 }, - sounds = default.node_sound_wood_defaults(), + sounds = farming.sounds.node_sound_wood_defaults(), drop = "farming:jackolantern", on_punch = function(pos, node, puncher) local name = puncher:get_player_name() or "" @@ -92,7 +92,7 @@ minetest.register_node("farming:scarecrow_bottom", { {-12/16, 4/16, -1/16, 12/16, 2/16, 1/16}, } }, - groups = {snappy = 3, flammable = 2} + groups = {handy = 1, snappy = 3, flammable = 2} }) minetest.register_craft({ @@ -143,10 +143,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 @@ -189,7 +189,7 @@ minetest.register_node("farming:pumpkin_8", { flammable = 2, plant = 1 }, drop = "farming:pumpkin_8", - sounds = default.node_sound_wood_defaults(), + sounds = farming.sounds.node_sound_wood_defaults(), paramtype2 = "facedir", on_place = minetest.rotate_node }) diff --git a/crops/raspberry.lua b/crops/raspberry.lua index a2489f4..20ca7d1 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:raspberries", { description = S("Raspberries"), inventory_image = "farming_raspberries.png", - groups = {seed = 2, food_raspberries = 1, food_raspberry = 1, + groups = {compostability = 65, 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") @@ -41,10 +41,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index a0d6860..b3b14cd 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:rhubarb", { description = S("Rhubarb"), inventory_image = "farming_rhubarb.png", - groups = {seed = 2, food_rhubarb = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -43,10 +43,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), minlight = 10, maxlight = 12 } diff --git a/crops/rice.lua b/crops/rice.lua index 0951347..c222296 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -8,7 +8,10 @@ minetest.register_node("farming:seed_rice", { inventory_image = "farming_rice_seed.png", wield_image = "farming_rice_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1}, + groups = { + compostability = 65, seed = 1, snappy = 3, attached_node = 1, + flammable = 4, growing = 1 + }, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -81,10 +84,10 @@ local def = { waving = 1, selection_box = farming.select, groups = { - snappy = 3, flammable = 4, plant = 1, attached_node = 1, + handy = 1, snappy = 3, flammable = 4, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/soy.lua b/crops/soy.lua index c955ea4..107e4e1 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:soy_pod", { description = S("Soy Pod"), inventory_image = "farming_soy_pod.png", - groups = {seed = 2, food_soy = 1, food_soy_pod = 1, flammable = 2}, + groups = {compostability = 65, 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 @@ -30,7 +30,7 @@ minetest.register_node("farming:soy_sauce", { groups = { vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1 }, - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) local tmp = farming.use_utensils and "farming:juicer" or "" @@ -66,7 +66,7 @@ minetest.register_node("farming:soy_milk", { vessel = 1, food_milk_glass = 1, dig_immediate = 3, attached_node = 1, drink = 1 }, - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_craft( { @@ -130,10 +130,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/spinach.lua b/crops/spinach.lua index 92bf68c..24126b0 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 = {seed = 2, food_spinach = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -24,10 +24,10 @@ local def = { drop = "", 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 1e9ba6c..3c2bfee 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -5,7 +5,9 @@ local S = farming.translate minetest.register_craftitem(":ethereal:strawberry", { description = S("Strawberry"), inventory_image = "ethereal_strawberry.png", - groups = {seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2}, + groups = { + compostability = 65, 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") end, @@ -27,10 +29,10 @@ local def = { fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} }, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } --stage 1 diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 403528c..298ea3f 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -15,8 +15,10 @@ minetest.register_node("farming:seed_sunflower", { inventory_image = "farming_sunflower_seeds.png", wield_image = "farming_sunflower_seeds.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1, - food_sunflower_seeds = 1, flammable = 2}, + groups = { + compostability = 65, seed = 1, snappy = 3, attached_node = 1, growing = 1, + food_sunflower_seeds = 1, flammable = 2 + }, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -68,7 +70,7 @@ minetest.register_node("farming:sunflower_oil", { food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1, flammable = 2 }, - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_craft( { @@ -112,10 +114,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/tomato.lua b/crops/tomato.lua index c78293e..f6a1104 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 = {seed = 2, food_tomato = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -46,10 +46,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/crops/vanilla.lua b/crops/vanilla.lua index cb309ac..680f235 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -5,7 +5,7 @@ local S = farming.translate minetest.register_craftitem("farming:vanilla", { description = S("Vanilla"), inventory_image = "farming_vanilla.png", - groups = {seed = 2, food_vanilla = 1, flammable = 2}, + groups = {compostability = 65, 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, @@ -24,10 +24,10 @@ local def = { waving = 1, 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, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- vanilla extract @@ -45,7 +45,7 @@ minetest.register_node("farming:vanilla_extract", { 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(), + sounds = farming.sounds.node_sound_glass_defaults(), }) minetest.register_craft( { diff --git a/crops/wheat.lua b/crops/wheat.lua index 99c02a3..9e9b44f 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -33,7 +33,7 @@ minetest.register_node("farming:straw", { tiles = {"farming_straw.png"}, is_ground_content = false, groups = {snappy = 3, flammable = 4, fall_damage_add_percent = -30}, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() }) minetest.register_craft({ @@ -59,7 +59,7 @@ if minetest.global_exists("stairs") then {snappy = 3, flammable = 4}, {"farming_straw.png"}, "Straw", - default.node_sound_leaves_defaults()) + farming.sounds.node_sound_leaves_defaults()) else stairs.register_stair_and_slab("straw", "farming:straw", @@ -67,7 +67,7 @@ if minetest.global_exists("stairs") then {"farming_straw.png"}, "Straw Stair", "Straw Slab", - default.node_sound_leaves_defaults()) + farming.sounds.node_sound_leaves_defaults()) end end @@ -169,7 +169,7 @@ local def = { snappy = 3, flammable = 4, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = farming.sounds.node_sound_leaves_defaults() } -- stage 1 diff --git a/food.lua b/food.lua index 521c70f..1948b26 100644 --- a/food.lua +++ b/food.lua @@ -74,7 +74,7 @@ minetest.register_node("farming:sugar_cube", { tiles = {"farming_sugar_cube.png"}, groups = {crumbly = 2}, floodable = true, - sounds = default.node_sound_gravel_defaults() + sounds = farming.sounds.node_sound_gravel_defaults() }) minetest.register_craft({ @@ -117,7 +117,7 @@ minetest.register_node("farming:salt", { tiles = {"farming_salt.png"}, groups = {food_salt = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_defaults(), + sounds = farming.sounds.node_sound_defaults(), selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} @@ -185,7 +185,7 @@ minetest.register_node("farming:salt_crystal", { light_source = 1, tiles = {"farming_salt_crystal.png"}, groups = { dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_defaults(), + sounds = farming.sounds.node_sound_defaults(), selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} @@ -228,7 +228,7 @@ minetest.register_node("farming:mayonnaise", { 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}, - sounds = default.node_sound_glass_defaults() + sounds = farming.sounds.node_sound_glass_defaults() }) minetest.register_craft({ @@ -252,7 +252,7 @@ minetest.register_node("farming:rose_water", { tiles = {"farming_rose_water.png"}, groups = {food_rose_water = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_defaults(), + sounds = farming.sounds.node_sound_defaults(), selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} diff --git a/init.lua b/init.lua index 0260e92..1e1040a 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230814", + version = "20230831", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -21,10 +21,24 @@ farming = { min_light = 12, max_light = 15, mapgen = minetest.get_mapgen_setting("mg_name"), - use_utensils = minetest.settings:get_bool("farming_use_utensils") ~= false + use_utensils = minetest.settings:get_bool("farming_use_utensils") ~= false, + mtg = minetest.get_modpath("default"), + mcl = minetest.get_modpath("mcl_core"), + sounds = {} } +-- default sound functions just incase +function farming.sounds.node_sound_defaults() end +function farming.sounds.node_sound_leaves_defaults() end +function farming.sounds.node_sound_glass_defaults() end +function farming.sounds.node_sound_wood_defaults() end +function farming.sounds.node_sound_gravel_defaults() end +-- sounds check +if farming.mtg then farming.sounds = default end +if farming.mcl then farming.sounds = mcl_sounds end + +-- check for creative mode or priv local creative_mode_cache = minetest.settings:get_bool("creative_mode") function farming.is_creative(name) @@ -614,7 +628,7 @@ farming.register_plant = function(name, def) drop = drop, selection_box = sel, groups = g, - sounds = default.node_sound_leaves_defaults(), + sounds = farming.sounds.node_sound_leaves_defaults(), minlight = def.minlight, maxlight = def.maxlight, next_plant = next_plant @@ -694,15 +708,34 @@ end -- important items -dofile(farming.path.."/soil.lua") -dofile(farming.path.."/hoes.lua") -dofile(farming.path.."/grass.lua") +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") +end + dofile(farming.path.."/utensils.lua") -- default crops -dofile(farming.path.."/crops/wheat.lua") +if farming.mtg then + dofile(farming.path.."/crops/wheat.lua") +end + dofile(farming.path.."/crops/cotton.lua") +-- disable crops Mineclone already has +if farming.mcl then + farming.carrot = nil + farming.potato = nil + farming.melon = nil + farming.cocoa = nil + farming.beetroot = nil + farming.sunflower = nil +end -- helper function local function ddoo(file, check) @@ -754,7 +787,10 @@ ddoo("spinach.lua", farming.eggplant) ddoo("ginger.lua", farming.ginger) dofile(farming.path .. "/food.lua") -dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility + +if farming.mtg then + dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility +end if minetest.get_modpath("lucky_block") then dofile(farming.path .. "/lucky_block.lua") diff --git a/mcl_grass.lua b/mcl_grass.lua new file mode 100644 index 0000000..e80538a --- /dev/null +++ b/mcl_grass.lua @@ -0,0 +1,16 @@ + +-- 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} + } + } +}) diff --git a/mod.conf b/mod.conf index 188dced..c49972b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,4 @@ name = farming description = Adds many new plants and food into Minetest. -depends = default -optional_depends = stairs, lucky_block, toolranks +optional_depends = default, mcl_core, mcl_sounds, mcl_farming, mcl_stairs, stairs, lucky_block, toolranks min_minetest_version = 5.0 From 8ce92bdb913c6ecbdc1187b355641c936764fc98 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 31 Aug 2023 09:33:47 +0100 Subject: [PATCH 09/34] disable pumpkin in mcl2 --- init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/init.lua b/init.lua index 1e1040a..14744bc 100644 --- a/init.lua +++ b/init.lua @@ -735,6 +735,7 @@ if farming.mcl then farming.cocoa = nil farming.beetroot = nil farming.sunflower = nil + farming.pumpkin = nil end -- helper function From fd58dcaab1563c65532370a45e98a46fbb64f292 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 31 Aug 2023 13:59:06 +0100 Subject: [PATCH 10/34] food recipes work with mineclone --- food.lua | 225 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 151 insertions(+), 74 deletions(-) diff --git a/food.lua b/food.lua index 1948b26..20e11ad 100644 --- a/food.lua +++ b/food.lua @@ -2,14 +2,80 @@ local S = farming.translate local tmp +-- 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 + +-- 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", +} + +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" + + 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 + -- filter sea water into river water minetest.register_craft({ - output = "bucket:bucket_river_water", + output = a.bucket_river_water, recipe = { {"farming:hemp_fibre"}, {"farming:hemp_fibre"}, - {"bucket:bucket_water"} + {a.bucket_water} } }) @@ -24,21 +90,21 @@ minetest.register_craftitem("farming:glass_water", { minetest.register_craft({ output = "farming:glass_water 4", recipe = { - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {"bucket:bucket_river_water", ""} + {a.drinking_glass, a.drinking_glass}, + {a.drinking_glass, a.drinking_glass}, + {a.bucket_river_water, ""} }, - replacements = {{"bucket:bucket_river_water", "bucket:bucket_empty"}} + replacements = {{a.bucket_river_water, a.bucket_empty}} }) minetest.register_craft({ output = "farming:glass_water 4", recipe = { - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {"bucket:bucket_water", "farming:hemp_fibre"} + {a.drinking_glass, a.drinking_glass}, + {a.drinking_glass, a.drinking_glass}, + {a.bucket_water, "farming:hemp_fibre"} }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} + replacements = {{a.bucket_water, a.bucket_empty}} }) if minetest.get_modpath("bucket_wooden") then @@ -46,8 +112,8 @@ if minetest.get_modpath("bucket_wooden") then minetest.register_craft({ output = "farming:glass_water 4", recipe = { - {"vessels:drinking_glass", "vessels:drinking_glass"}, - {"vessels:drinking_glass", "vessels:drinking_glass"}, + {a.drinking_glass, a.drinking_glass}, + {a.drinking_glass, a.drinking_glass}, {"group:water_bucket_wooden", "farming:hemp_fibre"} }, replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}} @@ -56,18 +122,25 @@ end -- Sugar -minetest.register_craftitem("farming:sugar", { - description = S("Sugar"), - inventory_image = "farming_sugar.png", - groups = {food_sugar = 1, flammable = 3} -}) +if farming.mtg then -minetest.register_craft({ - type = "cooking", - cooktime = 3, - output = "farming:sugar 2", - recipe = "default:papyrus" -}) + minetest.register_craftitem("farming:sugar", { + description = S("Sugar"), + inventory_image = "farming_sugar.png", + groups = {food_sugar = 1, flammable = 3} + }) + + minetest.register_craft({ + type = "cooking", + cooktime = 3, + output = "farming:sugar 2", + recipe = "default:papyrus" + }) +end + +if farming.mcl then + add_groups(a.sugar, {food_sugar = 1}) +end minetest.register_node("farming:sugar_cube", { description = S("Sugar Cube"), @@ -80,14 +153,14 @@ minetest.register_node("farming:sugar_cube", { minetest.register_craft({ output = "farming:sugar_cube", recipe = { - {"farming:sugar", "farming:sugar", "farming:sugar"}, - {"farming:sugar", "farming:sugar", "farming:sugar"}, - {"farming:sugar", "farming:sugar", "farming:sugar"} + {a.sugar, a.sugar, a.sugar}, + {a.sugar, a.sugar, a.sugar}, + {a.sugar, a.sugar, a.sugar} } }) minetest.register_craft({ - output = "farming:sugar 9", + output = a.sugar .. " 9", recipe = {{"farming:sugar_cube"}} }) @@ -132,11 +205,11 @@ minetest.register_node("farming:salt", { local needed if self.node_inside - and self.node_inside.name == "default:water_source" then + and self.node_inside.name == a.water_source then needed = 8 elseif self.node_inside - and self.node_inside.name == "default:river_water_source" then + and self.node_inside.name == a.river_water_source then needed = 9 end @@ -169,8 +242,8 @@ minetest.register_craft({ type = "cooking", cooktime = 15, output = "farming:salt", - recipe = "bucket:bucket_water", - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} + recipe = a.bucket_water, + replacements = {{a.bucket_water, a.bucket_empty}} }) -- Salt Crystal @@ -237,7 +310,7 @@ minetest.register_craft({ {"group:food_olive_oil", "group:food_lemon"}, {"group:food_egg", "farming:salt"} }, - replacements = {{"farming:olive_oil", "vessels:glass_bottle"}} + replacements = {{"farming:olive_oil", a.glass_bottle}} }) -- Rose Water @@ -250,8 +323,9 @@ minetest.register_node("farming:rose_water", { visual_scale = 0.8, paramtype = "light", tiles = {"farming_rose_water.png"}, - groups = {food_rose_water = 1, vessel = 1, dig_immediate = 3, - attached_node = 1}, + groups = { + food_rose_water = 1, vessel = 1, dig_immediate = 3, attached_node = 1 + }, sounds = farming.sounds.node_sound_defaults(), selection_box = { type = "fixed", @@ -264,12 +338,12 @@ tmp = farming.use_utensils and "farming:pot" or "" minetest.register_craft({ output = "farming:rose_water", recipe = { - {"flowers:rose", "flowers:rose", "flowers:rose"}, - {"flowers:rose", "flowers:rose", "flowers:rose"}, - {"group:food_water_glass", tmp, "vessels:glass_bottle"} + {a.rose, a.rose, a.rose}, + {a.rose, a.rose, a.rose}, + {"group:food_water_glass", tmp, a.glass_bottle} }, replacements = { - {"group:food_water_glass", "vessels:drinking_glass"}, + {"group:food_water_glass", a.drinking_glass}, {"group:food_pot", "farming:pot"} } }) @@ -288,12 +362,12 @@ minetest.register_craft({ recipe = { {"group:food_gelatin", "group:food_sugar", "group:food_gelatin"}, {"group:food_sugar", "group:food_rose_water", "group:food_sugar"}, - {"group:food_sugar", "dye:pink", "group:food_sugar"} + {"group:food_sugar", a.dye_pink, "group:food_sugar"} }, replacements = { - {"group:food_cornstarch", "farming:bowl"}, - {"group:food_cornstarch", "farming:bowl"}, - {"group:food_rose_water", "vessels:glass_bottle"} + {"group:food_cornstarch", a.bowl}, + {"group:food_cornstarch", a.bowl}, + {"group:food_rose_water", a.glass_bottle} } }) @@ -353,7 +427,7 @@ minetest.register_craftitem("farming:donut_apple", { minetest.register_craft({ output = "farming:donut_apple", recipe = { - {"default:apple"}, + {"group:food_apple"}, {"farming:donut"} } }) @@ -363,7 +437,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:porridge", { description = S("Porridge"), inventory_image = "farming_porridge.png", - on_use = minetest.item_eat(6, "farming:bowl") + on_use = minetest.item_eat(6, a.bowl) }) minetest.register_craft({ @@ -373,8 +447,8 @@ minetest.register_craft({ {"group:food_oats", "group:food_bowl", "group:food_milk_glass"} }, replacements = { - {"mobs:glass_milk", "vessels:drinking_glass"}, - {"farming:soy_milk", "vessels:drinking_glass"} + {"mobs:glass_milk", a.drinking_glass}, + {"farming:soy_milk", a.drinking_glass} } }) @@ -392,14 +466,14 @@ minetest.register_craft({ output = "farming:jaffa_cake 3", recipe = { {tmp, "group:food_egg", "group:food_sugar"}, - {"group:food_flour", "group:food_cocoa", "group:food_orange"}, + {a.flour, "group:food_cocoa", "group:food_orange"}, {"group:food_milk", "", ""} }, replacements = { {"farming:baking_tray", "farming:baking_tray"}, - {"mobs:bucket_milk", "bucket:bucket_empty"}, + {"mobs:bucket_milk", a.bucket_empty}, {"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}, - {"farming:soy_milk", "vessels:drinking_glass"} + {"farming:soy_milk", a.drinking_glass} } }) @@ -416,7 +490,7 @@ tmp = farming.use_utensils and "farming:baking_tray" or "" minetest.register_craft({ output = "farming:apple_pie", recipe = { - {"group:food_flour", "group:food_sugar", "group:food_apple"}, + {a.flour, "group:food_sugar", "group:food_apple"}, {"", tmp, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} @@ -429,8 +503,11 @@ minetest.register_craftitem("farming:cactus_juice", { inventory_image = "farming_cactus_juice.png", groups = {vessel = 1, drink = 1}, on_use = function(itemstack, user, pointed_thing) + if user then + local num = math.random(5) == 1 and -1 or 2 + return minetest.do_item_eat(num, "vessels:drinking_glass", itemstack, user, pointed_thing) end @@ -443,8 +520,8 @@ minetest.register_craft({ output = "farming:cactus_juice", recipe = { {tmp}, - {"default:cactus"}, - {"vessels:drinking_glass"} + {a.cactus}, + {a.drinking_glass} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -464,7 +541,7 @@ tmp = farming.use_utensils and "farming:mixing_bowl" or "" minetest.register_craft({ output = "farming:pasta", recipe = { - {"group:food_flour", "group:food_butter", tmp} + {a.flour, "group:food_butter", tmp} }, replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}} }) @@ -472,11 +549,11 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:pasta", recipe = { - {"group:food_flour", "group:food_oil", "group:food_mixing_bowl"} + {a.flour, "group:food_oil", tmp} }, replacements = { {"group:food_mixing_bowl", "farming:mixing_bowl"}, - {"group:food_oil", "vessels:glass_bottle"} + {"group:food_oil", a.glass_bottle} } }) @@ -485,7 +562,7 @@ 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, "farming:bowl") + on_use = minetest.item_eat(6, a.bowl) }) minetest.register_craft({ @@ -519,7 +596,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:bibimbap", { description = S("Bibimbap"), inventory_image = "farming_bibimbap.png", - on_use = minetest.item_eat(8, "farming:bowl") + on_use = minetest.item_eat(8, a.bowl) }) tmp = farming.use_utensils and "farming:skillet" or "" @@ -556,7 +633,7 @@ minetest.register_craftitem("farming:burger", { minetest.register_craft({ output = "farming:burger", recipe = { - {"farming:bread", "group:food_meat", "group:food_cheese"}, + {a.bread, "group:food_meat", "group:food_cheese"}, {"group:food_tomato", "group:food_cucumber", "group:food_onion"}, {"group:food_lettuce", "", ""} } @@ -567,7 +644,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:salad", { description = S("Salad"), inventory_image = "farming_salad.png", - on_use = minetest.item_eat(8, "farming:bowl") + on_use = minetest.item_eat(8, a.bowl) }) minetest.register_craft({ @@ -594,7 +671,7 @@ minetest.register_craft({ recipe = { "group:food_raspberries", "group:food_blackberries", "group:food_strawberry", "group:food_banana", - "vessels:drinking_glass" + a.drinking_glass } }) @@ -603,7 +680,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:spanish_potatoes", { description = S("Spanish Potatoes"), inventory_image = "farming_spanish_potatoes.png", - on_use = minetest.item_eat(8, "farming:bowl"), + on_use = minetest.item_eat(8, a.bowl), }) tmp = farming.use_utensils and "farming:skillet" or "" @@ -612,8 +689,8 @@ minetest.register_craft({ type = "shapeless", output = "farming:spanish_potatoes", recipe = { - "farming:potato", "group:food_parsley", "farming:potato", - "group:food_egg", "group:food_flour", "farming:onion", + "group:food_potato", "group:food_parsley", "group:food_potato", + "group:food_egg", a.flour, "group:food_onion", "farming:garlic_clove", "group:food_bowl", tmp }, replacements = {{"group:food_skillet", "farming:skillet"}} @@ -624,7 +701,7 @@ 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, "farming:bowl") + on_use = minetest.item_eat(6, a.bowl) }) tmp = farming.use_utensils and "farming:skillet" or "" @@ -632,7 +709,7 @@ tmp = farming.use_utensils and "farming:skillet" or "" minetest.register_craft({ output = "farming:potato_omelet", recipe = { - {"group:food_egg", "farming:potato", "group:food_onion"}, + {"group:food_egg", "group:food_potato", "group:food_onion"}, {tmp, "group:food_bowl", ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} @@ -643,7 +720,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:paella", { description = S("Paella"), inventory_image = "farming_paella.png", - on_use = minetest.item_eat(8, "farming:bowl") + on_use = minetest.item_eat(8, a.bowl) }) tmp = farming.use_utensils and "farming:skillet" or "" @@ -651,7 +728,7 @@ tmp = farming.use_utensils and "farming:skillet" or "" minetest.register_craft({ output = "farming:paella", recipe = { - {"group:food_rice", "dye:orange", "farming:pepper_red"}, + {"group:food_rice", a.dye_orange, "farming:pepper_red"}, {"group:food_peas", "group:food_chicken", "group:food_bowl"}, {"", tmp, ""} }, @@ -673,10 +750,10 @@ minetest.register_craft({ {"group:food_egg", "group:food_egg", "farming:vanilla_extract"} }, replacements = { - {"cucina_vegana:soy_milk", "vessels:drinking_glass"}, + {"cucina_vegana:soy_milk", a.drinking_glass}, {"mobs:bucket_milk", "bucket:bucket_empty"}, {"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}, - {"farming:vanilla_extract", "vessels:glass_bottle"} + {"farming:vanilla_extract", a.glass_bottle} } }) @@ -699,9 +776,9 @@ minetest.register_craft({ {"group:food_gelatin", tmp, ""} }, replacements = { - {"farming:soy_milk", "vessels:drinking_glass 3"}, + {"farming:soy_milk", a.drinking_glass .. " 3"}, {"farming:pot", "farming:pot"}, - {"farming:bottle_ethanol", "vessels:glass_bottle"} + {"farming:bottle_ethanol", a.glass_bottle} } }) @@ -713,7 +790,7 @@ minetest.register_craft({ {"group:food_gelatin", tmp, ""} }, replacements = { - {"farming:soy_milk", "vessels:drinking_glass 3"}, + {"farming:soy_milk", a.drinking_glass .. " 3"}, {"farming:pot", "farming:pot"} } }) @@ -750,7 +827,7 @@ 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", "group:food_flour"}, + {"group:food_meat_raw", "group:food_salt", a.flour}, {"", tmp, ""} }, @@ -779,7 +856,7 @@ minetest.register_craft({ }, replacements = { {"group:food_mortar_pestle", "farming:mortar_pestle"}, - {"farming:glass_water", "vessels:drinking_glass"} + {"farming:glass_water", a.drinking_glass} } }) From 5107d180790a67d379d61a829be02af160de65e2 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Sep 2023 10:04:33 +0100 Subject: [PATCH 11/34] most recipes work with mineclone --- crops/artichoke.lua | 4 +- crops/asparagus.lua | 4 +- crops/barley.lua | 7 +- crops/beans.lua | 13 +- crops/beetroot.lua | 7 +- crops/blackberry.lua | 4 +- crops/blueberry.lua | 11 +- crops/cabbage.lua | 4 +- crops/carrot.lua | 9 +- crops/chili.lua | 14 +- crops/cocoa.lua | 7 +- crops/coffee.lua | 10 +- crops/corn.lua | 22 ++- crops/cotton.lua | 9 +- crops/cucumber.lua | 4 +- crops/eggplant.lua | 4 +- crops/garlic.lua | 8 +- crops/ginger.lua | 4 +- crops/grapes.lua | 15 ++- crops/hemp.lua | 35 +++-- crops/lettuce.lua | 4 +- crops/melon.lua | 11 +- crops/mint.lua | 14 +- crops/onion.lua | 11 +- crops/parsley.lua | 4 +- crops/peas.lua | 7 +- crops/pepper.lua | 20 +-- crops/pineapple.lua | 23 ++-- crops/potato.lua | 4 +- crops/pumpkin.lua | 26 ++-- crops/raspberry.lua | 11 +- crops/rhubarb.lua | 9 +- crops/rice.lua | 13 +- crops/ryeoatrice.lua | 15 +-- crops/soy.lua | 31 +++-- crops/spinach.lua | 4 +- crops/strawberry.lua | 4 +- crops/sunflower.lua | 21 ++- crops/tomato.lua | 6 +- crops/vanilla.lua | 7 +- crops/wheat.lua | 53 +------- food.lua | 243 +++++++++++++++------------------ grass.lua | 71 ++++++---- init.lua | 20 +-- items.lua | 99 ++++++++++++++ locale/farming.es.tr | 313 ++++++++++++++++++++++--------------------- locale/template.txt | 119 ++++++++-------- mcl_grass.lua | 16 --- 48 files changed, 715 insertions(+), 659 deletions(-) create mode 100644 items.lua delete mode 100644 mcl_grass.lua 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} - } - } -}) From cc0668bc570654ac652ae6f0e10c53d3879afc1f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Sep 2023 10:12:30 +0100 Subject: [PATCH 12/34] fix string/wool --- crops/cotton.lua | 18 +++++++++++------- items.lua | 4 ++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/crops/cotton.lua b/crops/cotton.lua index 7dfda69..858eb10 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- wild cotton as a source of cotton seed and a chance of cotton itself minetest.register_node("farming:cotton_wild", { @@ -57,15 +58,18 @@ minetest.register_craftitem("farming:cotton", { }) -- string -minetest.register_craftitem("farming:string", { - description = S("String"), - inventory_image = "farming_string.png", - groups = {flammable = 2} -}) +if not farming.mcl then + + minetest.register_craftitem("farming:string", { + description = S("String"), + inventory_image = "farming_string.png", + groups = {flammable = 2} + }) +end -- cotton to wool minetest.register_craft({ - output = "wool:white", + output = a.wool, recipe = { {"farming:cotton", "farming:cotton"}, {"farming:cotton", "farming:cotton"} @@ -74,7 +78,7 @@ minetest.register_craft({ -- cotton to string minetest.register_craft({ - output = "farming:string 2", + output = a.string .. " 2", recipe = { {"farming:cotton"}, {"farming:cotton"} diff --git a/items.lua b/items.lua index 390eead..eeb72e7 100644 --- a/items.lua +++ b/items.lua @@ -51,6 +51,8 @@ farming.recipe_items = { cactus = "default:cactus", paper = "default:paper", snow = "default:snow", + string = "farming:string", + wool = "wool:white" } -- change recipe items to mineclone variations @@ -81,6 +83,8 @@ if farming.mcl then a.cactus = "mcl_core:cactus" a.paper = "mcl_core:paper" a.snow = "mcl_throwing:snowball" + a.string = "mcl_mobitems:string" + a.wool = "mcl_wool:white" add_groups("mcl_core:sugar", {food_sugar = 1}) add_groups("mcl_throwing:egg", {food_egg = 1}) From 0c82c6c0e9cedce8ba04a3ecf624344db1f2fd92 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Sep 2023 18:41:20 +0100 Subject: [PATCH 13/34] added new garlic textures (thanks oz-tal) --- crops/garlic.lua | 17 +++++++---------- license.txt | 3 +++ textures/crops_garlic.png | Bin 725 -> 490 bytes textures/crops_garlic_braid.png | Bin 1346 -> 345 bytes textures/crops_garlic_braid_side.png | Bin 1309 -> 331 bytes textures/crops_garlic_braid_top.png | Bin 0 -> 273 bytes textures/crops_garlic_clove.png | Bin 605 -> 427 bytes 7 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 textures/crops_garlic_braid_top.png diff --git a/crops/garlic.lua b/crops/garlic.lua index 7586533..3849ee5 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -1,10 +1,4 @@ ---[[ - Original textures from Crops Plus mod - Copyright (C) 2018 Grizzly Adam - https://forum.minetest.net/viewtopic.php?f=9&t=19488 -]] - local S = farming.translate -- garlic clove @@ -49,16 +43,19 @@ minetest.register_node("farming:garlic_braid", { paramtype = "light", paramtype2 = "facedir", tiles = { - "crops_garlic_braid_side.png","crops_garlic_braid.png", - "crops_garlic_braid_side.png^[transformFx","crops_garlic_braid_side.png", - "crops_garlic_braid.png","crops_garlic_braid.png" + "crops_garlic_braid_top.png", + "crops_garlic_braid.png", + "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, compostability = 65}, sounds = farming.sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { - {-0.13, -0.45, 0.5, 0.13, 0.45, 0.24} + {-0.1875, -0.5, 0.5, 0.1875, 0.5, 0.125} } } }) diff --git a/license.txt b/license.txt index 546853f..f60f5b5 100644 --- a/license.txt +++ b/license.txt @@ -24,6 +24,9 @@ THE SOFTWARE. License of media (textures): ---------------------------- +Created by Oz-tal (license: CC BY-SA 3.0): + crops_garlic_*.png + Created by Shadall (CC0): farming_burger.png diff --git a/textures/crops_garlic.png b/textures/crops_garlic.png index a73638c2bcff261add1ac59816637f5daa061e55..a6b2de9c9c0a4d4e0c9c40f63ffdb5039d874513 100644 GIT binary patch delta 476 zcmV<20VDp^1?mHk7=I830000_VSq+tww?IcQD8>31?)IC9BzcZC@qia@}+&l?sJo5kQhwtHlEEJ`(A4+HFCw zSWFYpd*F0ZlxKON5W{dBS?>uEVtOLhcfh#!*nBwl``u1a0BD+~wVsfq$z-!3L~z98 zkqFNN=v!sG2YK10Jz;A4@D8_*X!{Z06>-jwEHwo)8Q~cuh;F) z=Kug7A10xG?hvw6NyLD>Ay##*=#s`oQ8+7z*Qz`HU*(pBb834y`C1>;qZF3 z=UxGt9>e=Ygs^)90jHDW09vhnzg{Q#_#Jpxsp*GEPh>O#czrP$E2F@FCO!d^B_2=5 SmKmJ@0000Tckaw}mxXQWSstGAaLx+{xT4zCpHG_yU)~8J$UKHzC8$=u2`VCFvgT6$`u+3E z7&>p5hyJ4H1aMp*oM>zFxVZwWb^2_=BFIJ-Y9jMhh)}+ayR_M9R$tqL?#`4kjOukH z&7{nE*ofKSCVy4)lern#BTIKj-Os)|-m+~QY!ZM{0Zmh|TrNXRrb1a#Hq!ak{R=1b zt@^^mvjbf>w|d*|H~i-y0uiI_d1Ht;#;9jOk`<&g zIT&UN#nLj)swW8i09qmk#)4mi^Mk@n(Csv~L&oI%!haHmJqy0)Bb7?S8T4TNIfJaI zh~pToMio3{h&UjiJfDR~DS2%7EhNkg>_HENNJysBsQuo9KZ5k*mMfd9-@6#M=+U!bBkZhs&OLm0^<(wQ85$3_f5(+vnAFzla$NBrYVP+DDit7&?>b6SIuG(o7qB=C^U z7qD0=BbCX)Oqs|P3y>rUJa8*(cOJc&2?)uE+Z&t9%(GrL>xYP$k5;pR7%?P?fKY;o z@4~mc2;AQG#^#f|bD!z^hgT0Odq+PAm2u%OaPYNewh8`xJ00000NkvXXu0mjfh?YJN diff --git a/textures/crops_garlic_braid.png b/textures/crops_garlic_braid.png index f5fa269bebedbde2daec135a6933f6b64d3be9db..8949033e6f6a66acf25b097c73b9eb7a558e3bc2 100644 GIT binary patch literal 345 zcmV-f0jB0wbJ%$U3lTg(AXwNNuuJ6;EW{!Trf>^8(-R?^MA0hp3!{Vs6*`tAT;`&iadVr? zG+SnLagohQHnzktbu;S z_nbrFKP+?4)dd0fh+3SIcRN8*s(qY2)W2=o^us2qeEn9{<^B8K=Mekr37Iny%MTz< zF@0CYoLBa+0?=HyCVu{!y2-)D-66ZFFK5^=rsW{a70ZheoY2E#_aH?jLP|+xg|cwX zjepW&rUEc6EqQV8(UpsHs!nVkKeDkaLdVmyE1rYfM&CUpu_(1-gA3YJ|-D_igSGZ zzKg5>S~(q+4reOOZ5G2}LGi1qtg2cN@FAeB`|*F3ZM=VH=e0xR^Od<|p#37z{c)1q zJ-4@|x9!p|gb+Gfy{Ix^A2Sq?kmq{HV@`Z@s{!)dCtw{lgC`Wi*wsdY!GLDPw(sV% zW&us3#WD0S(d+dgy|5gNK!me32QY3jLy%c=e2U~Ea_9(n#-3UiGNXeTARc;=n zid0ul_Cgyg0P%@wghJqZkt`d*An?N4wFp9p>g{hqlpsbJJaA}ET(lvK$^yHweHP7Q zAW6%IOkDzzvJfwAeGfMCFv1a_?flmkRsoVSifV;%GF-3w0`&(!0K)(YN;Nt)S1{E6 z8~Sy9yP^e%Y7%o{(ajxb7`0>-=_xaFu_1G3xPk@f0ow6Cr;$s*FOso_K4D@QT-dt`+JK4_f6LauI*m?XGdPCRNk1C#C=S~dNsX?9YqSwK;g zofgPyxl9NRhd)L8)f0&2#$s~93)QS;*m39>bglI}Sp#rdd#k9hXQN~IA)c&U3#o)b zXLCI`5jUonRbn#0!0&bNSj#{RPfCfEeAtZb5TwloS6%{}_AYE4jnLm~K+nAaa zs}BI@ZFlVu!^uU2V@0HZwKrK z^tC-eujY3!Tm}NM0MEbnF4A-JF=25vN7FoNfPiOwE)$!GC7V9R!qx8}j>|zf5JqZN zG5r28{1c=#Y@A5d!+VO!q1(yB}NHU8N2!yK( z<~*}yDq2(e842SRGrKjXD~Cs2sToC5BF`#4Jk@{3pX18`P9R^@tpET307*qoM6N<$ Ef@^YQcK`qY diff --git a/textures/crops_garlic_braid_side.png b/textures/crops_garlic_braid_side.png index ce467b76aef6a6b19e4d5edeb53110a011fb942c..85046f2ec6ffc10423c51e360e3211864ad669b8 100644 GIT binary patch literal 331 zcmV-R0kr;!P)E4l*L8XzG}N~;J0!C;s) zED5TM;;GH7n4fRoETCvUUo2KDqT$fq_5Q806&`<;mBa>;WdB913X6qTjE zH({k|mhJa|lv1|a^~Gkh+pX6CaJ{x#pJ*BvcgUSHlAj^q(Q_e;L^lG15u8rPV^!6o zmQu>90^&FfvrHcXYdW1wTvxpILG6Ou?Qj5qG|ltvmhC9S-v!#luU_r^?*iQ}5b7fO d{wX!@f+wRvg_N{}6-odA002ovPDHLkV1jlNi_8E3 literal 1309 zcmV+&1>*XNP)^ zmKj}KWO0&>nHZxT}0Nb}COV$x4FUG&0rC#Ose`$A4jU*_=On4ShFkf{n0oHWAg^deCsMPgCu z5_SH%+fNFBeH_e4j$hV$YW1?r^0Qm)CpJ9{GttbPB`?C`b|F@k4~J#oh(wh+>M{2W z6Dz@kpEmv|PM#<0e-C{*TW)9_XjxOMNUQG;u3kAc9l$j9A)o>2# zK!^R<`c)N142_ubhLBrQhCbsRKRFZ9!so^ZI^i-kqo(>4d}H0z<~Jle2kg93`9LZ z1D~=HEUp|_1AX1Mpuiz4OhtRcc}!S)@9WMq77+z-S&d%@TvkZrYK$2BK~X%kS|yfm z+y$9jQMmo$kQuxneJOzJ#F~+*t%i?E zDMrZM4L%|cZnq1MnrmP&+(fIcA5~2*if9QKv9emghER9xGj!CSMWi4SQ7Fy602&;3S>+Z-068L%5}A|^Q#15L-_9Be^sTpT2F4Rm$CAgAONtlF`s zv;FodVm_dic`NP)oP+3VYe%o{H?RU0Vwo5(y}1J^S-F_BxtnG$F6W5>1ibcnY-B8! zZ{CB&Yu`tdfCd-fkd$5szn_DDauoaCE7K4I5XqE(dM8F;YOR6K?SRA92k+!0EZr>t z!ypv!UD;cC&P41TaJz@+ho{^+RxF2W+zOuOVKcVEZZVH#6fAisW6rYkM1RGP1Fy@f zw-2=B+4>(qo>quJfUC@#`#jN3_^-)G5}h!sTX&&!c+{PgTA<)n>BYyM#!T`Tys_+? TIEq$$00000NkvXXu0mjf5D-=( diff --git a/textures/crops_garlic_braid_top.png b/textures/crops_garlic_braid_top.png new file mode 100644 index 0000000000000000000000000000000000000000..fd746662e95d8472ab997f0c8ba7ba54340f0a56 GIT binary patch literal 273 zcmV+s0q*{ZP) zcV}l|AtNKzLg4o8J9n;J!L$elo;`d0`t@rD231uR6&)Q0+Jormq@=2<|NmiWfof@h z*u-UTZ)xf1NO@vqAvbZQrKP62x-v3Snphc0O5$1gis(7=I830000_V8&KPYHxYHACbB%GomY|E(@7lS0YIr)aTT+t$Wj|UB%<>Ec( z@crEHISBBHcZp5{bRrGQ<#xMX1MK&vx!aNZe!tgiwO$AMdRBlzg3e?z>2x+r&RVTrZ?|6`8U3t4 z6mRmPCqi#3sQ0PL}CllNDJdR5w{0?A{U|^u&sL054-82C- z%`m3ZFvxeX!GCpQF`8D@d|r}DB>;pd3L$_0ETg00D#Md=K(ZrwVKVs z4m{o3;BuAA#bTv$uM!L0tp4>5yb5$bSoS7(y?%b}Zx$avQWnH5|4jPI00000NkvXX Hu0mjf8-BhK delta 592 zcmV-W0PbXFR5;7+)4gjHK>)_#cV=g2 zc5Zhsw|Ys4qCq^c@URdiM~qc01RDtvQ4ma-PDs$kMhIAm*ncQu6OdSl5&}Xx!GHt{ zOF{eqF=F9ea>r(GKWAs`L?v2V`2GP;@q-umKLP;Dv!{lcQ7eS8x*r57~py+8H2?rbfTboeI%P(NP69Kal7;I&GLgQ>vwN7 ze~CDEywTV*6udutq>1|Ie%M?<`Vw3^piCl(66A$JmVc(uy66{S_{FGvc311z1Ooss zsC_QEc+`!yFY?VcgeQ??6c(j`#XxKh0|CMvAcq@8@gW-27D;vRf&~CCK7K8y#*eERak*gee7NIC|C|$ym613t$)kfyWCZ|@&&q1Cn%mtFO+tPK80000*#yr3 From cca92063c40671d63a2de20c4c23de15705daf28 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 2 Sep 2023 07:06:02 +0100 Subject: [PATCH 14/34] texture update (onion,garlic,grapes,cookie - thx oz-tal) --- license.txt | 4 +++- textures/crops_garlic.png | Bin 490 -> 526 bytes textures/crops_garlic_braid.png | Bin 345 -> 354 bytes textures/crops_garlic_braid_side.png | Bin 331 -> 351 bytes textures/crops_garlic_braid_top.png | Bin 273 -> 305 bytes textures/crops_garlic_clove.png | Bin 427 -> 460 bytes textures/crops_onion.png | Bin 262 -> 756 bytes textures/farming_cookie.png | Bin 566 -> 717 bytes textures/farming_grapes.png | Bin 175 -> 613 bytes 9 files changed, 3 insertions(+), 1 deletion(-) diff --git a/license.txt b/license.txt index f60f5b5..8662c52 100644 --- a/license.txt +++ b/license.txt @@ -26,6 +26,9 @@ License of media (textures): Created by Oz-tal (license: CC BY-SA 3.0): crops_garlic_*.png + crops_onion.png + farming_cookie.png + farming_grapes.png Created by Shadall (CC0): farming_burger.png @@ -137,7 +140,6 @@ Created by TenPlus1 (CC BY 3.0) farming_cocoa_2.png farming_cocoa_3.png farming_cocoa_beans.png - farming_cookie.png farming_raspberry_smoothie.png farming_rhubarb_1.png farming_rhubarb_2.png diff --git a/textures/crops_garlic.png b/textures/crops_garlic.png index a6b2de9c9c0a4d4e0c9c40f63ffdb5039d874513..831335f138d6e41b70723be2f3aa75e57f4379b3 100644 GIT binary patch delta 500 zcmV1C9icB!AUOL_t(Y$75g^DqvPtvroO_|Nk(WTIMnlYcY(U;2V26;3oq^ z#q6Ae>DiP!goRjz3BKjoIhWA{4F@0!er^A?{j~^$e)#wQ|KMFd|NY7kG|fT)8{iUW zU|9ZlibA6r1H*|AXD?k}$-uy{i{U>51ExdPx@}?H)Wyh%E`QEQtk037;M+@N70)u> z*<$L0I|vFU3eV?TF&Wb#OvGFKEaQn9HjAZZ2qKws(P^K;{bB|N3jt$2&2WTx{@cV) z5xEQu=uriaf}^r)Ygfi_a9s7hcK+Ja@82;kmYN}S7!mXg40o8HDKjuIFfe4iXF$m7 z?~7p&v}a(r=zp}N<6JQV1H(Fg;<6#8#V~M(`Nv;uTJ5Gv9b;fvet*5(-gB5yp})`R zfnqNM!~OSMo|NryfCVq-I&%mI?z{nsRz`&3mJ@5QfX9flahItT+ q|4vb8JVH3Tkqroybd;8a0}cTG*c$nck2;(H00000WbcJ1nL8jB!96Sq+tww?IcQD8>31?)IC9BzcZC@qia@}+&l?sJo5kQhwtHlEEJ`(A4+HFCwSWFYpd*F0ZlxKON z5W{dBS?>uEVtOLhcfh#!*nBwl``u1a0BD+~wVsfq$z-!3L~z98kqFNN=v!sG2ejJ} z0=QmP6$3Aq%YUV!0Jz;A4@D8_*X!{Z06>-jwEHwo)8Q~cuh;F)=Kug7A10x zG?hvw6NyLD>Ay##*=#s`oQ8+7z$R%n1))|Wl}@Le=Ygs^)9 z0jHDW09vhnzg{Q#_#Jpxsp*GEPh>O#czrP$E2F@FCO!d^B_2=5mKmJ@0000&?<1Jq!#it3P`2En;JX$o~5`bK=a2GbjH2%RnoTe56b@^6dZrxsJJxxfFx|6R8>= zZP=!ET<-sW^QDq{hJp+XA^`&Ne3c9g>G|pT>G|Y4gdmue*?%A0b?^WG&*xq*xby7) z|8KXR%U#O&{~sp){KZAjV^9D8&)JmWlBPtwLx>K6OP)7B-f>}I_#*Xe<*WY;3?KPk zX@99@VA%cUfXC6j2z4(PKM#Ld$v`^*^C8UVuqX))^`GrOn~qTca|n!2_b7k`HH?4a z!0{JPZ!ypw;6RFk#)-8Hs&|d%0y^XZSdgRpd^8upasjDPz({T`z!m4KS8q(+n94}B Zxd4umU?;Ca=DGj?002ovPDHLkV1ltWro#XL delta 318 zcmV-E0m1&_0@(tPB!3`DL_t(Y$L*Cn3c^4ThG#`m+NH@c?5xCd*m(mB5j;R3SlAn| zOXU$P#3Bl&a0@%rB!UEDQi(-E9E&&v6*Rl3mD4N??7Y7DcL5}AJT}eQ46)bi_eUc{ z**Hx0A|*Z?!Y~ZUt0?(-xmea@qU%}qE>2apfcwM%dBQXmjek=Sy0hp3!{Vs6**@x)$r&L}AR}OfGj?$w_ Qs{jB107*qoM6N<$f`rGElK=n! diff --git a/textures/crops_garlic_braid_side.png b/textures/crops_garlic_braid_side.png index 85046f2ec6ffc10423c51e360e3211864ad669b8..de5286b0b9b9de4984428ae466043f6c19b90db8 100644 GIT binary patch delta 324 zcmV-K0lWUo0^b6VB!4DJL_t(Y$75hX19P5lIX9>4|NjcDu7*U%|Nj|i3>eV`U>3ig z^=9dh9tH-M)gQh17O}BGWdHq}IdSI1nG^s1rJ0M8kCdrKp8fwn*D=>ImkuGo1Y$%*ejQ{^(;?G}P^gQRqF`fDX9;7UbwYAI$}@TtKTRU_{RaxZ-^E>W!%zQyCel?EnCi WgJ36d)~93u0000q_5Q806&`<;mBa>;WdB913X6qTjEH({k|mhJa|lv1|a^~Gkh+pX6CaJ{x#pJ*Bv zcgUSHlAj^q(Q_e;L^lG15u8rPV^!6omQu>90^&FfvrHcXYdW1wTvxpILG6Ou?Qj5q zG|ltvmhC9S-zf#!#IIiM{O`u-_3?}8_zL4}mGgcV8v0000s}B#HE&u=k07*qoM6N<$f-Y@>-2eap delta 245 zcmV}IZO-`f`bQ- zAK$;9eEp2XDunqImxWSNqN1Xr2!3~WXJ=s{BO}#9;P&l1cdlH)vCJ$wE7^=k$O zRaF%g9UTVRgXrj_q^hd_|6yr?YH5Jj#AR=9Y3b-ld17TDH*RsIrKP62x-v3Snphc0 zOE diff --git a/textures/crops_garlic_clove.png b/textures/crops_garlic_clove.png index 430b6e54f02b8d96f792ea573c3275e3b7d70597..00cf9778b38dffc7ec1de2dc5de1672d3db78d74 100644 GIT binary patch delta 434 zcmV;j0Zsm^1Iz=EB!81hL_t(Y$75g^1%nN=2xL}f@BaTEM$_6p7F-g+T8{HQEg2XX zt}#?HU~x#zhw1H8T^SiEbpRu}&tVpeq^Lbrj$mMTGv}7{-4zH87fxS3clike!;zI& zYtMur#HR+Wo4fW3=?-EcqyXI^2Bx}3x-tw54B-st7}g*uTz|*Fz!38PKdBBO=m6F? z3N4b_3=EP13Yn743=F?T9@IR)%D`Z{P0;y|G?GCPd=LKWGcde2dc*#42WFHlJ9p^k z9vMuBVL0Gh(Y?iQ?=vvG>0^*)Si!&`lEUzmAp+qL7%ehO!BLWdf#Ltj*N2{nGBCJs zD=4clFfbVIGk;LfX=Y$}wEfPiM}`ax@3=p%_|(b3z|g=@%JAg>e{_dnxG2iVj@{+S z|Nq5RURz?{Gca)VDa8saBBBE309*j(pto}${JnD<(;@2`wv`?@j0h2&afQnvFd!jm zsI4#qQy;Mw;|u{@4uSCl#e5|l${84h<9SZ;*&@`zgDV=ACZQG*N&_Tk8*~TZ0=O(3 c1%nO%00H0C`m`73DgXcg07*qoM6N<$f}{n&t^fc4 delta 401 zcmV;C0dD@x1FHj&B!6;AL_t(Y$L*BAtAbDz$B*xspp=8+Xg{E~pb#2riH81)wxIUb zCR>8&KPYHxYHACbB%GomY|E(@7lS0YIr)aTT+t$Wj|UB%<>Ec(@crEHISBBHcZW7MA6BTz?P%j>p5{bRrGQ<#xMX z1MK&vx!aNZe!tgiwO$AMdRBlzg3e?z>2x+r&RVTrZ?|6`8U3t46mRmPCqi#3sQ0PL}CllNDJdR5w{0?A{U|^u&sL054-82C-%`m3ZFvxeX!F6LX znpV|(UXn^B0Dpui3L$_0ETg00D#Md=K(ZrwVKVs4m{o3;BuAA#bTv$ vuM!L0tp4>5yb5$bSoS7(y?%b}Zy!HW7Q`+8O!~?I015yANkvXXu0mjfOT)bJ diff --git a/textures/crops_onion.png b/textures/crops_onion.png index 8a6dc54a77482c24fa624fe0d783d93404b9b0f9..4c778c887780294b5af5dec3f4edda6a7a915274 100644 GIT binary patch delta 744 zcmV}R%v!dK{W0Ru zkS#M}NsOYF8%a$GA?03jtB4C1uH3kB!HrV8*_9!Z2rbF~qFo#-G8@LM9WKs$@%Hrd zZtr>L?tQ;E=luSh^Zopu-}5}cKbA~tp{K`Y%gGVN<>j-p*MC=;EO}n)yX5`pB&Qcq z^!ry<)au^ep`qd7x3`fIm&o+U$0YV?XlwPEL3p zaJd9QCS!o>>(|%Os5Fq|g3DD_rqPJv@UYWaQUY+CR;yA0xw#sRMguG^?(CeN0uK+d zSUe643^X)YEPts$ySuly(Wo?tT*`QQy1l)!lFjq{%S$}Y00sw}n!c_d9`gMCJ+Qrf zal!My1MxhIb23N@0EL>2NDfD7so4xnO?f<9TY$yFae6&aSI2QC6MIsmmX`MRuC4&1 zQLR>~q;nu6Ik{$Ly1JU0*oo@v%gTz20l;jot_GT$O@F5BY`|*G&o>%@xw+NVg9D(d zisOt%K&@6Pl}bRN$jr>h0BUQCiu8Km<0FwsBmjj%E(azi0)a?G5GE&oBoh@B7z{cc z;C6R+_xA&S|IJMx000#gt*s1%G(PTjx3n-|5=Dd}L5f6TF+pJC6aZ#Op&uKYp9g^R z^UY0Z5P!GZ;jr0Qa+2r@C|Q%00zh{i4DRo5Z2Zai?;w;LBr4bE=lA!Ik8hMARl&kS zU!T*-u7nwpvDZ60`*l7LI6h|o@p%0Hvoql8isv660k8M+G86)ij_&Rf304I^q_UHY zgTYWJ9R6xR5%^{7_xpSv5BrYxlQH#yjt;BUU||4iYVz`wO4g{-Hlnq)(b3LMmK$_M z$)XceAGo=BdiwkX8XF4>H5%y%r0v-RLSt%B1VUic`N)V)EM@#{fOJ5~Wkp65YANIY aMn3_)B$C}mO^12_0000PYj4`3ohCabW3F>W=aN(`0*S=( z^7OQ2i|FfifnIN7A`oydNZlTGIzsBFr(zLECbza`XYFT7t5wqkbp7b)^b|;^_x7%? zghhjc!isPhxVhQgJv##!8yfO@0YW(McHP!c+hd`Qq7}GRG z0V);40DyAYG=7fKtP#*X@u}TC2Uh*f=f=*47RVZg1@d z&c%j_#QOTef;iuXApk7PI0tn7;v$y=GMQ8=n*|7IwVs~=&b?m7077101%Z72{oTfK z5y)oCWq=ST5lSB(9v^=lB%~%pSYn-$#l?7he%|hrr2BjEznEjqwQ#g442uUO}%PT)Vjik*bMs?Pxbm$QBV!U1@}xH%i$00000NkvXXu0mjf%%Me4 literal 566 zcmV-60?GY}P)pwF8eK4VnkVej4iHHIL|Z{@0du{7%sg@=)F1|2u;yki%fWHt zfSZ)#AZ*{LgV+NMJMkx2kCZSdl?6nyM(3RHfD8~YU9-C{p(YLhHQE?~hz$nF-e3nH zkB4oXW1dKHge0oep@A|{XUGBonUfml9FmwF?Y0280KhEAEffi+N9&xdRfoG1%f5<~ ziSBjeP*%GP{ntgzU3FwQ#NkH$rs{;6}Zn*(S7C2{?1z5*?m2&qR z4($ShzF1}V4hj94C|N^lbR;w z;Gp9OF*bH`0#fF3b#)-6Yq01JBoZ(+rBqiJ^z|u~PQ%?D^!6G?cQ-^LLNqr+E(h5x z^z=ld;jmIeLx0D|Am!y{HX9DZ>})I+3VHnsG~j~$Kr1Wb5euhlOAGEV0<<=H#Zrb+71}rQX#^NH> z*9+0u2v1L@+0pS8YI+(pEzp45YClkGs}Sw&UcR5vSbq#UJC*X={=gk@LDkhzQ}Y?* z>hMs?y*+=Ut`R@Zr@tVTf@D(DaycopS*0o}pt2HHSEWp)ygV1=8Y|@ccf?QM{Q{8) zM5Bqsgvic(rKk;W`vlV^Ui Date: Sat, 2 Sep 2023 08:13:32 +0100 Subject: [PATCH 15/34] more mineclone compatible recipes --- compatibility.lua | 7 ------- crops/ryeoatrice.lua | 4 ++-- food.lua | 6 +++--- items.lua | 22 ++++++++++++++++++++-- utensils.lua | 31 ++++++++++++++++--------------- 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/compatibility.lua b/compatibility.lua index e531796..3b1fe2b 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -8,13 +8,6 @@ local alias = function(orig, new) minetest.register_alias(orig, new) end ---= Overrides (add food_* group to apple and brown mushroom) - -minetest.override_item("default:apple", { - groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 3, leafdecay_drop = 1} -}) - --= Aliases -- Banana diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index ff56a22..90dfda9 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -72,8 +72,8 @@ minetest.register_craft({ type = "shapeless", output = "farming:flour_multigrain", recipe = { - "farming:wheat", "farming:barley", "farming:oat", - "farming:rye", a.mortar_pestle + "group:food_wheat", "group:food_barley", "group:food_oats", + "group:food_rye", a.mortar_pestle }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/food.lua b/food.lua index 9a2bf02..2dacb13 100644 --- a/food.lua +++ b/food.lua @@ -8,7 +8,7 @@ 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} + groups = {food_bread_slice = 1, flammable = 2, compostability = 65} }) minetest.register_craft({ @@ -23,7 +23,7 @@ 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} + groups = {food_toast = 1, flammable = 2, compostability = 65} }) minetest.register_craft({ @@ -39,7 +39,7 @@ 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} + groups = {flammable = 2, compostability = 85} }) minetest.register_craft({ diff --git a/items.lua b/items.lua index eeb72e7..50243cc 100644 --- a/items.lua +++ b/items.lua @@ -52,9 +52,16 @@ farming.recipe_items = { paper = "default:paper", snow = "default:snow", string = "farming:string", - wool = "wool:white" + wool = "wool:white", + steel_ingot = "default:steel_ingot", + clay_brick = "default:clay_brick", + stone = "default:stone", + glass = "default:glass", } +add_groups("default:apple", {food_apple = 1}) + + -- change recipe items to mineclone variations if farming.mcl then @@ -78,13 +85,17 @@ if farming.mcl then a.dye_violet = "mcl_dye:violet" a.dye_yellow = "mcl_dye:yellow" a.bowl = "mcl_core:bowl" - a.flour = "mcl_farming:bread" +-- 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" a.string = "mcl_mobitems:string" a.wool = "mcl_wool:white" + a.steel_ingot = "mcl_core:iron_ingot" + a.clay_brick = "mcl_core:clay_lump" + a.stone = "mcl_core:stone" + a.glass = "mcl_core:glass" add_groups("mcl_core:sugar", {food_sugar = 1}) add_groups("mcl_throwing:egg", {food_egg = 1}) @@ -100,4 +111,11 @@ if farming.mcl then 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}) + add_groups("mcl_mobitems:milk_bucket", {food_milk = 1}) + add_groups("mcl_ocean:dried_kelp", {food_seaweed = 1}) + + -- add missing food groups to current items so recipes work + add_groups("mcl_dye:yellow", {food_lemon = 1, food_banana = 1}) + add_groups("mcl_dye:orange", {food_orange = 1}) + add_groups("mcl_flowers:sunflower", {food_olive_oil = 1, food_butter = 1}) end diff --git a/utensils.lua b/utensils.lua index 251d415..a9c1429 100644 --- a/utensils.lua +++ b/utensils.lua @@ -1,5 +1,6 @@ local S = farming.translate +local a = farming.recipe_items -- wooden bowl @@ -34,7 +35,7 @@ minetest.register_craftitem("farming:saucepan", { minetest.register_craft({ output = "farming:saucepan", recipe = { - {"default:steel_ingot", "", ""}, + {a.steel_ingot, "", ""}, {"", "group:stick", ""} } }) @@ -50,8 +51,8 @@ minetest.register_craftitem("farming:pot", { minetest.register_craft({ output = "farming:pot", recipe = { - {"group:stick", "default:steel_ingot", "default:steel_ingot"}, - {"", "default:steel_ingot", "default:steel_ingot"} + {"group:stick", a.steel_ingot, a.steel_ingot}, + {"", a.steel_ingot, a.steel_ingot} } }) @@ -66,9 +67,9 @@ minetest.register_craftitem("farming:baking_tray", { minetest.register_craft({ output = "farming:baking_tray", recipe = { - {"default:clay_brick", "default:clay_brick", "default:clay_brick"}, - {"default:clay_brick", "", "default:clay_brick"}, - {"default:clay_brick", "default:clay_brick", "default:clay_brick"} + {a.clay_brick, a.clay_brick, a.clay_brick}, + {a.clay_brick, "", a.clay_brick}, + {a.clay_brick, a.clay_brick, a.clay_brick} } }) @@ -83,8 +84,8 @@ minetest.register_craftitem("farming:skillet", { minetest.register_craft({ output = "farming:skillet", recipe = { - {"default:steel_ingot", "", ""}, - {"", "default:steel_ingot", ""}, + {a.steel_ingot, "", ""}, + {"", a.steel_ingot, ""}, {"", "", "group:stick"} } }) @@ -100,8 +101,8 @@ minetest.register_craftitem("farming:mortar_pestle", { minetest.register_craft({ output = "farming:mortar_pestle", recipe = { - {"default:stone", "group:stick", "default:stone"}, - {"", "default:stone", ""} + {a.stone, "group:stick", a.stone}, + {"", a.stone, ""} } }) @@ -116,7 +117,7 @@ minetest.register_craftitem("farming:cutting_board", { minetest.register_craft({ output = "farming:cutting_board", recipe = { - {"default:steel_ingot", "", ""}, + {a.steel_ingot, "", ""}, {"", "group:stick", ""}, {"", "", "group:wood"} } @@ -133,8 +134,8 @@ minetest.register_craftitem("farming:juicer", { minetest.register_craft({ output = "farming:juicer", recipe = { - {"", "default:stone", ""}, - {"default:stone", "", "default:stone"} + {"", a.stone, ""}, + {a.stone, "", a.stone} } }) @@ -149,8 +150,8 @@ minetest.register_craftitem("farming:mixing_bowl", { minetest.register_craft({ output = "farming:mixing_bowl", recipe = { - {"default:glass", "group:stick", "default:glass"}, - {"", "default:glass", ""} + {a.glass, "group:stick", a.glass}, + {"", a.glass, ""} } }) From 8dd80159fde066c4f8da9ff9e033ed678be48a15 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 2 Sep 2023 10:47:22 +0100 Subject: [PATCH 16/34] add potions river water bottle to food_glass_water group --- food.lua | 2 +- items.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/food.lua b/food.lua index 2dacb13..2af67fb 100644 --- a/food.lua +++ b/food.lua @@ -105,7 +105,7 @@ end -- Sugar -if farming.mtg then +if not farming.mcl then minetest.register_craftitem("farming:sugar", { description = S("Sugar"), diff --git a/items.lua b/items.lua index 50243cc..d73ed35 100644 --- a/items.lua +++ b/items.lua @@ -113,6 +113,7 @@ if farming.mcl then add_groups("mcl_farming:bread", {food_bread = 1}) add_groups("mcl_mobitems:milk_bucket", {food_milk = 1}) add_groups("mcl_ocean:dried_kelp", {food_seaweed = 1}) + add_groups("mcl_potions:river_water", {food_water_glass = 1}) -- add missing food groups to current items so recipes work add_groups("mcl_dye:yellow", {food_lemon = 1, food_banana = 1}) From d4b0b02fc4ab5f43f846d9657bb794a9ba4df8b6 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 3 Sep 2023 08:12:02 +0100 Subject: [PATCH 17/34] Fix glass water group and recipes, fix mcl wheat item --- crops/coffee.lua | 2 +- crops/mint.lua | 4 ++-- crops/vanilla.lua | 6 +++--- food.lua | 21 ++++++++++++++++----- items.lua | 4 ++-- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/crops/coffee.lua b/crops/coffee.lua index 3cc6822..ba34506 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -36,7 +36,7 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") minetest.register_craft( { output = "farming:coffee_cup", recipe = { - {"group:food_coffee", "group:food_water_glass", a.saucepan} + {"group:food_coffee", "group:food_glass_water", a.saucepan} }, replacements = { {"group:food_saucepan", "farming:saucepan"} diff --git a/crops/mint.lua b/crops/mint.lua index 8b7f7b4..6dc78d6 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -35,7 +35,7 @@ minetest.register_craftitem("farming:mint_leaf", { minetest.register_craftitem("farming:mint_tea", { description = S("Mint Tea"), inventory_image = "farming_mint_tea.png", - on_use = minetest.item_eat(2, "vessels:drinking_glass"), + on_use = minetest.item_eat(2, a.drinking_glass), groups = {flammable = 4} }) @@ -43,7 +43,7 @@ minetest.register_craft({ output = "farming:mint_tea", recipe = { {"group:food_mint", "group:food_mint", "group:food_mint"}, - {"group:food_water_glass", a.juicer, ""} + {"group:food_glass_water", a.juicer, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 2c1b90d..0d03bde 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -53,10 +53,10 @@ minetest.register_craft( { output = "farming:vanilla_extract", recipe = { {"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"}, - {"group:food_vanilla", "farming:bottle_ethanol", "group:food_water_glass"}, + {"group:food_vanilla", "farming:bottle_ethanol", "group:food_glass_water"}, }, replacements = { - {"group:food_water_glass", a.drinking_glass} + {"group:food_glass_water", a.drinking_glass} } }) @@ -64,7 +64,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:vanilla_extract", burntime = 25, - replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}} + replacements = {{"farming:vanilla_extract", a.glass_bottle}} }) -- stage 1 diff --git a/food.lua b/food.lua index 2af67fb..15728e5 100644 --- a/food.lua +++ b/food.lua @@ -62,12 +62,23 @@ minetest.register_craft({ } }) +if farming.mcl then + + minetest.register_craft({ + output = "mcl_potions:river_water", + recipe = { + {"farming:hemp_fibre"}, + {"mcl_potions:water"} + } + }) +end + -- glass of water minetest.register_craftitem("farming:glass_water", { description = S("Glass of Water"), inventory_image = "farming_water_glass.png", - groups = {food_water_glass = 1, flammable = 3, vessel = 1} + groups = {food_glass_water = 1, flammable = 3, vessel = 1} }) minetest.register_craft({ @@ -319,10 +330,10 @@ minetest.register_craft({ recipe = { {a.rose, a.rose, a.rose}, {a.rose, a.rose, a.rose}, - {"group:food_water_glass", a.pot, a.glass_bottle} + {"group:food_glass_water", a.pot, a.glass_bottle} }, replacements = { - {"group:food_water_glass", a.drinking_glass}, + {"group:food_glass_water", a.drinking_glass}, {"group:food_pot", "farming:pot"} } }) @@ -822,11 +833,11 @@ minetest.register_craft({ recipe = { {"", a.mortar_pestle, ""}, {"group:food_rice", "group:food_sugar", "group:food_rice"}, - {"", "farming:glass_water", ""} + {"", "group:food_glass_water", ""} }, replacements = { {"group:food_mortar_pestle", "farming:mortar_pestle"}, - {"farming:glass_water", a.drinking_glass} + {"group:food_glass_water", a.drinking_glass} } }) diff --git a/items.lua b/items.lua index d73ed35..b8c1c14 100644 --- a/items.lua +++ b/items.lua @@ -99,7 +99,7 @@ if farming.mcl then add_groups("mcl_core:sugar", {food_sugar = 1}) add_groups("mcl_throwing:egg", {food_egg = 1}) - add_groups("mcl_farming:wheat", {food_wheat = 1}) + add_groups("mcl_farming:wheat_item", {food_wheat = 1}) add_groups("mcl_cocoas:cocoa_beans", {food_cocoa = 1}) add_groups("mcl_core:apple", {food_apple = 1}) add_groups("mcl_core:bowl", {food_bowl = 1}) @@ -113,7 +113,7 @@ if farming.mcl then add_groups("mcl_farming:bread", {food_bread = 1}) add_groups("mcl_mobitems:milk_bucket", {food_milk = 1}) add_groups("mcl_ocean:dried_kelp", {food_seaweed = 1}) - add_groups("mcl_potions:river_water", {food_water_glass = 1}) + add_groups("mcl_potions:river_water", {food_glass_water = 1}) -- add missing food groups to current items so recipes work add_groups("mcl_dye:yellow", {food_lemon = 1, food_banana = 1}) From 2efa1740152d9df316a836bb10380c95a0c5344a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 3 Sep 2023 10:18:54 +0100 Subject: [PATCH 18/34] update readme --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5fb45a5..712dd62 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ Information This mod replaces the default `farming` mod with a fully compatible API that allows players to grow crops even when they are not nearby. It also includes many new foods and crops which can be planted directly onto tilled soil without seeds. Crops that do -require seeds like wheat and cotton are found when digging in long grasses. +require seeds like wheat and cotton are found when digging in long grasses, and will +require player to stay nearby until they germinate before growing normally. ![screenshot.png](screenshot.png) @@ -25,12 +26,10 @@ https://forum.minetest.net/viewtopic.php?id=9019 Farming Redo also works with Bonemeal mod for quick growing crops and saplings which can be found at https://notabug.org/TenPlus1/bonemeal -#### Dependencies +#### Optional dependences: * default - -Optional dependences: - +* mcl_core, mcl_sounds, mcl_farming, mcl_stairs * stairs * lucky_block (adds 47 lucky blocks) * toolranks @@ -46,6 +45,7 @@ farming mod folder or the world folder. Also `minetest.conf` contains a setting | farming_stage_length | float | 160.0 | minetest.conf | Contains a value used for speed of crop growth in seconds | | farming.min_light | int | 12 | farming.conf | default minimum light levels crops need to grow | | farming.max_light | int | 15 | farming.conf | default maximum light levels crops need to grow | +| farming_use_utensils | bool | True | farming.conf | When True uses utensils in craft recipes | | farming.carrot | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | | farming.potato | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | | farming.tomato | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | @@ -217,7 +217,7 @@ on an older map are enabled and growing properly. ### Changelog: -- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa), added gingerbread man +- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa), added gingerbread man, Added MineClone2 compatibility - 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube - 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock) - 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 From f5c321c04d66ce7261d1ca7095985234054d404f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 5 Sep 2023 07:51:11 +0100 Subject: [PATCH 19/34] add missing groups --- crops/beans.lua | 2 +- crops/blueberry.lua | 6 ++++-- crops/chili.lua | 6 ++++-- crops/corn.lua | 2 +- crops/hemp.lua | 3 ++- crops/onion.lua | 4 ++-- crops/peas.lua | 2 +- crops/pineapple.lua | 4 ++-- crops/rhubarb.lua | 3 ++- init.lua | 7 +++++-- 10 files changed, 24 insertions(+), 15 deletions(-) diff --git a/crops/beans.lua b/crops/beans.lua index 6099bf5..2462ae7 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -251,7 +251,7 @@ minetest.register_node("farming:beanbush", { selection_box = farming.select, groups = { handy = 1, snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1 + compostability = 35, not_in_creative_inventory = 1 }, sounds = farming.sounds.node_sound_leaves_defaults() }) diff --git a/crops/blueberry.lua b/crops/blueberry.lua index e1da44f..1370362 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -20,7 +20,8 @@ minetest.register_craftitem("farming:blueberries", { minetest.register_craftitem("farming:muffin_blueberry", { description = S("Blueberry Muffin"), inventory_image = "farming_blueberry_muffin.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {compostability = 65} }) minetest.register_craft({ @@ -34,7 +35,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:blueberry_pie", { description = S("Blueberry Pie"), inventory_image = "farming_blueberry_pie.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 75} }) minetest.register_craft({ diff --git a/crops/chili.lua b/crops/chili.lua index e877b86..48afc47 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -17,7 +17,8 @@ minetest.register_craftitem("farming:chili_pepper", { minetest.register_craftitem("farming:chili_bowl", { description = S("Bowl of Chili"), inventory_image = "farming_chili_bowl.png", - on_use = minetest.item_eat(8, "farming:bowl") + on_use = minetest.item_eat(8, a.bowl), + groups = {compostability = 65} }) minetest.register_craft({ @@ -38,7 +39,8 @@ minetest.register_craft({ minetest.register_craftitem("farming:chili_powder", { description = S("Chili Powder"), on_use = minetest.item_eat(-1), - inventory_image = "farming_chili_powder.png" + inventory_image = "farming_chili_powder.png", + groups = {compostability = 45} }) minetest.register_craft({ diff --git a/crops/corn.lua b/crops/corn.lua index 1e82768..689ccc9 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -56,7 +56,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:cornstarch", { description = S("Cornstarch"), inventory_image = "farming_cornstarch.png", - groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2} + groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2, compostability = 65} }) minetest.register_craft({ diff --git a/crops/hemp.lua b/crops/hemp.lua index fc6ce04..cd575bf 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -24,7 +24,8 @@ minetest.register_node("farming:seed_hemp", { -- harvested hemp minetest.register_craftitem("farming:hemp_leaf", { description = S("Hemp Leaf"), - inventory_image = "farming_hemp_leaf.png" + inventory_image = "farming_hemp_leaf.png", + groups = {compostability = 35} }) -- hemp oil diff --git a/crops/onion.lua b/crops/onion.lua index d0a9cbd..08310c8 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -23,8 +23,8 @@ minetest.register_craftitem("farming:onion", { minetest.register_craftitem("farming:onion_soup", { description = S("Onion Soup"), inventory_image = "farming_onion_soup.png", - groups = {flammable = 2}, - on_use = minetest.item_eat(6, "farming:bowl") + groups = {flammable = 2, compostability = 65}, + on_use = minetest.item_eat(6, a.bowl) }) minetest.register_craft({ diff --git a/crops/peas.lua b/crops/peas.lua index adfe6bb..a3e7800 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -24,7 +24,7 @@ minetest.register_alias("farming:peas", "farming:pea_pod") minetest.register_craftitem("farming:pea_soup", { description = S("Pea Soup"), inventory_image = "farming_pea_soup.png", - groups = {flammable = 2}, + groups = {flammable = 2, compostability = 65}, on_use = minetest.item_eat(4, a.bowl) }) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 2ef4550..32790c3 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -36,7 +36,7 @@ minetest.register_node("farming:pineapple", { minetest.register_craftitem("farming:pineapple_ring", { description = S("Pineapple Ring"), inventory_image = "farming_pineapple_ring.png", - groups = {food_pineapple_ring = 1, flammable = 2}, + groups = {food_pineapple_ring = 1, flammable = 2, compostability = 45}, on_use = minetest.item_eat(1) }) @@ -51,7 +51,7 @@ 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, compostability = 45} + groups = {vessel = 1, drink = 1, compostability = 35} }) minetest.register_craft({ diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 8d2604e..ab22851 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -17,7 +17,8 @@ minetest.register_craftitem("farming:rhubarb", { minetest.register_craftitem("farming:rhubarb_pie", { description = S("Rhubarb Pie"), inventory_image = "farming_rhubarb_pie.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {compostability = 65} }) minetest.register_craft({ diff --git a/init.lua b/init.lua index 6e67f89..f41394a 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230831", + version = "20230905", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -556,7 +556,10 @@ farming.register_plant = function(name, def) inventory_image = def.inventory_image, wield_image = def.inventory_image, drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 2, growing = 1}, + groups = { + seed = 1, snappy = 3, attached_node = 1, flammable = 2, growing = 1, + compostability = 65 + }, paramtype = "light", paramtype2 = "wallmounted", walkable = false, From b4005685fda9c9b89a6a8bd06cfc0ad809ccca34 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 5 Sep 2023 07:53:51 +0100 Subject: [PATCH 20/34] if mcl dont add bowl recipe --- utensils.lua | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/utensils.lua b/utensils.lua index a9c1429..3fe3718 100644 --- a/utensils.lua +++ b/utensils.lua @@ -10,13 +10,16 @@ minetest.register_craftitem("farming:bowl", { groups = {food_bowl = 1, flammable = 2} }) -minetest.register_craft({ - output = "farming:bowl 4", - recipe = { - {"group:wood", "", "group:wood"}, - {"", "group:wood", ""} - } -}) +if not farming.mcl then + + minetest.register_craft({ + output = "farming:bowl 4", + recipe = { + {"group:wood", "", "group:wood"}, + {"", "group:wood", ""} + } + }) +end minetest.register_craft({ type = "fuel", From 971865f9f36b9204176e9dbe573a7b8a68b0ef17 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 5 Sep 2023 11:10:57 +0100 Subject: [PATCH 21/34] add barley compostability group --- crops/barley.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crops/barley.lua b/crops/barley.lua index 2f1550d..51d6561 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -25,7 +25,7 @@ minetest.register_node("farming:seed_barley", { minetest.register_craftitem("farming:barley", { description = S("Barley"), inventory_image = "farming_barley.png", - groups = {food_barley = 1, flammable = 2} + groups = {food_barley = 1, flammable = 2, compostability = 65} }) -- flour From 27aae682bdc20463c8a94cec8c9cf47378cde520 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 5 Sep 2023 13:57:42 +0100 Subject: [PATCH 22/34] new vanilla texture (thx oz-tal) --- license.txt | 3 ++- textures/farming_vanilla.png | Bin 474 -> 515 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 8662c52..3abacbc 100644 --- a/license.txt +++ b/license.txt @@ -29,6 +29,7 @@ Created by Oz-tal (license: CC BY-SA 3.0): crops_onion.png farming_cookie.png farming_grapes.png + farming_vanilla.png Created by Shadall (CC0): farming_burger.png @@ -172,7 +173,7 @@ Created by Felfa (CC0) farming_blackberry*.png farming_lettuce*.png farming_soy*.png - farming_vanilla*.png + farming_vanilla_*.png farming_artichoke*.png farming_parsley*.png farming_paella.png diff --git a/textures/farming_vanilla.png b/textures/farming_vanilla.png index 25596ade19a3057c4b18e1672a4b14271a598901..ddcb540ebee0b598c9b59e211a1ba083def51510 100644 GIT binary patch literal 515 zcmV+e0{s1nP)At55Wa*8aVT^M4c3yyhC(Z^@UvL&gaO+fX(OptpL_u^4 zsH7xIJ2X)2b?(Vw_(SMPvtCJJkX3pjI_Y(=`zw)bMGaQb` z(<#wp;`_c&wD+h}QcXtmC&d-USo<^hld!d)@AOH+tka?yw zEwTi%I8L*9dC82(WsxJ5f#4jaL&?5P5&&Uletcw}&7PlYHRd3w*NK>epwURBgdUv0 zye&Q3Oaceh#sa7E_8+BvY!F~}u5l-pCbx9vys;)|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 From 426564232eef561925c28347a0380eaf67979b31 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 6 Sep 2023 08:11:07 +0100 Subject: [PATCH 23/34] Fix growth_check return value/check, add initial on_grow function --- crops/cocoa.lua | 4 ++-- init.lua | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 303104e..cc3267f 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -163,10 +163,10 @@ local def = { if minetest.find_node_near(pos, 1, {"default:jungletree", "mcl_core:jungletree"}) then - return false -- can grow + return true -- place next growth stage end - return true -- cannot grow + return false -- condition not met, skip growth stage until next check end } diff --git a/init.lua b/init.lua index f41394a..c78f964 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230905", + version = "20230906", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -332,6 +332,15 @@ minetest.register_abm({ }) +-- Standard growth logic, swap node until we reach last stage. +function farming.classic_growth(pos, next_stage) + + local p2 = minetest.registered_nodes[next_stage].place_param2 or 1 + + minetest.swap_node(pos, {name = next_stage, param2 = p2}) +end + + -- Plant timer function that grows plants under the right conditions. function farming.plant_growth_timer(pos, elapsed, node_name) @@ -352,7 +361,7 @@ function farming.plant_growth_timer(pos, elapsed, node_name) if chk then - if chk(pos, node_name) then + if not chk(pos, node_name) then return true end @@ -413,9 +422,14 @@ function farming.plant_growth_timer(pos, elapsed, node_name) if minetest.registered_nodes[stages.stages_left[growth]] then - local p2 = minetest.registered_nodes[stages.stages_left[growth] ].place_param2 or 1 + -- Custom grow function + local on_grow = minetest.registered_nodes[node_name].on_grow - minetest.swap_node(pos, {name = stages.stages_left[growth], param2 = p2}) + if on_grow then + on_grow(pos, stages.stages_left[growth]) + else + farming.classic_growth(pos, stages.stages_left[growth]) + end else return true end From 8606fbd202907362ac9f57575daece6a6e80ee88 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 6 Sep 2023 08:12:14 +0100 Subject: [PATCH 24/34] fix api.txt error --- api.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api.txt b/api.txt index 37cf534..d515f84 100644 --- a/api.txt +++ b/api.txt @@ -53,9 +53,9 @@ If a mod registers nodes to be used as crops using the {growing=1} group then an growth_check = function(pos, node_name) -- check surrounding for jungle tree if minetest.find_node_near(pos, 1, {"default:jungletree"}) then - return false -- place next growth stage + return true -- place next growth stage end - return true -- condition not met, skip next growth stage until next check + return false -- condition not met, skip next growth stage until next check end, ### Scythe items that will not drop From af48a0e661f5727e5a8102bb011c13a8aab28d62 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 6 Sep 2023 10:00:46 +0100 Subject: [PATCH 25/34] if not using mineclone enable defaults --- init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index c78f964..fc54c63 100644 --- a/init.lua +++ b/init.lua @@ -729,7 +729,7 @@ end dofile(farming.path .. "/items.lua") -- important items -if farming.mtg then +if not farming.mcl then dofile(farming.path .. "/soil.lua") dofile(farming.path .. "/hoes.lua") end @@ -738,7 +738,7 @@ dofile(farming.path.."/grass.lua") dofile(farming.path.."/utensils.lua") -- default crops -if farming.mtg then +if not farming.mcl then dofile(farming.path.."/crops/wheat.lua") end @@ -806,7 +806,7 @@ ddoo("ginger.lua", farming.ginger) dofile(farming.path .. "/food.lua") -if farming.mtg then +if not farming.mcl then dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility end From 0f253662035311834e825d84942d144fdf3aac8d Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 6 Sep 2023 18:14:25 +0100 Subject: [PATCH 26/34] add return growth --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index fc54c63..2adfcf5 100644 --- a/init.lua +++ b/init.lua @@ -426,7 +426,7 @@ function farming.plant_growth_timer(pos, elapsed, node_name) local on_grow = minetest.registered_nodes[node_name].on_grow if on_grow then - on_grow(pos, stages.stages_left[growth]) + growth = on_grow(pos, stages.stages_left[growth], growth) or growth else farming.classic_growth(pos, stages.stages_left[growth]) end From b6ba098396a5a9716be69c58b05832b50e7775f8 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 7 Sep 2023 07:57:20 +0100 Subject: [PATCH 27/34] revert on_grow change --- init.lua | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/init.lua b/init.lua index 2adfcf5..d41e7f8 100644 --- a/init.lua +++ b/init.lua @@ -332,15 +332,6 @@ minetest.register_abm({ }) --- Standard growth logic, swap node until we reach last stage. -function farming.classic_growth(pos, next_stage) - - local p2 = minetest.registered_nodes[next_stage].place_param2 or 1 - - minetest.swap_node(pos, {name = next_stage, param2 = p2}) -end - - -- Plant timer function that grows plants under the right conditions. function farming.plant_growth_timer(pos, elapsed, node_name) @@ -422,14 +413,9 @@ function farming.plant_growth_timer(pos, elapsed, node_name) if minetest.registered_nodes[stages.stages_left[growth]] then - -- Custom grow function - local on_grow = minetest.registered_nodes[node_name].on_grow + local p2 = minetest.registered_nodes[stages.stages_left[growth] ].place_param2 or 1 - if on_grow then - growth = on_grow(pos, stages.stages_left[growth], growth) or growth - else - farming.classic_growth(pos, stages.stages_left[growth]) - end + minetest.swap_node(pos, {name = stages.stages_left[growth], param2 = p2}) else return true end From fd205e10fc38a121cefb23d63a7f5b14aa504507 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 11 Sep 2023 14:49:37 +0100 Subject: [PATCH 28/34] seeds grow on timer so players can wander --- crops/barley.lua | 3 +++ crops/cotton.lua | 3 +++ crops/hemp.lua | 3 +++ crops/mint.lua | 3 +++ crops/rice.lua | 3 +++ crops/sunflower.lua | 3 +++ crops/wheat.lua | 3 +++ init.lua | 36 +++++++++++++++++++++++++++++++++--- 8 files changed, 54 insertions(+), 3 deletions(-) diff --git a/crops/barley.lua b/crops/barley.lua index 51d6561..9114b17 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -18,6 +18,9 @@ minetest.register_node("farming:seed_barley", { selection_box = farming.select, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_barley") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:barley_1", param2 = 3}) end }) diff --git a/crops/cotton.lua b/crops/cotton.lua index 858eb10..c0dac62 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -47,6 +47,9 @@ minetest.register_node("farming:seed_cotton", { next_plant = "farming:cotton_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_cotton") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:cotton_1", param2 = 1}) end }) diff --git a/crops/hemp.lua b/crops/hemp.lua index cd575bf..ac2b1dc 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -18,6 +18,9 @@ minetest.register_node("farming:seed_hemp", { next_plant = "farming:hemp_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_hemp") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:hemp_1", param2 = 1}) end }) diff --git a/crops/mint.lua b/crops/mint.lua index 6dc78d6..eeed4c7 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -21,6 +21,9 @@ minetest.register_node("farming:seed_mint", { next_plant = "farming:mint_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_mint") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:mint_1", param2 = 1}) end }) diff --git a/crops/rice.lua b/crops/rice.lua index 01cc9ab..1e831f3 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -21,6 +21,9 @@ minetest.register_node("farming:seed_rice", { next_plant = "farming:rice_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_rice") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:rice_1", param2 = 3}) end }) diff --git a/crops/sunflower.lua b/crops/sunflower.lua index d302f19..df7f43a 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -28,6 +28,9 @@ minetest.register_node("farming:seed_sunflower", { next_plant = "farming:sunflower_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_sunflower") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:sunflower_1", param2 = 1}) end }) diff --git a/crops/wheat.lua b/crops/wheat.lua index 24fbd43..7d62db0 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -18,6 +18,9 @@ minetest.register_node("farming:seed_wheat", { next_plant = "farming:wheat_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_wheat") + end, + on_timer = function(pos, elapsed) + minetest.set_node(pos, {name = "farming:wheat_1", param2 = 3}) end }) diff --git a/init.lua b/init.lua index d41e7f8..f0ee7ed 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230906", + version = "20230911", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -107,6 +107,16 @@ local STAGE_LENGTH_AVG = tonumber( local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 +-- quick start seed timer +farming.start_seed_timer = function(pos) + + local timer = minetest.get_node_timer(pos) + local grow_time = math.floor(math.random(STAGE_LENGTH_DEV, STAGE_LENGTH_AVG)) + + timer:start(grow_time) +end + + -- return plant name and stage from node provided local function plant_name_stage(node) @@ -318,8 +328,15 @@ minetest.register_abm({ def = minetest.registered_nodes[next_stage] - -- change seed to stage_1 or crop - if def then + local timer = minetest.get_node_timer(pos):is_started() + + -- if seed has timer function that isn't started then start timer + if def and def.on_timer and not timer then + + farming.start_seed_timer(pos) + + -- otherwise switch seed to stage_1 of crop + elseif def then local p2 = def.place_param2 or 1 @@ -503,6 +520,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname) minetest.set_node(pt.above, {name = plantname, param2 = p2}) +farming.start_seed_timer(pt.above) --minetest.get_node_timer(pt.above):start(1) --farming.handle_growth(pt.above)--, node) @@ -568,6 +586,18 @@ farming.register_plant = function(name, def) place_param2 = 1, -- place seed flat next_plant = mname .. ":" .. pname .. "_1", + on_timer = function(pos, elapsed) + + local def = minetest.registered_nodes[mname .. ":" .. pname .. "_1"] + + if def then + minetest.swap_node(pos, { + name = def.next_plant, + param2 = def.place_param2 + }) + end + end, + on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":seed_" .. pname) From 85c5c9ababfee310e268e3c76c94c7fa587a6a73 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 12 Sep 2023 08:48:21 +0100 Subject: [PATCH 29/34] optimize --- api.txt | 7 +++++++ init.lua | 36 +++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/api.txt b/api.txt index d515f84..b9d5cff 100644 --- a/api.txt +++ b/api.txt @@ -63,3 +63,10 @@ end, This is a function to add items to a list that scythes will not drop, e.g. farming:trellis or farming:beanpole. farming.add_to_scythe_not_drops(item_name) + +### Start timer function + +A handy function that starts a crops timer with a randomly selected time set by using +stage_length setting. This is mostly used for special functions or 3rd party mods. + +farming.start_seed_timer(pos) diff --git a/init.lua b/init.lua index f0ee7ed..ae20416 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230911", + version = "20230912", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -53,6 +53,9 @@ local S = minetest.get_translator("farming") farming.translate = S +-- localise +local random = math.random +local floor = math.floor -- Utility Function local time_speed = tonumber(minetest.settings:get("time_speed")) or 72 @@ -92,7 +95,7 @@ local function day_or_night_time(dt, count_day) local dt_c = clamp(t2_c, 0, 0.5) - clamp(t1_c, 0, 0.5) -- this cycle if t1_c < -0.5 then - local nc = math.floor(-t1_c) + local nc = floor(-t1_c) t1_c = t1_c + nc dt_c = dt_c + 0.5 * nc + clamp(-t1_c - 0.5, 0, 0.5) end @@ -111,7 +114,7 @@ local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 farming.start_seed_timer = function(pos) local timer = minetest.get_node_timer(pos) - local grow_time = math.floor(math.random(STAGE_LENGTH_DEV, STAGE_LENGTH_AVG)) + local grow_time = floor(random(STAGE_LENGTH_DEV, STAGE_LENGTH_AVG)) timer:start(grow_time) end @@ -277,7 +280,7 @@ local function set_growing(pos, stages_left) stage_length = clamp(stage_length, 0.5 * STAGE_LENGTH_AVG, 3.0 * STAGE_LENGTH_AVG) - timer:set(stage_length, -0.5 * math.random() * STAGE_LENGTH_AVG) + timer:set(stage_length, -0.5 * random() * STAGE_LENGTH_AVG) end elseif timer:is_started() then @@ -319,30 +322,37 @@ minetest.register_abm({ catch_up = false, action = function(pos, node) + -- skip if node timer already active + if minetest.get_node_timer(pos):is_started() then + return + end + -- check if group:growing node is a seed local def = minetest.registered_nodes[node.name] if def and def.groups and def.groups.seed then + -- start node timer if found + if def.on_timer then + + farming.start_seed_timer(pos) + + return + end + local next_stage = def.next_plant def = minetest.registered_nodes[next_stage] - local timer = minetest.get_node_timer(pos):is_started() - - -- if seed has timer function that isn't started then start timer - if def and def.on_timer and not timer then - - farming.start_seed_timer(pos) - - -- otherwise switch seed to stage_1 of crop - elseif def then + -- switch seed without timer to stage_1 of crop + if def then local p2 = def.place_param2 or 1 minetest.set_node(pos, {name = next_stage, param2 = p2}) end else + -- start normal crop timer farming.handle_growth(pos, node) end end From 98f0581c1780b8b1f78453c416a48211f4c0b685 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 15 Sep 2023 07:35:47 +0100 Subject: [PATCH 30/34] use set_node so 3rd party mod timers can activate --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index ae20416..5d76a64 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230912", + version = "20230915", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -442,7 +442,7 @@ function farming.plant_growth_timer(pos, elapsed, node_name) local p2 = minetest.registered_nodes[stages.stages_left[growth] ].place_param2 or 1 - minetest.swap_node(pos, {name = stages.stages_left[growth], param2 = p2}) + minetest.set_node(pos, {name = stages.stages_left[growth], param2 = p2}) else return true end From 421cde33a45c10c518a7e08389aa1d5be72a55a5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 2 Oct 2023 07:39:06 +0100 Subject: [PATCH 31/34] increase mithril scythe to 350 uses, tidy hoe code --- hoes.lua | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/hoes.lua b/hoes.lua index ee683b5..9dc8d2f 100644 --- a/hoes.lua +++ b/hoes.lua @@ -110,7 +110,7 @@ function farming.hoe_on_use(itemstack, user, pointed_thing, uses) -- turn the node into soil, wear out item and play sound minetest.set_node(pt.under, {name = ndef.soil.dry}) - minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}) + minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}, true) local wdef = itemstack:get_definition() local wear = 65535 / (uses - 1) @@ -130,8 +130,7 @@ function farming.hoe_on_use(itemstack, user, pointed_thing, uses) end if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then - minetest.sound_play(wdef.sound.breaks, {pos = pt.above, - gain = 0.5}, true) + minetest.sound_play(wdef.sound.breaks, {pos = pt.above, gain = 0.5}, true) end return itemstack @@ -252,11 +251,15 @@ end -- throwable hoe bomb minetest.register_entity("farming:hoebomb_entity", { - physical = true, - visual = "sprite", - visual_size = {x = 1.0, y = 1.0}, - textures = {"farming_hoe_bomb.png"}, - collisionbox = {-0.1,-0.1,-0.1,0.1,0.1,0.1}, + + initial_properties = { + physical = true, + visual = "sprite", + visual_size = {x = 1.0, y = 1.0}, + textures = {"farming_hoe_bomb.png"}, + collisionbox = {-0.1,-0.1,-0.1,0.1,0.1,0.1} + }, + lastpos = {}, player = "", @@ -273,7 +276,7 @@ minetest.register_entity("farming:hoebomb_entity", { if self.lastpos.x ~= nil then - local vel = self.object:getvelocity() + local vel = self.object:get_velocity() -- only when potion hits something physical if vel.x == 0 @@ -311,20 +314,14 @@ local function throw_potion(itemstack, player) z = playerpos.z }, "farming:hoebomb_entity") + if not obj then return end + local dir = player:get_look_dir() local velocity = 20 - obj:set_velocity({ - x = dir.x * velocity, - y = dir.y * velocity, - z = dir.z * velocity - }) + obj:set_velocity({x = dir.x * velocity, y = dir.y * velocity, z = dir.z * velocity}) - obj:set_acceleration({ - x = dir.x * -3, - y = -9.5, - z = dir.z * -3 - }) + obj:set_acceleration({x = dir.x * -3, y = -9.5, z = dir.z * -3}) obj:get_luaentity().player = player end @@ -386,18 +383,13 @@ minetest.register_tool("farming:scythe_mithril", { local def = minetest.registered_nodes[node.name] - if not def - or not def.drop - or not def.groups - or not def.groups.plant then + if not def or not def.drop or not def.groups or not def.groups.plant then return end local drops = minetest.get_node_drops(node.name, "") - if not drops - or #drops == 0 - or (#drops == 1 and drops[1] == "") then + if not drops or #drops == 0 or (#drops == 1 and drops[1] == "") then return end @@ -405,6 +397,7 @@ minetest.register_tool("farming:scythe_mithril", { local mname = node.name:split(":")[1] local pname = node.name:split(":")[2] local sname = tonumber(pname:split("_")[2]) + pname = pname:split("_")[1] if not sname then @@ -443,7 +436,7 @@ minetest.register_tool("farming:scythe_mithril", { end -- play sound - minetest.sound_play("default_grass_footstep", {pos = pos, gain = 1.0}) + minetest.sound_play("default_grass_footstep", {pos = pos, gain = 1.0}, true) local replace = mname .. ":" .. pname .. "_1" @@ -458,7 +451,7 @@ minetest.register_tool("farming:scythe_mithril", { if not farming.is_creative(name) then - itemstack:add_wear(65535 / 150) -- 150 uses + itemstack:add_wear(65535 / 350) -- 350 uses return itemstack end From 1d634550cb92a93d78ccbc1f49194a2782f3d072 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 7 Oct 2023 08:16:07 +0100 Subject: [PATCH 32/34] update french translation (thx TheDarkTiger) --- locale/farming.fr.tr | 100 ++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/locale/farming.fr.tr b/locale/farming.fr.tr index 7bdd760..ba3930c 100644 --- a/locale/farming.fr.tr +++ b/locale/farming.fr.tr @@ -1,13 +1,17 @@ +# Traduction Française du mod farming par TenPlus1 +# author: Papaou30 +# author: TheDarkTiger +# last update: 2023/Oct/06 # textdomain: farming -Artichoke= -Asparagus= +Artichoke=Artichaut +Asparagus=Asperge Barley Seed=Graine d'orge Barley=Orge Green Beans=Haricots verts Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots) Beetroot=Betterave Beetroot Soup=Soupe de betterave -Blackberries= +Blackberries=Mûres Wild Blueberries=Myrtilles sauvages Blueberry Muffin=Muffin aux myrtilles Blueberry Pie=Tarte aux myrtilles @@ -17,8 +21,8 @@ Carrot Juice=Jus de carotte Golden Carrot=Carotte dorée Chili Pepper=Piment fort Bowl of Chili=Bol de chilli -Chili Powder= -Raw Cocoa Beans= +Chili Powder=Poudre de piment +Raw Cocoa Beans=Fèves de cacao brutes Cocoa Beans=Fèves de cacao Cookie=Biscuit Bar of Dark Chocolate=Tablette de chocolat noir @@ -30,7 +34,7 @@ Banana Leaves=Feuilles de banane Orange=Orange Corn=Maïs Corn on the Cob=Cobette (maïs cuit) -Popcorn= +Popcorn=Popcorn Cornstarch=Fécule de maïs Bottle of Ethanol=Bouteille d'éthanol Wild Cotton=Coton sauvage @@ -38,13 +42,13 @@ Cotton Seed=Graines de coton Cotton=Coton String=Ficelle Cucumber=Concombre -Eggplant= -Glass of Water= +Eggplant=Aubergine +Glass of Water=Verre d'eau Sugar=Sucre -Sugar Cube= -Caramel= +Sugar Cube=Morceau de sucre +Caramel=Caramel Salt=Sel -Mayonnaise= +Mayonnaise=Mayonnaise Rose Water=Eau de rose Turkish Delight=Douceur turque Garlic Bread=Pain à l'ail @@ -56,25 +60,25 @@ Jaffa Cake=Petit gâteau à l'orange "Jaffa" Apple Pie=Tarte aux pommes Cactus Juice=Jus de cactus Pasta=Pâtes -Mac & Cheese= +Mac & Cheese=Grâtin de pâtes Spaghetti=Spaghetti Bibimbap=Bibimbap -Burger= -Salad= -Triple Berry Smoothie= -Spanish Potatoes= -Potato omelet= -Paella= -Vanilla Flan= -Vegan Cheese= -Onigiri= -Gyoza= -Mochi= -Gingerbread Man= +Burger=Hamburger +Salad=Salade verte +Triple Berry Smoothie=Smoothie aux trois baies +Spanish Potatoes=Patates sautées à l'Espagnole +Potato omelet=Omelette aux pommes de terre +Paella=Paëlla +Vanilla Flan=Flan +Vegan Cheese=Faumage végan +Onigiri=Onigiri +Gyoza=Gyoza +Mochi=Mochi +Gingerbread Man=Bonhomme en pain d'épice Garlic clove=Gousse d'ail Garlic=Tête d'ail Garlic Braid=Ail tressé -Ginger= +Ginger=Gingembre Grapes=Raisins Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne) Hemp Seed=Graines de chanvre @@ -90,11 +94,11 @@ Steel Hoe=Binette en acier Bronze Hoe=Binette en bronze Mese Hoe=Binette en mese Diamond Hoe=Binette en diamant -Wood Hoe= +Wood Hoe=Binette en bois Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) -Mithril Scythe (Use to harvest and replant crops)= +Mithril Scythe (Use to harvest and replant crops)=Faux de mithril (Utiliser pour récolter et replanter les cultures) Seed=Graine -Lettuce= +Lettuce=Laitue Melon Slice=Tranche de melon Melon=Melon Mint Seeds=Graine de menthe @@ -102,13 +106,13 @@ Mint Leaf=Feuille de menthe Mint Tea=Thé à la menthe Onion=Oignon Onion Soup=Soupe à l'oignon -Parsley= +Parsley=Persil Pea Pod=Cosse de petit-pois Pea Soup=Soupe de petit-pois Peppercorn=Grain de poivre -Green Pepper= -Yellow Pepper= -Red Pepper= +Green Pepper=Poivron vert +Yellow Pepper=Poivron jaune +Red Pepper=Poivron rouge Ground Pepper=Poivre moulu Pineapple Top=Pousse d'ananas Pineapple=Ananas @@ -118,7 +122,7 @@ Potato=Pomme de terre Baked Potato=Pomme de terre cuite Cucumber and Potato Salad=Salade de pomme de terre et concombre Pumpkin Slice=Tranche de citrouille -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre) +Jack 'O Lantern (punch to turn on and off)=Citrouille d'halloween (Frapper pour allumer et éteindre) Scarecrow Bottom=Base d'épouventail Pumpkin Bread=Pain à la citrouille Pumpkin Dough=Pâton de pain à la citrouille @@ -127,7 +131,7 @@ Raspberries=Framboises Raspberry Smoothie=Smoothie aux framboises Rhubarb=Rhubarbe Rhubarb Pie=Tarte à la rhubarbe -Rice Seed= +Rice Seed=Riz Rice=Riz Rice Bread=Pain de riz Rice Flour=Farine de riz @@ -141,20 +145,20 @@ Savanna Soil=Terre de la savane binnée Wet Savanna Soil=Terre humide et binnée de la savane Soil=Terre binnée Wet Soil=Terre humide et binnée -Soy Pod= -Soy Sauce= -Soy Milk= -Tofu= -Cooked Tofu= -Spinach= +Soy Pod=Cosse de soja +Soy Sauce=Sauce de soja +Soy Milk=Lait de soja +Tofu=Tofu +Cooked Tofu=Tofu cuit +Spinach=Épinard Strawberry=Fraise -Sunflower= -Sunflower Seeds= -Toasted Sunflower Seeds= -Bottle of Sunflower Oil= -Sunflower Seed Bread= +Sunflower=Tournesol +Sunflower Seeds=Graines de tournesol +Toasted Sunflower Seeds=Graines de tournesol grillées +Bottle of Sunflower Oil=Bouteille d'huile de tournesol +Sunflower Seed Bread=Pain de graines de tournesol Tomato=Tomate -Tomato Soup= +Tomato Soup=Soupe de tomate Wooden Bowl=Bol en bois Saucepan=Casserole Cooking Pot=Marmitte @@ -164,8 +168,8 @@ Mortar and Pestle=Mortier et pilon Cutting Board=Planche à découper Juicer=Presse-agrumes Glass Mixing Bowl=Terrine en verre -Vanilla= -Vanilla Extract= +Vanilla=Vanille +Vanilla Extract=Extrait de vanille Wheat Seed=Grain de blé Wheat=Blé Straw=Paille From 915b93f1135ad27893fe392078e4ba0b043da3a3 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 7 Oct 2023 11:45:05 +0100 Subject: [PATCH 33/34] update french translation (thx TheDarkTiger) --- locale/farming.fr.tr | 119 ++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/locale/farming.fr.tr b/locale/farming.fr.tr index ba3930c..a9786b0 100644 --- a/locale/farming.fr.tr +++ b/locale/farming.fr.tr @@ -3,6 +3,9 @@ # author: TheDarkTiger # last update: 2023/Oct/06 # textdomain: farming +Banana=Banane +Banana Leaves=Feuilles de banane +Orange=Orange Artichoke=Artichaut Asparagus=Asperge Barley Seed=Graine d'orge @@ -29,9 +32,6 @@ Bar of Dark Chocolate=Tablette de chocolat noir Chocolate Block=Bloc de chocolat Coffee Beans=Grains de café Cup of Coffee=Tasse de café -Banana=Banane -Banana Leaves=Feuilles de banane -Orange=Orange Corn=Maïs Corn on the Cob=Cobette (maïs cuit) Popcorn=Popcorn @@ -43,38 +43,6 @@ Cotton=Coton String=Ficelle Cucumber=Concombre Eggplant=Aubergine -Glass of Water=Verre d'eau -Sugar=Sucre -Sugar Cube=Morceau de sucre -Caramel=Caramel -Salt=Sel -Mayonnaise=Mayonnaise -Rose Water=Eau de rose -Turkish Delight=Douceur turque -Garlic Bread=Pain à l'ail -Donut=Beignet -Chocolate Donut=Beignet au chocolat -Apple Donut=Beignet aux pommes -Porridge=Gruau de céréales -Jaffa Cake=Petit gâteau à l'orange "Jaffa" -Apple Pie=Tarte aux pommes -Cactus Juice=Jus de cactus -Pasta=Pâtes -Mac & Cheese=Grâtin de pâtes -Spaghetti=Spaghetti -Bibimbap=Bibimbap -Burger=Hamburger -Salad=Salade verte -Triple Berry Smoothie=Smoothie aux trois baies -Spanish Potatoes=Patates sautées à l'Espagnole -Potato omelet=Omelette aux pommes de terre -Paella=Paëlla -Vanilla Flan=Flan -Vegan Cheese=Faumage végan -Onigiri=Onigiri -Gyoza=Gyoza -Mochi=Mochi -Gingerbread Man=Bonhomme en pain d'épice Garlic clove=Gousse d'ail Garlic=Tête d'ail Garlic Braid=Ail tressé @@ -87,17 +55,6 @@ Bottle of Hemp Oil=Bouteille d'huile de chanvre Hemp Fibre=Fibre de chanvre Hemp Block=Bloc de chanvre Hemp Rope=Corde de chanvre -Hoe=Binette -Wooden Hoe=Binette en bois -Stone Hoe=Binette en pierre -Steel Hoe=Binette en acier -Bronze Hoe=Binette en bronze -Mese Hoe=Binette en mese -Diamond Hoe=Binette en diamant -Wood Hoe=Binette en bois -Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) -Mithril Scythe (Use to harvest and replant crops)=Faux de mithril (Utiliser pour récolter et replanter les cultures) -Seed=Graine Lettuce=Laitue Melon Slice=Tranche de melon Melon=Melon @@ -141,10 +98,6 @@ Oat seed=Grains d'orge Oats=Avoine Multigrain Flour=Farine multi-céréales Multigrain Bread=Pain aux céréales -Savanna Soil=Terre de la savane binnée -Wet Savanna Soil=Terre humide et binnée de la savane -Soil=Terre binnée -Wet Soil=Terre humide et binnée Soy Pod=Cosse de soja Soy Sauce=Sauce de soja Soy Milk=Lait de soja @@ -159,15 +112,6 @@ Bottle of Sunflower Oil=Bouteille d'huile de tournesol Sunflower Seed Bread=Pain de graines de tournesol Tomato=Tomate Tomato Soup=Soupe de tomate -Wooden Bowl=Bol en bois -Saucepan=Casserole -Cooking Pot=Marmitte -Baking Tray=Lèche-frite -Skillet=Poêle -Mortar and Pestle=Mortier et pilon -Cutting Board=Planche à découper -Juicer=Presse-agrumes -Glass Mixing Bowl=Terrine en verre Vanilla=Vanille Vanilla Extract=Extrait de vanille Wheat Seed=Grain de blé @@ -178,3 +122,60 @@ Bread=Pain Sliced Bread=Tranche de pain Toast=Pain grillé Toast Sandwich=Sandwich au pain grillé +Glass of Water=Verre d'eau +Sugar=Sucre +Sugar Cube=Morceau de sucre +Caramel=Caramel +Salt=Sel +Salt crystal=Cristaux de sel +Mayonnaise=Mayonnaise +Rose Water=Eau de rose +Turkish Delight=Douceur turque +Garlic Bread=Pain à l'ail +Donut=Beignet +Chocolate Donut=Beignet au chocolat +Apple Donut=Beignet aux pommes +Porridge=Gruau de céréales +Jaffa Cake=Petit gâteau à l'orange "Jaffa" +Apple Pie=Tarte aux pommes +Cactus Juice=Jus de cactus +Pasta=Pâtes +Mac & Cheese=Grâtin de pâtes +Spaghetti=Spaghetti +Bibimbap=Bibimbap +Burger=Hamburger +Salad=Salade verte +Triple Berry Smoothie=Smoothie aux trois baies +Spanish Potatoes=Patates sautées à l'Espagnole +Potato omelet=Omelette aux pommes de terre +Paella=Paëlla +Vanilla Flan=Flan +Vegan Cheese=Faumage végan +Onigiri=Onigiri +Gyoza=Gyoza +Mochi=Mochi +Gingerbread Man=Bonhomme en pain d'épice +Hoe=Binette +Wooden Hoe=Binette en bois +Stone Hoe=Binette en pierre +Steel Hoe=Binette en acier +Bronze Hoe=Binette en bronze +Mese Hoe=Binette en mese +Diamond Hoe=Binette en diamant +Wood Hoe=Binette en bois +Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) +Mithril Scythe (Use to harvest and replant crops)=Faux de mithril (Utiliser pour récolter et replanter les cultures) +Seed=Graine +Savanna Soil=Terre de la savane binnée +Wet Savanna Soil=Terre humide et binnée de la savane +Soil=Terre binnée +Wet Soil=Terre humide et binnée +Wooden Bowl=Bol en bois +Saucepan=Casserole +Cooking Pot=Marmitte +Baking Tray=Lèche-frite +Skillet=Poêle +Mortar and Pestle=Mortier et pilon +Cutting Board=Planche à découper +Juicer=Presse-agrumes +Glass Mixing Bowl=Terrine en verre From be56564c285453983410e69c0efd6cad93e2735b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 8 Oct 2023 16:47:47 +0100 Subject: [PATCH 34/34] remove meta from french translation --- locale/farming.fr.tr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/locale/farming.fr.tr b/locale/farming.fr.tr index a9786b0..532e234 100644 --- a/locale/farming.fr.tr +++ b/locale/farming.fr.tr @@ -1,7 +1,3 @@ -# Traduction Française du mod farming par TenPlus1 -# author: Papaou30 -# author: TheDarkTiger -# last update: 2023/Oct/06 # textdomain: farming Banana=Banane Banana Leaves=Feuilles de banane