From 7b180f0c97510ee22490a608ad0750801322e463 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jul 2021 17:35:01 -0700 Subject: [PATCH] Update farming (farming redo) mod to v2021-07-18... https://notabug.org/TenPlus1/farming/src/328e8b3223a7568ab3f07b16c341ee547694d225 --- README.md | 4 +-- mods/horticulture/farming/compatibility.lua | 7 ---- mods/horticulture/farming/crops/cocoa.lua | 6 +--- mods/horticulture/farming/crops/corn.lua | 19 +++++++++++ mods/horticulture/farming/crops/melon.lua | 32 +++++++++--------- mods/horticulture/farming/crops/pumpkin.lua | 6 ++-- .../horticulture/farming/crops/ryeoatrice.lua | 12 +++++++ mods/horticulture/farming/crops/soy.lua | 15 ++++++-- mods/horticulture/farming/food.lua | 28 +++++++++++++++ mods/horticulture/farming/hoes.lua | 2 +- mods/horticulture/farming/license.txt | 6 ++++ .../horticulture/farming/locale/farming.de.tr | 6 ++-- .../farming/locale/farming.zh_CN.tr | 4 +-- .../farming/locale/farming.zh_TW.tr | 4 +-- .../farming/textures/farming_mint_1.png | Bin 114 -> 155 bytes .../farming/textures/farming_mint_2.png | Bin 122 -> 172 bytes .../farming/textures/farming_mint_3.png | Bin 132 -> 191 bytes .../farming/textures/farming_mint_4.png | Bin 174 -> 233 bytes .../farming/textures/farming_mint_leaf.png | Bin 158 -> 253 bytes .../farming/textures/farming_mint_tea.png | Bin 166 -> 289 bytes .../farming/textures/farming_popcorn.png | Bin 0 -> 292 bytes .../textures/farming_pumpkin_bottom.png | Bin 0 -> 258 bytes .../farming/textures/farming_water_glass.png | Bin 0 -> 167 bytes 23 files changed, 109 insertions(+), 42 deletions(-) create mode 100644 mods/horticulture/farming/textures/farming_popcorn.png create mode 100644 mods/horticulture/farming/textures/farming_pumpkin_bottom.png create mode 100644 mods/horticulture/farming/textures/farming_water_glass.png diff --git a/README.md b/README.md index 04fa790a..1c25109a 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [trash_can][] ([MIT][lic.trash_can]) -- version: [423b0f2 Git][ver.trash_can] *2020-08-12* * [waffles][] ([MIT][lic.waffles]) -- version: [15bcdce Git][ver.waffles] *2018-05-13* (patched) * horticulture/ - * [farming][] ([MIT][lic.farming]) -- version: [dedc33c Git][ver.farming] *2021-05-07* + * [farming][] ([MIT][lic.farming]) -- version: [2021-07-18][ver.farming] * inventory/ * [bags][] ([BSD 3-Clause][lic.bags]) -- version: [bc87b45 Git][ver.bags] *2018-04-11* * [sfinv][] ([MIT][lic.sfinv] -- version: [556f70e Git][ver.sfinv] *2021-02-17* @@ -603,7 +603,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.equip_exam]: https://github.com/AntumMT/mod-equip_exam/releases/tag/v1.6 [ver.equip_wear]: https://github.com/AntumMT/mod-equip_wear/releases/tag/v0.1 [ver.ethereal]: https://notabug.org/TenPlus1/ethereal/src/90cdf94ea6c54cd5e3fcc7f77d3b6121f963c379 -[ver.farming]: https://notabug.org/TenPlus1/farming/commit/dedc33cc46ec65782a5b8ab573d1fb6bb6915b63 +[ver.farming]: https://notabug.org/TenPlus1/farming/src/328e8b3223a7568ab3f07b16c341ee547694d225 [ver.folks]: https://gitlab.com/SonoMichele/folks/tags/v0.2.0 [ver.fort_spikes]: https://github.com/xeranas/fort_spikes/tree/3b98b46 [ver.gems_encrustable]: https://github.com/wowiamdiamonds/gems/tree/81d513d diff --git a/mods/horticulture/farming/compatibility.lua b/mods/horticulture/farming/compatibility.lua index abc787fc..1fdf6203 100644 --- a/mods/horticulture/farming/compatibility.lua +++ b/mods/horticulture/farming/compatibility.lua @@ -15,13 +15,6 @@ minetest.override_item("default:apple", { leafdecay = 3, leafdecay_drop = 1} }) -if minetest.registered_nodes["flowers:mushroom_brown"] then -minetest.override_item("flowers:mushroom_brown", { - light_source = 1, - groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2} -}) -end - --= Aliases -- Banana diff --git a/mods/horticulture/farming/crops/cocoa.lua b/mods/horticulture/farming/crops/cocoa.lua index 1fc78757..1fb3194d 100644 --- a/mods/horticulture/farming/crops/cocoa.lua +++ b/mods/horticulture/farming/crops/cocoa.lua @@ -135,15 +135,11 @@ local def = { tiles = {"farming_cocoa_1.png"}, paramtype = "light", walkable = false, - drop = { - items = { - {items = {"farming:cocoa_beans 1"}, rarity = 2}, - } - }, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} }, + drop = {}, groups = { snappy = 3, flammable = 2, plant = 1, growing = 1, not_in_creative_inventory = 1, leafdecay = 1, leafdecay_drop = 1 diff --git a/mods/horticulture/farming/crops/corn.lua b/mods/horticulture/farming/crops/corn.lua index e03c8ba1..fe890794 100644 --- a/mods/horticulture/farming/crops/corn.lua +++ b/mods/horticulture/farming/crops/corn.lua @@ -32,6 +32,25 @@ minetest.register_craft({ recipe = "group:food_corn" }) +-- popcorn +minetest.register_craftitem("farming:popcorn", { + description = S("Popcorn"), + inventory_image = "farming_popcorn.png", + groups = {food_popcorn = 1, flammable = 2}, + on_use = minetest.item_eat(4) +}) + +minetest.register_craft({ + output = "farming:popcorn", + recipe = { + {"group:food_pot", "group:food_oil", "group:food_corn"} + }, + replacements = { + {"group:food_pot", "farming:pot"}, + {"group:food_oil", "vessels:glass_bottle"} + } +}) + -- cornstarch minetest.register_craftitem("farming:cornstarch", { description = S("Cornstarch"), diff --git a/mods/horticulture/farming/crops/melon.lua b/mods/horticulture/farming/crops/melon.lua index 4c199da9..66decdc4 100644 --- a/mods/horticulture/farming/crops/melon.lua +++ b/mods/horticulture/farming/crops/melon.lua @@ -71,22 +71,22 @@ def.tiles = {"farming_melon_7.png"} minetest.register_node("farming:melon_7", table.copy(def)) -- stage 8 (final) -def.drawtype = "nodebox" -def.description = S("Melon") -def.tiles = { - "farming_melon_top.png", "farming_melon_bottom.png", "farming_melon_side.png" -} -def.selection_box = {-.5, -.5, -.5, .5, .5, .5} -def.walkable = true -def.buildable_to = false -def.paramtype2 = "facedir" -def.groups = { - food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, - flammable = 2, plant = 1 -} -def.drop = "farming:melon_8" -def.on_place = minetest.rotate_node -minetest.register_node("farming:melon_8", table.copy(def)) +minetest.register_node("farming:melon_8", { + description = S("Melon"), + tiles = { + "farming_melon_top.png", + "farming_melon_bottom.png", + "farming_melon_side.png" + }, + groups = { + food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, + flammable = 2, plant = 1 + }, + drop = "farming:melon_8", + sounds = default.node_sound_wood_defaults(), + paramtype2 = "facedir", + on_place = minetest.rotate_node +}) -- add to registered_plants farming.registered_plants["farming:melon"] = { diff --git a/mods/horticulture/farming/crops/pumpkin.lua b/mods/horticulture/farming/crops/pumpkin.lua index 0007ac7b..2829d47c 100644 --- a/mods/horticulture/farming/crops/pumpkin.lua +++ b/mods/horticulture/farming/crops/pumpkin.lua @@ -183,7 +183,7 @@ minetest.register_node("farming:pumpkin_8", { description = S("Pumpkin"), tiles = { "farming_pumpkin_top.png", - "farming_pumpkin_top.png", + "farming_pumpkin_bottom.png", "farming_pumpkin_side.png" }, groups = { @@ -191,7 +191,9 @@ minetest.register_node("farming:pumpkin_8", { flammable = 2, plant = 1 }, drop = "farming:pumpkin_8", - sounds = default.node_sound_wood_defaults() + sounds = default.node_sound_wood_defaults(), + paramtype2 = "facedir", + on_place = minetest.rotate_node }) minetest.register_alias("farming:pumpkin", "farming:pumpkin_8") diff --git a/mods/horticulture/farming/crops/ryeoatrice.lua b/mods/horticulture/farming/crops/ryeoatrice.lua index e1f6a727..090cd74b 100644 --- a/mods/horticulture/farming/crops/ryeoatrice.lua +++ b/mods/horticulture/farming/crops/ryeoatrice.lua @@ -18,6 +18,10 @@ minetest.override_item("farming:rye", { groups = {food_rye = 1, flammable = 4} }) +minetest.override_item("farming:rye_1", {drop = {}}) +minetest.override_item("farming:rye_2", {drop = {}}) +minetest.override_item("farming:rye_3", {drop = {}}) + minetest.register_craft({ output = "farming:flour", recipe = { @@ -42,6 +46,10 @@ minetest.override_item("farming:oat", { groups = {food_oats = 1, flammable = 4} }) +minetest.override_item("farming:oat_1", {drop = {}}) +minetest.override_item("farming:oat_2", {drop = {}}) +minetest.override_item("farming:oat_3", {drop = {}}) + minetest.register_craft({ output = "farming:flour", recipe = { @@ -66,6 +74,10 @@ minetest.override_item("farming:rice", { groups = {food_rice = 1, flammable = 4} }) +minetest.override_item("farming:rice_1", {drop = {}}) +minetest.override_item("farming:rice_2", {drop = {}}) +minetest.override_item("farming:rice_3", {drop = {}}) + minetest.register_craftitem("farming:rice_bread", { description = S("Rice Bread"), inventory_image = "farming_rice_bread.png", diff --git a/mods/horticulture/farming/crops/soy.lua b/mods/horticulture/farming/crops/soy.lua index 053557dc..eec33f3e 100644 --- a/mods/horticulture/farming/crops/soy.lua +++ b/mods/horticulture/farming/crops/soy.lua @@ -42,15 +42,26 @@ minetest.register_node("farming:soy_sauce", { sounds = default.node_sound_glass_defaults() }) +-- river water availability check +local bucket_water + +if minetest.get_mapgen_setting("mgname") == "valleys" +or minetest.get_modpath("ethereal") then + bucket_water = "bucket:bucket_river_water" +else + bucket_water = "bucket:bucket_water" +end + +-- 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_river_water", "vessels:glass_bottle"} + {"", bucket_water, "vessels:glass_bottle"} }, replacements = { - {"bucket:bucket_river_water", "bucket:bucket_empty"}, + {bucket_water, "bucket:bucket_empty"}, {"group:food_juicer", "farming:juicer"} } }) diff --git a/mods/horticulture/farming/food.lua b/mods/horticulture/farming/food.lua index a7f5af15..3be519e8 100644 --- a/mods/horticulture/farming/food.lua +++ b/mods/horticulture/farming/food.lua @@ -1,6 +1,34 @@ local S = farming.intllib +--= filter sea water into river water +minetest.register_craft({ + output = "bucket:bucket_river_water", + recipe = { + {"farming:hemp_fibre"}, + {"farming:hemp_fibre"}, + {"bucket:bucket_water"} + } +}) + +--= 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} +}) + +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", ""} + }, + replacements = {{"bucket:bucket_river_water", "bucket:bucket_empty"}} +}) + --= Sugar minetest.register_craftitem("farming:sugar", { diff --git a/mods/horticulture/farming/hoes.lua b/mods/horticulture/farming/hoes.lua index b7dcfd97..9340d55c 100644 --- a/mods/horticulture/farming/hoes.lua +++ b/mods/horticulture/farming/hoes.lua @@ -361,7 +361,7 @@ farming.add_to_scythe_not_drops = function(item) end minetest.register_tool("farming:scythe_mithril", { - description = S("Mithril Scythe (Right-click to harvest and replant crops)"), + description = S("Mithril Scythe (Use to harvest and replant crops)"), inventory_image = "farming_scythe_mithril.png", sound = {breaks = "default_tool_breaks"}, diff --git a/mods/horticulture/farming/license.txt b/mods/horticulture/farming/license.txt index c929fcc6..e7126bfd 100644 --- a/mods/horticulture/farming/license.txt +++ b/mods/horticulture/farming/license.txt @@ -173,3 +173,9 @@ Created by gorlock (CC0) Created by sirrobzeroone (CC0) farming_gyoza.png farming_pineapple_ring.png + +Created by TechM8 (https://www.deviantart.com/techm8) + farming_popcorn.png + +Created by RZR0 (CC-BY-NC-SA) + farming_blueberry_pie.png diff --git a/mods/horticulture/farming/locale/farming.de.tr b/mods/horticulture/farming/locale/farming.de.tr index a9183263..175990ec 100644 --- a/mods/horticulture/farming/locale/farming.de.tr +++ b/mods/horticulture/farming/locale/farming.de.tr @@ -21,7 +21,7 @@ Bottle of Hemp Oil=Flasche mit Hanföl Bowl of Chili=Chili Schale Bread=Brot Bronze Hoe=Bronzehacke -Cabbage=Salat +Cabbage=Weißkohl Cactus Juice=Kaktussaft Carrot=Möhre Carrot Juice=Möhrensaft @@ -61,7 +61,7 @@ Hemp Seed=Hanfsamen 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=Jaffa-Torte +Jaffa Cake=Jaffakeks Juicer=Entsafter Melon=Melone Melon Slice=Melonenscheibe @@ -88,7 +88,7 @@ Pineapple=Ananas Pineapple Juice=Ananassaft Pineapple Ring=Ananasscheibe Pineapple Top=Ananasdeckel -Porridge=Brei +Porridge=Haferbrei Potato=Kartoffel Pumpkin=Kürbis Pumpkin Bread=Kürbisbrot diff --git a/mods/horticulture/farming/locale/farming.zh_CN.tr b/mods/horticulture/farming/locale/farming.zh_CN.tr index 3e9c2f94..88207055 100644 --- a/mods/horticulture/farming/locale/farming.zh_CN.tr +++ b/mods/horticulture/farming/locale/farming.zh_CN.tr @@ -60,7 +60,7 @@ 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)=杰克灯（按一下开关） +Jack 'O Lantern (punch to turn on and off)=南瓜灯（按一下开关） Jaffa Cake=佳发饼 Juicer=榨汁机 Melon=甜瓜 @@ -118,7 +118,7 @@ Steel Hoe=钢锄头 Stone Hoe=石锄 Straw=稻草 Strawberry=草莓 -String=字符串 +String=线 Sugar=糖 Toast=烤面包片 Toast Sandwich=三明治面包 diff --git a/mods/horticulture/farming/locale/farming.zh_TW.tr b/mods/horticulture/farming/locale/farming.zh_TW.tr index 5a8449b5..a72f7397 100644 --- a/mods/horticulture/farming/locale/farming.zh_TW.tr +++ b/mods/horticulture/farming/locale/farming.zh_TW.tr @@ -60,7 +60,7 @@ 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)=傑克燈（按一下開關） +Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關） Jaffa Cake=佳發餅 Juicer=榨汁機 Melon=甜瓜 @@ -118,7 +118,7 @@ Steel Hoe=鋼鋤頭 Stone Hoe=石鋤 Straw=稻草 Strawberry=草莓 -String=字符串 +String=線 Sugar=糖 Toast=烤麵包片 Toast Sandwich=三明治麵包 diff --git a/mods/horticulture/farming/textures/farming_mint_1.png b/mods/horticulture/farming/textures/farming_mint_1.png index 10ba563ded7966d2e1be61f52c047bfc362d7acd..1f303aeb8a037487865af3ddf3f0d1474a934b0a 100644 GIT binary patch delta 138 zcmXS#%{W1#o`so#f#L1lM?pYJG{7gsHNPk~qS`UO#VxhZw|J#@?OyNpi@qM~r-%a; zFqQ=Q1v5B2yO9Run0UH4hHzX@PFNt*;`lNo{2Gga@{t273_1rA5*S1c3|c)TB{nxK om6*Z1VAqVP3we|k6&M+WUb9}%GTSWz)X(7Q>gU3;&MBb@0G>H5bpQYW delta 96 zcmbQuSTsQ*iiw$lfgx$G_$MI68Q>G*3ZyM>`#b)M>iqbA4UofF666=m;PC858jvII v>Eal|aXmR<0fz>|MhE5z3Ctg7NJubnmND#X_^(_8RKnot>gTe~DWM4fL|Pok diff --git a/mods/horticulture/farming/textures/farming_mint_2.png b/mods/horticulture/farming/textures/farming_mint_2.png index b0d4324733bd96a63f87d78bf2a2ee27a9b779a5..cdcde54b5ada04179af48bea4553b00ca468303f 100644 GIT binary patch delta 155 zcmb;C>T!{vnj=2UxOj+!r46Lg;ZdUk4+W}2v@O1TaS?83{ F1OS4iF@XR8 delta 104 zcmZ3(ST#W+iHVtkfgx$G_$MI68Q>G*3ZyM>`#b)M>iqbA4UofF666=m;PC858jvIJ z>Eal|aXmRfLAJnzfs>z6L6IRz(}IE1Zvu-jGc$v#7~`D}{ZIb@l`?p``njxgN@xNA D*asY? diff --git a/mods/horticulture/farming/textures/farming_mint_3.png b/mods/horticulture/farming/textures/farming_mint_3.png index 3ae3d61bc9e070cfc760a6a4f48c03850836f9b8..4bfc43f255160098b56a580eda438756b225b383 100644 GIT binary patch delta 175 zcmZo++|M{cqMn7Bfq~)e-A6${N;JSH#5KPtH=^1xzQrxI&$oD`ckN#9_KUtA>!*kV z6)=_r`2{mLJiCzwFMGa!f`!0K|#pCvWU^sm646j@0y>&Y2gz|B00>RstlZA6QtbO*chyGnfkUp5u6Cr O#Ng@b=d#Wzp$Pz3Kp>w0 diff --git a/mods/horticulture/farming/textures/farming_mint_4.png b/mods/horticulture/farming/textures/farming_mint_4.png index 83c0e90161dc7ecf0ace3b46bb58831d8c8a1a89..a71a6e3394afc01f92f462e19d6b084a0eb0fdc4 100644 GIT binary patch delta 217 zcmV;~04D#g0qFsd7=Hu<0002(-QrRJ0016POjJbx003BfL0^PMWsXgvj;C{}OMSgd zhtW;S!OZFB>LT*=S^xk50d!JMQvg8b*k%9#0C`D7K~xCWEsRYH!Y~kpKNw8c)e9(I zV6Zf2=u!~kHXuW`1u-Y+rZ>oOorsIad%QoO0lR~(QkNAfR#NPcX%<>SJwP}1;*}cT z!;+j$a(sjpQ$gb=!|;0Q>`b`NsC--x_;~6i?abBvwCK37NA%J{aZy%#*_XU><=z|1D%Vsf?S~@d@B#U7;_+ILw zzCrk&MMg0oZIB}^kc8u#oLY)MW{Y8Oz)Z3<})T3=CE*W9nQP+<0Wm1s1kt9s(1kZXGya rY09(0#)Nr=(wfG`#H(B@3>h}fP)t-sApihD zLqSJLModmiQBzP^TUcOXUsQfQWtL2Dq(gP8NteZBtivzD(n8MA&C=gi(&0$e*VNqS zZ{OkG#3>+$sP|Ns9#lpwPJ0004WQchC|Ns9#?=0r`KoyK7L4Lsu4$p3+fjCLt?k)@+tg;?J&T>x|#}JO| zspky&4lD4m1}qN}Db2p3n9b_UH=$9EVNs8y!CS^lXEbC#_^?})F-~21|MX^^XtooP z3)!NtzFJh~y0%A4dGV6UvtFuYx6Z66+iA<-@mMYJ(YGxZT-Sb=E#zcS7gs)|%En!= zFX&a%?>m=1DeftL->G-f#7*yyi`i^p;d$cx^KQI|G+m#!$K$BR|H~I&}r%N`sHW0`20bQ zt4tNe?{|L{jk=ZnZMR|EtmR+3gTH*#{Moj5VMO6~_O|yyLjS9K?f@Oe;OXk;vd$@? F2>^&^V-o-X literal 0 HcmV?d00001 diff --git a/mods/horticulture/farming/textures/farming_water_glass.png b/mods/horticulture/farming/textures/farming_water_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..081f8d6e38845c5c09b4ada1682c936875ebac2a GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eKGJoWUlOY`r?E&Kn08?L4Lsu4$p3+0XYtyE{-7_*OLgqC{VK~_=+0)d-l+Y$5Adq07uBo|FvSG`vrAwDKyiGDIWCJ>+dN+4W+j1U0pjix_ Lu6{1-oD!M