diff --git a/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png b/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png index 7c559267..b5bd99c5 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png and b/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png b/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png index f121ec1b..7d840bdb 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png and b/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png b/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png index 5a996949..474ad058 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png and b/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png index c6824538..2f6464bf 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png index 186bb315..a075ba95 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png index 6ad36cea..90f5364a 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png index a7a7931e..94d00d2f 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png index 93d20304..9b6387f1 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png index 18b18794..35023547 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png index 51f791db..7595ebc9 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png index a3195f52..0b24730c 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png index b791ee9d..d9b7f439 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png index 2fccd04e..887c1839 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png and b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png index 51f791db..7595ebc9 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png and b/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png index 7653409b..040a3979 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png and b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png index 860f1809..c409bcba 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png and b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png index c73a6f4f..c870df48 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png and b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png index 29f0ee89..5b9291b1 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png and b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png b/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png index 20aa209b..761beb95 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png and b/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png b/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png index 0c581f1c..541200fc 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png and b/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png differ diff --git a/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png b/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png index 18b18794..35023547 100644 Binary files a/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png and b/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png index f0598514..bac3ee45 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png index 2009b503..c21edf6a 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png index e0f1ce69..120f100f 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png index cb3e2379..1c17bac3 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png index e7762bb8..af5de67c 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png index 55184a4e..8fb83323 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png and b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png index d0bc984e..594c9583 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png and b/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png index c38a51d2..e6de4829 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png and b/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png index 96a63224..ea685e3a 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png and b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png differ diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png index ac36abd3..7d6728f2 100644 Binary files a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png and b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png index c3ba887d..28fe91fe 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png index 08fbb66a..1d8a8e2c 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png index 58b92141..514b888b 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png index c02b7abf..5bb2b46f 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png index 2ab7ca35..5574f38f 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png index 81005e14..6ffd2f36 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png index c626a1fc..5bb9bf5b 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png index 146ff086..b204feff 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png index cf6f00a3..0c9b5af1 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png index ca1305c5..ca95dd3c 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png index 41f0fc13..d62499e8 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png and b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/blank.png b/mods/plantlife_modpack/bushes/textures/old & unused/blank.png index 06776a05..ed495a82 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/blank.png and b/mods/plantlife_modpack/bushes/textures/old & unused/blank.png differ diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png b/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png index af348538..57d077d0 100644 Binary files a/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png and b/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png differ diff --git a/mods/plantlife_modpack/bushes_classic/cooking.lua b/mods/plantlife_modpack/bushes_classic/cooking.lua index 34e4f167..3067b73e 100644 --- a/mods/plantlife_modpack/bushes_classic/cooking.lua +++ b/mods/plantlife_modpack/bushes_classic/cooking.lua @@ -1,12 +1,4 @@ --- Boilerplate to support localized strings if intllib mod is installed. -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end - +local S = plantslib.intllib -- Basket diff --git a/mods/plantlife_modpack/bushes_classic/init.lua b/mods/plantlife_modpack/bushes_classic/init.lua index 40eb9764..f06c50ca 100644 --- a/mods/plantlife_modpack/bushes_classic/init.lua +++ b/mods/plantlife_modpack/bushes_classic/init.lua @@ -2,14 +2,8 @@ -- now maintained by VanessaE -- -- License: WTFPL --- Boilerplate to support localized strings if intllib mod is installed. -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end + +local S = plantslib.intllib bushes_classic = {} diff --git a/mods/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj b/mods/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj new file mode 100644 index 00000000..0179c318 --- /dev/null +++ b/mods/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj @@ -0,0 +1,46 @@ +# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend' +# www.blender.org +o basket_Cube.001 +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v 0.500000 0.500000 0.500000 +v -0.437500 0.500000 0.437500 +v -0.437500 0.500000 -0.437500 +v 0.437500 0.500000 -0.437500 +v 0.437500 0.500000 0.437500 +v -0.437500 -0.437500 0.437500 +v -0.437500 -0.437500 -0.437500 +v 0.437500 -0.437500 -0.437500 +v 0.437500 -0.437500 0.437500 +vt 0.484848 0.984848 +vt 0.015152 0.984848 +vt 0.015152 0.515152 +vt 0.484848 0.515152 +vt 0.515152 0.984848 +vt 0.515152 0.515152 +vt 0.984848 0.515152 +vt 0.984848 0.984848 +vt 0.954545 0.545455 +vt 0.545455 0.545455 +vt 0.954545 0.954545 +vt 0.545455 0.954545 +s off +f 5/1 6/2 2/3 1/4 +f 6/1 7/2 3/3 2/4 +f 7/1 8/2 4/3 3/4 +f 8/1 5/2 1/3 4/4 +f 1/5 2/6 3/7 4/8 +f 5/6 8/7 12/9 9/10 +f 8/7 7/8 11/11 12/9 +f 7/8 6/5 10/12 11/11 +f 6/5 5/6 9/10 10/12 +f 9/1 12/2 16/3 13/4 +f 12/1 11/2 15/3 16/4 +f 11/1 10/2 14/3 15/4 +f 10/1 9/2 13/3 14/4 +f 13/10 16/9 15/11 14/12 diff --git a/mods/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj b/mods/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj new file mode 100644 index 00000000..5a3e1a81 --- /dev/null +++ b/mods/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj @@ -0,0 +1,330 @@ +# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend' +# www.blender.org +o pies_Cylinder +v -0.089468 -0.116804 -0.438000 +v -0.116691 -0.091480 -0.438000 +v 0.024696 0.005921 -0.404659 +v -0.002527 0.031245 -0.404659 +v 0.121480 0.109962 -0.309713 +v 0.094258 0.135286 -0.309713 +v 0.186149 0.179480 -0.167615 +v 0.158927 0.204804 -0.167615 +v 0.208858 0.203891 0.000000 +v 0.181635 0.229215 0.000000 +v 0.186149 0.179480 0.167615 +v 0.158927 0.204804 0.167615 +v 0.121480 0.109962 0.309713 +v 0.094258 0.135286 0.309713 +v 0.024696 0.005921 0.404659 +v -0.002527 0.031245 0.404659 +v -0.089468 -0.116804 0.438000 +v -0.116691 -0.091480 0.438000 +v -0.230856 -0.214204 0.404659 +v -0.327640 -0.318245 0.309713 +v -0.392309 -0.387763 0.167615 +v -0.415018 -0.412175 -0.000000 +v -0.392309 -0.387763 -0.167615 +v -0.327640 -0.318245 -0.309713 +v -0.230856 -0.214204 -0.404659 +v -0.135230 -0.074234 -0.383250 +v -0.035336 0.033150 -0.354077 +v 0.049350 0.124186 -0.270999 +v 0.105936 0.185014 -0.146663 +v 0.125806 0.206374 0.000000 +v 0.105936 0.185014 0.146663 +v 0.049350 0.124186 0.270999 +v -0.035336 0.033150 0.354077 +v -0.135230 -0.074234 0.383250 +v -0.235124 -0.181618 0.354077 +v -0.319810 -0.272654 0.270999 +v -0.376395 -0.333482 0.146663 +v -0.396266 -0.354842 -0.000000 +v -0.376395 -0.333482 -0.146664 +v -0.319810 -0.272654 -0.270999 +v -0.235124 -0.181618 -0.354077 +v 0.071215 -0.085999 -0.438000 +v 0.041377 -0.063816 -0.438000 +v 0.171221 0.048513 -0.404659 +v 0.141384 0.070697 -0.404659 +v 0.256002 0.162547 -0.309713 +v 0.226165 0.184731 -0.309713 +v 0.312652 0.238743 -0.167615 +v 0.282814 0.260926 -0.167615 +v 0.332544 0.265499 0.000000 +v 0.302707 0.287682 0.000000 +v 0.312652 0.238743 0.167615 +v 0.282814 0.260926 0.167615 +v 0.256002 0.162547 0.309713 +v 0.226165 0.184731 0.309713 +v 0.171221 0.048513 0.404659 +v 0.141383 0.070697 0.404659 +v 0.071215 -0.085999 0.438000 +v 0.041377 -0.063816 0.438000 +v -0.058629 -0.198328 0.404659 +v -0.058629 -0.198328 -0.404659 +v 0.021058 -0.048709 -0.383250 +v 0.108564 0.068989 -0.354077 +v 0.182747 0.168769 -0.270999 +v 0.232315 0.235440 -0.146663 +v 0.249721 0.258852 0.000000 +v 0.232315 0.235440 0.146663 +v 0.182747 0.168769 0.270999 +v 0.108564 0.068989 0.354077 +v 0.021058 -0.048709 0.383250 +v -0.066448 -0.166408 0.354077 +v -0.140632 -0.266188 0.270999 +v -0.190200 -0.332858 0.146663 +v -0.207605 -0.356270 -0.000000 +v -0.190199 -0.332858 -0.146664 +v -0.140631 -0.266188 -0.270999 +v -0.066448 -0.166408 -0.354077 +v 0.220377 -0.057101 -0.438000 +v 0.188086 -0.038671 -0.438000 +v 0.303465 0.088470 -0.404659 +v 0.271175 0.106901 -0.404659 +v 0.373905 0.211880 -0.309713 +v 0.341614 0.230311 -0.309713 +v 0.420971 0.294340 -0.167615 +v 0.388680 0.312771 -0.167615 +v 0.437498 0.323296 0.000000 +v 0.405208 0.341727 0.000000 +v 0.420971 0.294340 0.167615 +v 0.388680 0.312771 0.167615 +v 0.373905 0.211880 0.309713 +v 0.341614 0.230311 0.309713 +v 0.303465 0.088470 0.404659 +v 0.271175 0.106901 0.404659 +v 0.220377 -0.057101 0.438000 +v 0.188086 -0.038671 0.438000 +v 0.104997 -0.184242 0.404659 +v 0.104997 -0.184242 -0.404659 +v 0.166096 -0.026119 -0.383250 +v 0.238799 0.101256 -0.354077 +v 0.300433 0.209240 -0.270999 +v 0.341616 0.281392 -0.146663 +v 0.356078 0.306728 0.000000 +v 0.341616 0.281392 0.146664 +v 0.300433 0.209240 0.270999 +v 0.238799 0.101256 0.354077 +v 0.166096 -0.026119 0.383250 +v 0.093393 -0.153495 0.354077 +v 0.031759 -0.261478 0.270999 +v -0.009424 -0.333631 0.146663 +v -0.023885 -0.358967 -0.000000 +v -0.009424 -0.333631 -0.146664 +v 0.031759 -0.261478 -0.270999 +v 0.093394 -0.153495 -0.354077 +vt 0.000000 0.054054 +vt 0.000000 0.000000 +vt 0.062500 0.000000 +vt 0.062500 0.054054 +vt 0.125000 0.000000 +vt 0.125000 0.054054 +vt 0.187500 0.000000 +vt 0.187500 0.054054 +vt 0.250000 0.000000 +vt 0.250000 0.054054 +vt 0.312500 0.000000 +vt 0.312500 0.054054 +vt 0.375000 0.000000 +vt 0.375000 0.054054 +vt 0.437500 0.000000 +vt 0.437500 0.054054 +vt 0.500000 0.000000 +vt 0.500000 0.054054 +vt 0.055610 0.293778 +vt 0.110171 0.184656 +vt 0.123905 0.225763 +vt 0.076165 0.321244 +vt 0.316174 0.801264 +vt 0.253798 0.852938 +vt 0.186282 0.852938 +vt 0.123905 0.801264 +vt 0.076165 0.705782 +vt 0.050327 0.581029 +vt 0.050327 0.445997 +vt 0.186282 0.174088 +vt 0.253798 0.174089 +vt 0.316174 0.225763 +vt 0.363915 0.321245 +vt 0.389752 0.445997 +vt 0.389752 0.581029 +vt 0.363915 0.705782 +vt 0.384468 0.733249 +vt 0.329907 0.842371 +vt 0.055610 0.733249 +vt 0.026082 0.590674 +vt 0.384468 0.293778 +vt 0.413996 0.436353 +vt 0.258619 0.901428 +vt 0.181458 0.901428 +vt 0.181458 0.125599 +vt 0.258619 0.125599 +vt 0.026082 0.436353 +vt 0.413996 0.590674 +vt 0.110171 0.842371 +vt 0.329907 0.184656 +vt 0.076566 0.705251 +vt 0.050729 0.580498 +vt 0.050729 0.445466 +vt 0.076566 0.320713 +vt 0.124307 0.225232 +vt 0.186684 0.173557 +vt 0.254199 0.173557 +vt 0.316576 0.225232 +vt 0.364317 0.320713 +vt 0.390154 0.445466 +vt 0.390154 0.580498 +vt 0.364317 0.705251 +vt 0.316576 0.800732 +vt 0.254199 0.852407 +vt 0.186684 0.852407 +vt 0.124307 0.800732 +vt 0.110573 0.841838 +vt 0.056012 0.732716 +vt 0.330309 0.841838 +vt 0.259022 0.900894 +vt 0.026484 0.590141 +vt 0.026484 0.435819 +vt 0.414398 0.435819 +vt 0.414398 0.590141 +vt 0.181861 0.900894 +vt 0.384870 0.732716 +vt 0.384870 0.293245 +vt 0.389637 0.582094 +vt 0.363799 0.706847 +vt 0.316059 0.802329 +vt 0.253682 0.854003 +vt 0.186166 0.854003 +vt 0.123790 0.802329 +vt 0.076049 0.706847 +vt 0.050212 0.582094 +vt 0.050212 0.447062 +vt 0.076049 0.322309 +vt 0.123790 0.226828 +vt 0.186166 0.175153 +vt 0.253682 0.175153 +vt 0.316058 0.226828 +vt 0.363799 0.322310 +vt 0.389637 0.447062 +vt 0.413881 0.437419 +vt 0.413881 0.591741 +vt 0.258504 0.126666 +vt 0.329792 0.185722 +vt 0.384353 0.734315 +vt 0.329792 0.843437 +vt 0.055495 0.294844 +vt 0.110056 0.185722 +vt 0.384353 0.294844 +vt 0.181343 0.126666 +vt 0.025967 0.437419 +g pies_Cylinder_pie +s off +f 1/1 2/2 4/3 3/4 +f 3/4 4/3 6/5 5/6 +f 5/6 6/5 8/7 7/8 +f 7/8 8/7 10/9 9/10 +f 9/10 10/9 12/11 11/12 +f 11/12 12/11 14/13 13/14 +f 13/14 14/13 16/15 15/16 +f 15/16 16/15 18/17 17/18 +f 20/19 19/20 35/21 36/22 +f 27/23 26/24 41/25 40/26 39/27 38/28 37/29 36/22 35/21 34/30 33/31 32/32 31/33 30/34 29/35 28/36 +f 6/37 4/38 27/23 28/36 +f 23/39 22/40 38/28 39/27 +f 12/41 10/42 30/34 31/33 +f 2/43 25/44 41/25 26/24 +f 4/38 2/43 26/24 27/23 +f 18/45 16/46 33/31 34/30 +f 21/47 20/19 36/22 37/29 +f 8/48 6/37 28/36 29/35 +f 24/49 23/39 39/27 40/26 +f 14/50 12/41 31/33 32/32 +f 19/20 18/45 34/30 35/21 +f 22/40 21/47 37/29 38/28 +f 10/42 8/48 29/35 30/34 +f 25/44 24/49 40/26 41/25 +f 16/46 14/50 32/32 33/31 +f 42/1 43/2 45/3 44/4 +f 44/4 45/3 47/5 46/6 +f 46/6 47/5 49/7 48/8 +f 48/8 49/7 51/9 50/10 +f 50/10 51/9 53/11 52/12 +f 52/12 53/11 55/13 54/14 +f 54/14 55/13 57/15 56/16 +f 56/16 57/15 59/17 58/18 +f 63/51 62/52 77/53 76/54 75/55 74/56 73/57 72/58 71/59 70/60 69/61 68/62 67/63 66/64 65/65 64/66 +f 47/67 45/68 63/51 64/66 +f 53/69 51/70 66/64 67/63 +f 43/71 61/72 77/53 62/52 +f 45/68 43/71 62/52 63/51 +f 59/73 57/74 69/61 70/60 +f 49/75 47/67 64/66 65/65 +f 55/76 53/69 67/63 68/62 +f 60/77 59/73 70/60 71/59 +f 51/70 49/75 65/65 66/64 +f 57/74 55/76 68/62 69/61 +f 78/1 79/2 81/3 80/4 +f 80/4 81/3 83/5 82/6 +f 82/6 83/5 85/7 84/8 +f 84/8 85/7 87/9 86/10 +f 86/10 87/9 89/11 88/12 +f 88/12 89/11 91/13 90/14 +f 90/14 91/13 93/15 92/16 +f 92/16 93/15 95/17 94/18 +f 99/78 98/79 113/80 112/81 111/82 110/83 109/84 108/85 107/86 106/87 105/88 104/89 103/90 102/91 101/92 100/93 +f 83/94 81/95 99/78 100/93 +f 89/96 87/97 102/91 103/90 +f 79/98 97/99 113/80 98/79 +f 81/95 79/98 98/79 99/78 +f 95/100 93/101 105/88 106/87 +f 85/102 83/94 100/93 101/92 +f 91/103 89/96 103/90 104/89 +f 96/104 95/100 106/87 107/86 +f 87/97 85/102 101/92 102/91 +f 93/101 91/103 104/89 105/88 +o basket_Cube.001 +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v 0.500000 0.500000 0.500000 +v -0.437500 0.500000 0.437500 +v -0.437500 0.500000 -0.437500 +v 0.437500 0.500000 -0.437500 +v 0.437500 0.500000 0.437500 +v -0.437500 -0.437500 0.437500 +v -0.437500 -0.437500 -0.437500 +v 0.437500 -0.437500 -0.437500 +v 0.437500 -0.437500 0.437500 +vt 0.484848 0.984848 +vt 0.015152 0.984848 +vt 0.015152 0.515152 +vt 0.484848 0.515152 +vt 0.515152 0.984848 +vt 0.515152 0.515152 +vt 0.984848 0.515152 +vt 0.984848 0.984848 +vt 0.954545 0.545455 +vt 0.545455 0.545455 +vt 0.954545 0.954545 +vt 0.545455 0.954545 +g basket_Cube.001_basket +s off +f 118/105 119/106 115/107 114/108 +f 119/105 120/106 116/107 115/108 +f 120/105 121/106 117/107 116/108 +f 121/105 118/106 114/107 117/108 +f 114/109 115/110 116/111 117/112 +f 118/110 121/111 125/113 122/114 +f 121/111 120/112 124/115 125/113 +f 120/112 119/109 123/116 124/115 +f 119/109 118/110 122/114 123/116 +f 122/105 125/106 129/107 126/108 +f 125/105 124/106 128/107 129/108 +f 124/105 123/106 127/107 128/108 +f 123/105 122/106 126/107 127/108 +f 126/114 129/113 128/115 127/116 diff --git a/mods/plantlife_modpack/bushes_classic/models/bushes_bush.obj b/mods/plantlife_modpack/bushes_classic/models/bushes_bush.obj new file mode 100644 index 00000000..a69bfce4 --- /dev/null +++ b/mods/plantlife_modpack/bushes_classic/models/bushes_bush.obj @@ -0,0 +1,329 @@ +# Blender v2.73 (sub 0) OBJ File: 'bush.blend' +# www.blender.org +o nodebox-4 +v 0.467076 -0.122686 -0.190481 +v -0.453590 -0.119789 -0.192145 +v 0.420865 -0.181680 -0.171396 +v -0.429008 -0.188000 -0.182314 +v -0.450977 0.041977 -0.191409 +v -0.271687 -0.294075 -0.114977 +v -0.096925 -0.495759 -0.044091 +v -0.070286 -0.344209 -0.030750 +v -0.163971 -0.173437 -0.403793 +v -0.188139 -0.116431 0.446425 +v 0.069865 0.462329 0.170043 +v -0.175980 -0.180649 0.417932 +v -0.184276 0.039248 0.437271 +v -0.121692 -0.319322 0.290049 +v -0.039557 -0.495759 0.097032 +v -0.029307 -0.346230 0.070496 +v -0.440307 0.205163 -0.203598 +v -0.440281 0.206327 0.191785 +v -0.339366 0.327086 -0.144329 +v -0.267923 0.418413 0.108270 +v -0.264994 0.405691 -0.113216 +v 0.173823 0.186657 0.424935 +v -0.172109 0.470396 -0.073638 +v -0.090743 0.491063 -0.039539 +v -0.173625 0.180559 0.412022 +v 0.108534 0.404586 0.263698 +v -0.137870 0.317286 0.327397 +v 0.149454 0.342906 0.361857 +v -0.115069 0.426252 0.274637 +v 0.116858 -0.311812 0.284557 +v -0.074459 0.465500 0.178311 +v -0.036397 0.486640 0.094150 +v 0.044199 -0.495759 -0.101459 +v 0.034559 -0.377127 -0.079219 +v 0.116886 -0.299764 -0.276145 +v -0.172864 0.462259 0.069984 +v 0.173974 -0.178414 -0.411782 +v 0.191827 0.042411 -0.453422 +v 0.190055 -0.117435 -0.449613 +v -0.136929 0.321997 -0.339476 +v 0.101567 -0.495759 0.039664 +v 0.076778 -0.365788 0.030191 +v 0.292232 -0.320027 0.121743 +v -0.067752 0.451498 -0.167691 +v 0.433751 -0.189348 0.181586 +v 0.457624 0.044950 0.184732 +v 0.473778 -0.128221 0.198329 +v -0.113891 -0.307852 -0.282552 +v 0.081961 0.458662 -0.191580 +v 0.042947 0.491063 -0.093885 +v 0.109202 0.397842 -0.257691 +v 0.145450 0.328672 -0.343352 +v 0.191241 0.038411 0.444768 +v -0.184306 0.045052 -0.456452 +v -0.289997 -0.318897 0.117161 +v 0.182461 0.185982 -0.431178 +v 0.180190 0.469152 0.074510 +v 0.097292 0.491063 0.039804 +v 0.264954 0.412421 0.110505 +v 0.355939 0.336100 0.148277 +v -0.474575 0.042725 0.191924 +v -0.169486 0.185035 -0.418844 +v -0.445009 -0.118527 0.180804 +v 0.427054 0.187979 0.172057 +v 0.350926 0.339079 -0.143384 +v 0.189060 -0.125023 0.462241 +v 0.269270 -0.290650 -0.109472 +v 0.175816 -0.186803 0.429367 +v 0.259570 0.406980 -0.105942 +v -0.103158 0.398344 -0.255462 +v -0.339105 0.330270 0.137302 +v -0.186029 -0.123369 -0.460126 +v -0.418539 -0.180131 0.169838 +v 0.041492 0.491063 0.094145 +v 0.487251 0.041118 -0.191308 +v 0.173059 0.459504 -0.070716 +v 0.460259 0.206607 -0.196213 +v 0.108065 0.487446 -0.045199 +v -0.103423 0.491173 0.040772 +v -0.040665 0.496765 -0.107957 +v -0.070153 -0.343292 0.028053 +v -0.028215 -0.347521 -0.072596 +v 0.028031 -0.329368 0.067986 +v 0.075170 -0.358957 -0.031186 +v -0.037332 -0.495759 -0.099759 +v 0.099867 -0.495759 -0.041867 +v -0.095225 -0.495759 0.037440 +v 0.041974 -0.495759 0.095332 +v 0.001777 0.503796 -0.003546 +v 0.002321 -0.495758 -0.002214 +vt 0.875000 0.281250 +vt 1.000000 0.281250 +vt 1.000000 0.421875 +vt 0.875000 0.421875 +vt 0.375000 0.125000 +vt 0.500000 0.125000 +vt 0.500000 0.234375 +vt 0.375000 0.234375 +vt 0.625000 0.234375 +vt 0.625000 0.281250 +vt 0.500000 0.281250 +vt 0.500000 0.609375 +vt 0.500000 0.656250 +vt 0.375000 0.656250 +vt 0.375000 0.609375 +vt 0.625000 0.421875 +vt 0.500000 0.421875 +vt 0.375000 0.281250 +vt 0.375000 0.421875 +vt 0.125000 0.609375 +vt 0.125000 0.656250 +vt 0.000000 0.656250 +vt 0.000000 0.609375 +vt 0.846670 0.983596 +vt 0.823789 0.862038 +vt 0.861831 0.862038 +vt 0.500000 0.531250 +vt 0.375000 0.531250 +vt 0.234375 0.609375 +vt 0.234375 0.531250 +vt 0.875000 0.234375 +vt 0.750000 0.234375 +vt 0.750000 0.125000 +vt 0.875000 0.125000 +vt 0.125000 0.234375 +vt 0.125000 0.125000 +vt 0.234375 0.125000 +vt 0.234375 0.234375 +vt 0.125000 0.281250 +vt 0.234375 0.281250 +vt 0.234375 0.421875 +vt 0.125000 0.421875 +vt 0.125000 0.703125 +vt 0.000000 0.703125 +vt 0.875000 0.656250 +vt 0.750000 0.656250 +vt 0.750000 0.609375 +vt 0.875000 0.609375 +vt 0.625000 0.656250 +vt 0.625000 0.609375 +vt 0.234375 0.656250 +vt 0.375000 0.703125 +vt 0.234375 0.703125 +vt 0.125000 0.531250 +vt 0.875000 0.531250 +vt 1.000000 0.531250 +vt 1.000000 0.609375 +vt 0.500000 0.703125 +vt 0.000000 0.421875 +vt 0.000000 0.531250 +vt 0.875000 0.703125 +vt 0.750000 0.703125 +vt 0.328125 0.812500 +vt 0.328125 0.875000 +vt 0.265625 0.890625 +vt 0.265625 0.781250 +vt 0.750000 0.531250 +vt 1.000000 0.234375 +vt -0.000000 0.281250 +vt 0.000000 0.234375 +vt 0.375000 0.921875 +vt 0.328125 0.984375 +vt 0.562500 0.812500 +vt 0.500000 0.828125 +vt 0.625000 0.125000 +vt 0.625000 0.531250 +vt 0.970570 0.983596 +vt 0.918853 0.862038 +vt 0.983390 0.862038 +vt 1.000000 0.703125 +vt 1.000000 0.656250 +vt 0.694849 0.983596 +vt 0.653099 0.862038 +vt 0.703461 0.862038 +vt 0.453125 1.000000 +vt 0.437500 0.937500 +vt 0.546875 0.937500 +vt 0.375000 0.765625 +vt 0.625000 0.703125 +vt 0.750000 0.281250 +vt 0.000000 0.125000 +vt 0.781059 0.974219 +vt 0.740272 0.862038 +vt 0.773590 0.862038 +vt 0.823762 0.862067 +vt 0.773656 0.862066 +vt 0.800723 0.801332 +vt 0.750000 0.421875 +vt 1.000000 0.125000 +vt 0.881508 0.980225 +vt 0.923791 0.982865 +vt 0.819499 0.959318 +vt 0.634200 0.973424 +vt 0.659430 0.971277 +vt 0.724959 0.956989 +vt 0.755822 0.968617 +vt 0.125000 0.000000 +vt 0.234375 0.000000 +vt 0.375000 0.000000 +vt 0.500000 0.000000 +vt 0.750000 0.000000 +vt 0.875000 0.000000 +vt 1.000000 0.000000 +vt 0.625000 0.000000 +vt 0.000000 0.000000 +vt 0.618713 0.862038 +vt 0.453125 0.781250 +vt 0.484375 0.890625 +vt 0.406250 0.859375 +vt 0.738525 0.828462 +vt 0.741806 0.778103 +vt 0.777683 0.740596 +vt 0.827789 0.740597 +vt 0.862920 0.774201 +vt 0.859639 0.824560 +s off +f 63/1 10/2 13/3 61/4 +f 67/5 35/6 37/7 3/8 +f 9/9 72/10 39/11 37/7 +f 52/12 51/13 69/14 65/15 +f 72/10 54/16 38/17 39/11 +f 1/18 39/11 38/17 75/19 +f 28/20 26/21 29/22 27/23 +f 82/24 33/25 85/26 +f 75/19 38/17 56/27 77/28 +f 77/28 65/15 60/29 64/30 +f 73/31 4/32 6/33 55/34 +f 68/35 30/36 43/37 45/38 +f 66/39 47/40 46/41 53/42 +f 11/43 31/44 29/22 26/21 +f 20/45 21/46 19/47 71/48 +f 70/49 40/50 19/47 21/46 +f 59/51 69/14 76/52 57/53 +f 3/8 37/7 39/11 1/18 +f 28/20 22/54 64/30 60/29 +f 71/48 18/55 25/56 27/57 +f 69/14 51/13 49/58 76/52 +f 13/59 53/42 22/54 25/60 +f 36/61 23/62 21/46 20/45 +f 58/63 74/64 11/65 57/66 +f 57/53 11/43 26/21 59/51 +f 19/47 17/67 18/55 71/48 +f 73/31 12/68 10/2 63/1 +f 68/35 66/39 10/69 12/70 +f 74/64 32/71 31/72 11/65 +f 53/42 46/41 64/30 22/54 +f 25/56 18/55 61/4 13/3 +f 49/58 44/73 80/74 +f 45/38 3/8 1/18 47/40 +f 9/9 48/75 6/33 4/32 +f 62/76 40/50 52/12 56/27 +f 81/77 7/78 87/79 +f 31/80 36/61 20/45 29/81 +f 83/82 15/83 88/84 +f 36/85 79/86 23/87 +f 78/88 58/63 57/66 +f 17/67 19/47 40/50 62/76 +f 45/38 47/40 66/39 68/35 +f 51/13 70/49 44/89 49/58 +f 4/32 73/31 63/1 2/90 +f 12/70 14/91 30/36 68/35 +f 84/92 41/93 86/94 +f 33/95 86/96 90/97 +f 70/49 21/46 23/62 44/89 +f 54/16 62/76 56/27 38/17 +f 29/81 20/45 71/48 27/57 +f 37/7 35/6 48/75 9/9 +f 5/98 17/67 62/76 54/16 +f 18/55 17/67 5/98 61/4 +f 10/69 66/39 53/42 13/59 +f 12/68 73/31 55/34 14/99 +f 51/13 52/12 40/50 70/49 +f 27/23 25/60 22/54 28/20 +f 65/15 69/14 59/51 60/29 +f 56/27 52/12 65/15 77/28 +f 46/41 75/19 77/28 64/30 +f 60/29 59/51 26/21 28/20 +f 47/40 1/18 75/19 46/41 +f 2/90 5/98 54/16 72/10 +f 4/32 2/90 72/10 9/9 +f 43/37 67/5 3/8 45/38 +f 2/90 63/1 61/4 5/98 +f 82/100 7/78 8/101 +f 82/24 34/102 33/25 +f 81/103 15/83 16/104 +f 81/77 8/101 7/78 +f 83/82 41/93 42/105 +f 83/82 16/104 15/83 +f 84/92 33/25 34/102 +f 84/92 42/106 41/93 +f 30/36 83/107 42/108 43/37 +f 42/108 84/109 67/5 43/37 +f 67/5 84/109 34/110 35/6 +f 55/34 6/33 8/111 81/112 +f 55/34 81/112 16/113 14/99 +f 34/110 82/114 48/75 35/6 +f 48/75 82/114 8/111 6/33 +f 30/36 14/91 16/115 83/107 +f 7/78 82/100 85/26 +f 15/83 81/103 87/116 +f 41/93 83/82 88/84 +f 33/25 84/92 86/94 +f 80/74 50/117 49/58 +f 23/87 24/118 80/74 +f 80/74 44/73 23/87 +f 79/86 36/85 31/72 +f 79/86 24/118 23/87 +f 31/72 32/71 79/86 +f 78/88 49/58 50/117 +f 78/88 57/66 76/52 +f 76/52 49/58 78/88 +f 24/118 79/86 89/119 +f 79/86 32/71 89/119 +f 32/71 74/64 89/119 +f 74/64 58/63 89/119 +f 58/63 78/88 89/119 +f 78/88 50/117 89/119 +f 50/117 80/74 89/119 +f 80/74 24/118 89/119 +f 86/96 41/120 90/97 +f 41/120 88/121 90/97 +f 88/121 15/122 90/97 +f 15/122 87/123 90/97 +f 87/123 7/124 90/97 +f 7/124 85/125 90/97 +f 85/125 33/95 90/97 diff --git a/mods/plantlife_modpack/bushes_classic/nodes.lua b/mods/plantlife_modpack/bushes_classic/nodes.lua index caa886e5..d6872fa7 100644 --- a/mods/plantlife_modpack/bushes_classic/nodes.lua +++ b/mods/plantlife_modpack/bushes_classic/nodes.lua @@ -1,145 +1,142 @@ --- Boilerplate to support localized strings if intllib mod is installed. -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end - +local S = plantslib.intllib plantlife_bushes = {} -- TODO: add support for nodebreakers? those dig like mese picks -plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger) - if( not( digger ) or not( pos ) or not (oldnode )) then - return nil; +plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger) + if not (digger and pos and oldnode) then + return end -- find out which bush type we are dealing with - local bush_name = ""; - local can_harvest = false; + local bush_name = "" + local can_harvest = false - if( oldnode.name == 'bushes:fruitless_bush' ) then + if oldnode.name == "bushes:fruitless_bush" then -- this bush has not grown fruits yet (but will eventually) - bush_name = oldmetadata[ 'fields' ][ 'bush_type' ]; + bush_name = oldmetadata.fields.bush_type -- no fruits to be found, so can_harvest stays false else - local name_parts = oldnode.name:split( ":" ); - if( #name_parts >= 2 and name_parts[2]~=nil ) then + local name_parts = oldnode.name:split(":") + if #name_parts >= 2 and name_parts[2] ~= nil then - name_parts = name_parts[2]:split( "_" ); + name_parts = name_parts[2]:split("_") - if( #name_parts >= 2 and name_parts[1]~=nil ) then - bush_name = name_parts[1]; + if #name_parts >= 2 and name_parts[1] ~= nil then + bush_name = name_parts[1] -- this bush really carries fruits - can_harvest = true; + can_harvest = true end end end -- find out which tool the digger was wielding (if any) - local toolstack = digger:get_wielded_item(); - local capabilities = toolstack:get_tool_capabilities(); + local toolstack = digger:get_wielded_item() + local capabilities = toolstack:get_tool_capabilities() -- what the player will get - local harvested = ""; - local amount = ""; + local harvested -- failure to find out what the tool can do: destroy the bush and return nothing - if( not( capabilities["groupcaps"] )) then - return nil; + local groupcaps = capabilities.groupcaps + if not groupcaps then + return -- digging with the hand or something like that - elseif( capabilities["groupcaps"]["snappy"] ) then + elseif groupcaps.snappy then -- plant a new bush without fruits - minetest.set_node(pos,{type='node',name='bushes:fruitless_bush'}) - local meta = minetest.get_meta( pos ); - meta:set_string( 'bush_type', bush_name ); + minetest.set_node(pos, {type = "node", name = "bushes:fruitless_bush"}) + local meta = minetest.get_meta(pos) + meta:set_string('bush_type', bush_name) -- construct the stack of fruits the player will get -- only bushes that have grown fruits can actually give fruits - if( can_harvest == true ) then - amount = "4"; - harvested = "bushes:"..bush_name.." "..amount; + if can_harvest then + local amount = "4" + harvested = "bushes:" .. bush_name .. " " .. amount end -- something like a shovel - elseif( capabilities["groupcaps"]["crumbly"] ) then + elseif groupcaps.crumbly then -- with a chance of 1/3, return 2 bushes - if( math.random(1,3)==1 ) then - amount = "2"; + local amount + if math.random(1,3) == 1 then + amount = "2" else - amount = "1"; + amount = "1" end -- return the bush itself - harvested = "bushes:" .. bush_name .. "_bush "..amount; + harvested = "bushes:" .. bush_name .. "_bush "..amount -- something like an axe - elseif( capabilities["groupcaps"]["choppy"] ) then + elseif groupcaps.choppy then -- the amount of sticks may vary - amount = math.random( 4, 20 ); + local amount = math.random(4, 20) -- return some sticks - harvested = "default:stick "..amount; + harvested = "default:stick " .. amount -- nothing known - destroy the plant else - return nil; + return end -- give the harvested result to the player - if( harvested ~= "" ) then + if harvested then --minetest.chat_send_player("singleplayer","you would now get "..tostring( harvested ) ); - digger:get_inventory():add_item( "main", harvested ); + local itemstack = ItemStack(harvested) + local inventory = digger:get_inventory() + if inventory:room_for_item("main", itemstack) then + inventory:add_item("main", itemstack) + else + minetest.item_drop(itemstack, digger, pos) + end end end - - plantlife_bushes.after_place_node = function(pos, placer, itemstack) - if( not( itemstack ) or not( pos )) then - return nil; + if not (itemstack and pos) then + return end - local name_parts = itemstack:get_name():split( ":" ); - if( #name_parts <2 or name_parts[2]==nil ) then - return nil; + local name_parts = itemstack:get_name():split(":") + if #name_parts < 2 or name_parts[2] == nil then + return end - name_parts = name_parts[2]:split( "_" ); + name_parts = name_parts[2]:split("_") - if( #name_parts <2 or name_parts[1]==nil ) then - return nil; + if #name_parts < 2 or name_parts[1] == nil then + return end - minetest.set_node( pos, {type='node',name='bushes:fruitless_bush'}); - local meta = minetest.get_meta( pos ); - meta:set_string( 'bush_type', name_parts[1] ); - - return nil; + minetest.set_node(pos, {name = "bushes:fruitless_bush"}) + local meta = minetest.get_meta(pos) + meta:set_string("bush_type", name_parts[1]) end - - -- regrow berries (uses a base abm instead of plants_lib because of the use of metadata). minetest.register_abm({ - nodenames = { "bushes:fruitless_bush" }, + nodenames = {"bushes:fruitless_bush"}, + neighbors = {"group:soil", "group:potting_soil"}, interval = 500, chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta( pos ); - local bush_name = meta:get_string( 'bush_type' ); - if( bush_name ~= nil and bush_name ~= '' ) then - local dirtpos = { x = pos.x, y = pos.y-1, z = pos.z } + local meta = minetest.get_meta(pos) + local bush_name = meta:get_string("bush_type") + + if bush_name and bush_name ~= "" then + local dirtpos = {x = pos.x, y = pos.y-1, z = pos.z} local dirt = minetest.get_node(dirtpos) - if dirt.name == "farming:soil_wet" or math.random(1,3) == 1 then - minetest.set_node( pos, {type='node',name='bushes:'..bush_name..'_bush'}) + local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil") + + if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then + minetest.set_node( pos, {name = "bushes:" .. bush_name .. "_bush"}) end end end @@ -153,11 +150,13 @@ for i, bush_name in ipairs(bushes_classic.bushes) do minetest.register_node(":bushes:basket_"..bush_name, { description = S("Basket with "..desc.." Pies"), + drawtype = "mesh", + mesh = "bushes_basket_full.obj", tiles = { - "bushes_basket_"..bush_name.."_top.png", - "bushes_basket_bottom.png", - "bushes_basket_side.png" + "bushes_basket_pie_"..bush_name..".png", + "bushes_basket.png" }, + paramtype = "light", on_use = minetest.item_eat(18), groups = { dig_immediate = 3 }, }) @@ -177,35 +176,22 @@ for i, bush_name in ipairs(bushes_classic.bushes) do end minetest.register_node(":bushes:" .. bush_name .. "_bush", { - description = S(desc.." Bush"), - drawtype = "nodebox", - tiles = {texture_top, texture_bottom, "bushes_" .. bush_name .. "_bush.png"}, - inventory_image = "bushes_" .. bush_name .. "_bush.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - node_box = { - type = "fixed", - fixed = { - {-1/16, -8/16, -1/16, 1/16, -6/16, 1/16}, - {-4/16, -6/16, -4/16, 4/16, 5/16, 4/16}, - {-5/16, -5/16, -5/16, 5/16, 3/16, 5/16}, - {-6/16, -4/16, -6/16, 6/16, 2/16, 6/16}, - {-6.5/16, -3/16, -6.5/16, 6.5/16, -2/16, 6.5/16}, - {-3/16, 5/16, -3/16, 3/16, 6/16, 3/16}, - {-2/16, 5/16, -2/16, 2/16, 7/16, 2/16} - } - }, - - groups = groups, - sounds = default.node_sound_leaves_defaults(), - drop = "", - after_dig_node = function( pos, oldnode, oldmetadata, digger ) - return plantlife_bushes.after_dig_node(pos, oldnode, oldmetadata, digger); - end, - after_place_node = function( pos, placer, itemstack ) - return plantlife_bushes.after_place_node(pos, placer, itemstack); - end, + description = S(desc.." Bush"), + drawtype = "mesh", + mesh = "bushes_bush.obj", + tiles = {"bushes_bush_"..bush_name..".png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + groups = groups, + sounds = default.node_sound_leaves_defaults(), + drop = "", + after_dig_node = function( pos, oldnode, oldmetadata, digger ) + return plantlife_bushes.after_dig_node(pos, oldnode, oldmetadata, digger); + end, + after_place_node = function( pos, placer, itemstack ) + return plantlife_bushes.after_place_node(pos, placer, itemstack); + end, }) -- do not spawn fruitless bushes @@ -214,14 +200,12 @@ for i, bush_name in ipairs(bushes_classic.bushes) do end end - minetest.register_node(":bushes:basket_empty", { description = S("Basket"), - tiles = { - "bushes_basket_empty_top.png", - "bushes_basket_bottom.png", - "bushes_basket_side.png" - }, + drawtype = "mesh", + mesh = "bushes_basket_empty.obj", + tiles = { "bushes_basket.png" }, + paramtype = "light", groups = { dig_immediate = 3 }, }) diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket.png new file mode 100644 index 00000000..4384fba1 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png deleted file mode 100644 index f3fbe2bd..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png deleted file mode 100644 index cdedf351..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png deleted file mode 100644 index 5e8d40de..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png deleted file mode 100644 index 7b75e704..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png deleted file mode 100644 index be4cda4c..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png deleted file mode 100644 index 33cc552f..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png new file mode 100644 index 00000000..83ee63c0 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png new file mode 100644 index 00000000..9f9b2c6b Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png new file mode 100644 index 00000000..d6bdff4f Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png new file mode 100644 index 00000000..ff271ff9 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png new file mode 100644 index 00000000..3bfd42ff Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png new file mode 100644 index 00000000..c27b0b3a Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png deleted file mode 100644 index d06896b0..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png deleted file mode 100644 index e6ddc3f0..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png deleted file mode 100644 index cbbc7888..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png index 13cf3770..76b742bc 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png deleted file mode 100644 index 1b39ff63..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png index b52bd602..a6af5ca8 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png index 446e6838..c37f9872 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png index f2eb2081..90be80e1 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png index a5d22340..e15047fb 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png deleted file mode 100644 index 41f075f5..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png index 53851070..11ce60fa 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png index b8ea7095..6e8dd9e7 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png index 8e481b23..eb6bf5a6 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png new file mode 100644 index 00000000..fa76c616 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png new file mode 100644 index 00000000..3a305ca8 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png deleted file mode 100644 index 73056ea9..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png new file mode 100644 index 00000000..ffa2e0a7 Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png new file mode 100644 index 00000000..52eca60f Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png new file mode 100644 index 00000000..01809def Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png new file mode 100644 index 00000000..a5060e2f Binary files /dev/null and b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png deleted file mode 100644 index a972c0c0..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png deleted file mode 100644 index ae850eb9..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png deleted file mode 100644 index 7632894f..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png deleted file mode 100644 index e1fc6130..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png index cd62a5b0..e712cad9 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png deleted file mode 100644 index fd3fec47..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png index f96887d2..caa4e926 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png index 5e1239e9..baf5af78 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png index c2660a36..5cf2844e 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png index 19fbcefb..351a2697 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png index aa842c22..64869891 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png index 0568da41..8844c3d7 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png index 051c3c7d..034fd484 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png deleted file mode 100644 index a1be6486..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png index 0e4496c8..afeb7d87 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png index abe6d194..bb76a1d8 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png index 859e6ed9..a0944882 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png index fdf5d442..b6a74b63 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png deleted file mode 100644 index 7aa85cb3..00000000 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png and /dev/null differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png index e5224962..3d034ea1 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png index c71d45fd..932c0735 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png index a00a884e..f8d1d36c 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png differ diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png index 10ecf703..726196b4 100644 Binary files a/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png and b/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png differ diff --git a/mods/plantlife_modpack/cavestuff/models/cavestuff_pebble.obj b/mods/plantlife_modpack/cavestuff/models/cavestuff_pebble.obj new file mode 100644 index 00000000..243d1ce7 --- /dev/null +++ b/mods/plantlife_modpack/cavestuff/models/cavestuff_pebble.obj @@ -0,0 +1,279 @@ +# Blender v2.69 (sub 0) OBJ File: '' +# www.blender.org +mtllib cavestuff_pebble.mtl +o Icosphere.001_Icosphere.002 +v -0.000327 -0.410467 0.180121 +v -0.235610 -0.410468 0.155391 +v -0.284796 -0.410468 -0.076018 +v -0.121985 -0.209219 0.205980 +v -0.284738 -0.218753 0.040139 +v -0.201573 -0.219323 -0.168447 +v -0.100950 -0.116906 0.005837 +v -0.088586 -0.496875 -0.111804 +v -0.196648 -0.428134 -0.159917 +v -0.209011 -0.497294 -0.042276 +v -0.041805 -0.497429 0.108278 +v -0.180101 -0.487871 0.093742 +v -0.120956 -0.428134 0.196184 +v -0.288163 -0.428135 0.045629 +v -0.147553 -0.309844 -0.213938 +v -0.268157 -0.309844 -0.144718 +v -0.192465 -0.309844 0.211384 +v -0.054169 -0.309844 0.225920 +v -0.324717 -0.309844 -0.017682 +v -0.288965 -0.319377 0.114387 +v -0.023183 -0.210866 0.195570 +v -0.221888 -0.201086 0.143956 +v -0.275798 -0.233149 -0.072011 +v -0.160094 -0.150509 -0.096605 +v -0.113314 -0.150508 0.123477 +v -0.216653 -0.160042 0.030431 +v 0.073364 -0.397538 -0.267606 +v 0.268711 -0.397538 -0.091716 +v 0.161795 -0.397537 0.148424 +v 0.199614 -0.173928 -0.211396 +v 0.254265 -0.173928 0.045725 +v 0.026620 -0.195887 0.177156 +v -0.061812 -0.173929 -0.238874 +v 0.049992 -0.055394 -0.045225 +v 0.178551 -0.485125 -0.072552 +v 0.063729 -0.498396 -0.175936 +v 0.192289 -0.417167 -0.203264 +v -0.056339 -0.417167 -0.229396 +v -0.070077 -0.496109 -0.098684 +v 0.115708 -0.497252 0.068599 +v 0.244268 -0.417167 0.041273 +v 0.027763 -0.417167 0.166272 +v -0.001987 -0.285733 -0.289762 +v -0.109557 -0.285733 -0.245455 +v 0.258217 -0.285733 -0.165444 +v 0.151676 -0.285733 -0.273611 +v 0.235777 -0.285733 0.122059 +v 0.298622 -0.285733 -0.019093 +v 0.101971 -0.285733 0.199312 +v 0.072221 -0.154299 -0.256722 +v 0.258006 -0.154298 -0.089439 +v 0.156323 -0.154299 0.138946 +v 0.137937 -0.086893 -0.142897 +v -0.015725 -0.073070 -0.159049 +v 0.170060 -0.073069 0.008234 +v 0.036254 -0.095028 0.085487 +v -0.059660 -0.090744 -0.028814 +v -0.016904 -0.495185 -0.020480 +v -0.038530 -0.134593 0.104482 +v 0.018559 -0.297788 0.203363 +vt 0.999784 0.777888 +vt 0.781916 0.751069 +vt 0.930695 0.535842 +vt 0.718554 0.493678 +vt 0.498343 0.500066 +vt 0.612704 0.301958 +vt 0.278288 0.491767 +vt 0.136170 0.301428 +vt 0.385039 0.315647 +vt 0.861174 0.302958 +vt 0.817615 0.924676 +vt 0.662334 0.996212 +vt 0.719667 0.785775 +vt 0.955856 0.540882 +vt 0.919844 0.749017 +vt 0.810792 0.580191 +vt 0.698724 0.249779 +vt 0.882029 0.358101 +vt 0.648319 0.423681 +vt 0.738504 0.311189 +vt 0.859769 0.100574 +vt 0.955856 0.301223 +vt 0.603011 0.109855 +vt 0.889116 0.979094 +vt 0.625593 0.954685 +vt 0.572947 0.723101 +vt 0.629662 0.708272 +vt 0.361849 0.694965 +vt 0.626863 0.523494 +vt 0.877334 0.514944 +vt 0.753445 0.687054 +vt 0.678897 0.522004 +vt 0.804007 0.322784 +vt 0.508145 0.125975 +vt 0.614686 0.322544 +vt 0.274631 0.088482 +vt 0.046907 0.080882 +vt 0.724191 0.150589 +vt 0.955856 0.101994 +vt 0.459738 0.810380 +vt 0.524431 0.596612 +vt 0.614955 0.619521 +vt 0.385224 0.455707 +vt 0.518113 0.743431 +vt 0.397247 0.481913 +vt 0.473092 0.333636 +vt 0.593136 0.806842 +vt 0.542133 0.566645 +vt 0.245991 0.361941 +vt 0.291514 0.126530 +vt 0.515385 0.289890 +vt 0.348981 0.560141 +vt 0.480373 0.537386 +vt 0.705144 0.472239 +vt 0.601667 0.722403 +vt 0.283471 0.700220 +vt 0.061144 0.812481 +vt 0.120014 0.502516 +vt 0.080353 0.535703 +vt 0.356859 0.719702 +vt 0.417004 0.243099 +vt 0.001005 0.468262 +vt 0.186797 0.314823 +vt 0.187216 0.555587 +vt 0.094383 0.931756 +vt 0.003057 0.709324 +vt 0.238065 0.772821 +vt 0.569632 0.999536 +vt 0.323797 1.000000 +vt 0.482075 0.313011 +vt 0.735871 0.182001 +vt 0.032983 0.251846 +vt 0.574313 0.080491 +vt 0.318361 0.961238 +vt 0.229901 0.178033 +vt 0.256609 0.467686 +vt 0.464307 0.768933 +vt 0.865183 0.712997 +vt 0.725052 0.926500 +vt 0.093408 0.705147 +vt 0.230523 0.921209 +vt 0.968797 0.984796 +vt 0.210756 0.792236 +vt 0.477482 0.962103 +vt 0.256493 0.223509 +vt 0.000000 0.255402 +vt 0.543998 0.500902 +vt 0.362414 0.637562 +vt 0.469769 0.648982 +vt 0.379376 0.894841 +vt 0.246514 0.544201 +vt 0.117965 0.884444 +vt 0.047032 0.632888 +vt 0.079441 0.605161 +vt 0.000000 0.325670 +vt 0.241712 0.163133 +vt 0.470206 0.343559 +usemtl None +s off +f 2/1 13/2 17/3 +f 3/4 14/5 19/6 +f 2/7 17/8 20/9 +f 3/4 19/6 16/10 +f 4/11 21/12 25/13 +f 5/14 22/15 26/16 +f 6/17 23/18 24/19 +f 9/20 10/21 3/22 +f 9/20 8/23 10/21 +f 12/24 13/2 2/1 +f 12/24 11/25 13/2 +f 11/25 1/26 13/2 +f 10/27 14/5 3/4 +f 10/27 12/28 14/5 +f 12/28 2/7 14/5 +f 15/29 16/30 6/31 +f 15/29 9/20 16/30 +f 9/20 3/22 16/30 +f 17/3 18/32 4/33 +f 17/3 13/2 18/32 +f 13/2 1/26 18/32 +f 19/6 20/9 5/34 +f 19/6 14/5 20/9 +f 14/5 2/7 20/9 +f 18/32 21/35 4/33 +f 20/9 22/36 5/34 +f 20/9 17/8 22/36 +f 17/8 4/37 22/36 +f 16/10 23/38 6/39 +f 16/10 19/6 23/38 +f 19/6 5/34 23/38 +f 56/40 57/41 7/42 +f 57/41 54/43 24/19 +f 1/26 42/44 49/45 +f 38/46 9/20 15/29 +f 25/13 21/12 59/47 +f 15/29 6/31 44/48 +f 26/16 25/13 7/42 +f 26/16 22/15 25/13 +f 22/15 4/11 25/13 +f 24/19 26/16 7/42 +f 24/19 23/18 26/16 +f 23/18 5/14 26/16 +f 27/49 36/50 38/46 +f 32/51 21/35 49/45 +f 27/49 38/46 43/52 +f 28/53 37/54 45/55 +f 29/56 41/57 47/58 +f 1/26 11/25 42/44 +f 27/49 43/52 46/59 +f 28/53 45/55 48/60 +f 29/56 47/58 49/45 +f 6/17 24/19 33/61 +f 30/62 50/63 53/64 +f 31/65 51/66 55/67 +f 32/68 52/69 56/40 +f 35/70 37/54 28/53 +f 35/70 36/71 37/54 +f 36/50 27/49 37/72 +f 9/20 38/46 8/23 +f 38/46 36/50 39/73 +f 40/74 41/57 29/56 +f 40/75 35/70 41/76 +f 35/70 28/53 41/76 +f 44/48 38/46 15/29 +f 38/46 39/73 8/23 +f 40/74 29/56 42/44 +f 43/52 44/48 33/77 +f 43/52 38/46 44/48 +f 45/55 46/78 30/79 +f 45/55 37/54 46/78 +f 37/72 27/49 46/59 +f 47/80 48/60 31/81 +f 47/80 41/76 48/60 +f 41/76 28/53 48/60 +f 11/25 40/74 42/44 +f 42/44 29/56 49/45 +f 46/78 50/82 30/79 +f 46/59 43/52 50/83 +f 43/52 33/77 50/83 +f 48/60 51/84 31/81 +f 48/60 45/55 51/84 +f 45/55 30/79 51/84 +f 49/45 52/85 32/51 +f 49/45 47/58 52/85 +f 47/58 31/86 52/85 +f 18/32 1/26 60/87 +f 21/35 18/32 60/87 +f 6/31 33/77 44/48 +f 53/64 54/43 34/88 +f 53/64 50/63 54/43 +f 50/63 33/61 54/43 +f 55/67 53/64 34/88 +f 55/67 51/66 53/64 +f 51/66 30/62 53/64 +f 56/40 55/67 34/88 +f 56/40 52/69 55/67 +f 52/69 31/65 55/67 +f 57/41 56/40 34/88 +f 21/12 32/68 56/40 +f 25/13 59/47 7/42 +f 54/43 57/41 34/88 +f 7/42 57/41 24/19 +f 33/61 24/19 54/43 +f 11/89 12/90 58/91 +f 12/90 10/92 58/91 +f 10/92 8/93 58/91 +f 8/93 39/94 58/91 +f 39/94 36/95 58/91 +f 36/95 35/96 58/91 +f 35/96 40/97 58/91 +f 40/97 11/89 58/91 +f 21/12 56/40 59/47 +f 59/47 56/40 7/42 +f 1/26 49/45 60/87 +f 49/45 21/35 60/87 diff --git a/mods/plantlife_modpack/cavestuff/nodes.lua b/mods/plantlife_modpack/cavestuff/nodes.lua index 7327f702..dc537cf5 100644 --- a/mods/plantlife_modpack/cavestuff/nodes.lua +++ b/mods/plantlife_modpack/cavestuff/nodes.lua @@ -1,41 +1,20 @@ --Rocks +local cbox = { + type = "fixed", + fixed = {-5/16, -8/16, -6/16, 5/16, -1/32, 5/16}, +} + minetest.register_node("cavestuff:pebble_1",{ - drawtype = "nodebox", description = "Pebble", + drawtype = "mesh", + mesh = "cavestuff_pebble.obj", tiles = {"undergrowth_pebble.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=3, stone=1}, - node_box = { - type = "fixed", - fixed = { --- { left, bottom, front, right, top , back} - {-5/16, -2/16, -3/16, 1/16, -1/16, -1/16}, - {-4/16, -2/16, -4/16, 0 , -1/16, 0 }, --- { left, bottom, front, right, top , back} - {-7/16, -7/16, -3/16, -6/16, -3/16, 1/16}, - {-6/16, -7/16, -4/16, -5/16, -3/16, 2/16}, - {-5/16, -7/16, -5/16, 3/16, -3/16, 3/16}, - {-4/16, -7/16, -6/16, 1/16, -3/16, -5/16}, - {-3/16, -7/16, 3/16, 3/16, -3/16, 4/16}, - { 0 , -7/16, 4/16, 3/16, -3/16, 5/16}, - { 3/16, -7/16, -4/16, 4/16, -3/16, 5/16}, - { 4/16, -7/16, -3/16, 5/16, -3/16, 4/16}, - { 5/16, -7/16, -1/16, 6/16, -3/16, 2/16}, --- { left, bottom, front, right, top , back} - {-6/16, -8/16, -3/16, 3/16, -2/16, 0 }, - {-5/16, -8/16, -4/16, 2/16, -2/16, 1/16}, - {-4/16, -8/16, -5/16, 0 , -2/16, 2/16}, - {-2/16, -8/16, -2/16, 4/16, -2/16, 3/16}, - { 0 , -8/16, 3/16, 3/16, -2/16, 4/16}, - { 4/16, -8/16, -1/16, 5/16, -2/16, 2/16}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-7/16, -1/2, -6/16, 6/16, -1/16, 5/16}, - }, + selection_box = cbox, + collision_box = cbox, on_place = function(itemstack, placer, pointed_thing) -- place a random pebble node local stack = ItemStack("cavestuff:pebble_"..math.random(1,2)) @@ -46,80 +25,29 @@ minetest.register_node("cavestuff:pebble_1",{ }) minetest.register_node("cavestuff:pebble_2",{ - drawtype = "nodebox", + drawtype = "mesh", + mesh = "cavestuff_pebble.obj", + tiles = {"undergrowth_pebble.png"}, drop = "cavestuff:pebble_1", tiles = {"undergrowth_pebble.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=3, stone=1, not_in_creative_inventory=1}, - node_box = { - type = "fixed", - fixed = { --- { left, bottom, front, right, top , back} - {-5/16, -1/16, -3/16, 1/16, 0 , -1/16}, - {-4/16, -1/16, -4/16, 0 , 0 , 0 }, --- { left, bottom, front, right, top , back} - {-7/16, -7/16, -3/16, -6/16, -2/16, 1/16}, - {-6/16, -7/16, -4/16, -5/16, -2/16, 2/16}, - {-5/16, -7/16, -5/16, 3/16, -2/16, 3/16}, - {-4/16, -7/16, -6/16, 1/16, -2/16, -5/16}, - {-3/16, -7/16, 3/16, 3/16, -2/16, 4/16}, - { 0 , -7/16, 4/16, 3/16, -2/16, 5/16}, - { 3/16, -7/16, -4/16, 4/16, -2/16, 5/16}, - { 4/16, -7/16, -3/16, 5/16, -2/16, 4/16}, - { 5/16, -7/16, -1/16, 6/16, -2/16, 2/16}, --- { left, bottom, front, right, top , back} - {-6/16, -8/16, -3/16, 3/16, -1/16, 0 }, - {-5/16, -8/16, -4/16, 2/16, -1/16, 1/16}, - {-4/16, -8/16, -5/16, 0 , -1/16, 2/16}, - {-2/16, -8/16, -2/16, 4/16, -1/16, 3/16}, - { 0 , -8/16, 3/16, 3/16, -1/16, 4/16}, - { 4/16, -8/16, -1/16, 5/16, -1/16, 2/16}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-7/16, -1/2, -6/16, 6/16, 0, 5/16}, - }, + selection_box = cbox, + collision_box = cbox, sounds = default.node_sound_stone_defaults(), }) minetest.register_node("cavestuff:desert_pebble_1",{ - drawtype = "nodebox", description = "Desert Pebble", + drawtype = "mesh", + mesh = "cavestuff_pebble.obj", tiles = {"default_desert_stone.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=3, stone=1}, - node_box = { - type = "fixed", - fixed = { --- { left, bottom, front, right, top , back} - {-5/16, -2/16, -3/16, 1/16, -1/16, -1/16}, - {-4/16, -2/16, -4/16, 0 , -1/16, 0 }, --- { left, bottom, front, right, top , back} - {-7/16, -7/16, -3/16, -6/16, -3/16, 1/16}, - {-6/16, -7/16, -4/16, -5/16, -3/16, 2/16}, - {-5/16, -7/16, -5/16, 3/16, -3/16, 3/16}, - {-4/16, -7/16, -6/16, 1/16, -3/16, -5/16}, - {-3/16, -7/16, 3/16, 3/16, -3/16, 4/16}, - { 0 , -7/16, 4/16, 3/16, -3/16, 5/16}, - { 3/16, -7/16, -4/16, 4/16, -3/16, 5/16}, - { 4/16, -7/16, -3/16, 5/16, -3/16, 4/16}, - { 5/16, -7/16, -1/16, 6/16, -3/16, 2/16}, --- { left, bottom, front, right, top , back} - {-6/16, -8/16, -3/16, 3/16, -2/16, 0 }, - {-5/16, -8/16, -4/16, 2/16, -2/16, 1/16}, - {-4/16, -8/16, -5/16, 0 , -2/16, 2/16}, - {-2/16, -8/16, -2/16, 4/16, -2/16, 3/16}, - { 0 , -8/16, 3/16, 3/16, -2/16, 4/16}, - { 4/16, -8/16, -1/16, 5/16, -2/16, 2/16}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-7/16, -1/2, -6/16, 6/16, -1/16, 5/16}, - }, + selection_box = cbox, + collision_box = cbox, on_place = function(itemstack, placer, pointed_thing) -- place a random pebble node local stack = ItemStack("cavestuff:desert_pebble_"..math.random(1,2)) @@ -130,41 +58,15 @@ minetest.register_node("cavestuff:desert_pebble_1",{ }) minetest.register_node("cavestuff:desert_pebble_2",{ - drawtype = "nodebox", + drawtype = "mesh", + mesh = "cavestuff_pebble.obj", drop = "cavestuff:desert_pebble_1", tiles = {"default_desert_stone.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=3, stone=1, not_in_creative__inventory=1}, - node_box = { - type = "fixed", - fixed = { --- { left, bottom, front, right, top , back} - {-5/16, -1/16, -3/16, 1/16, 0 , -1/16}, - {-4/16, -1/16, -4/16, 0 , 0 , 0 }, --- { left, bottom, front, right, top , back} - {-7/16, -7/16, -3/16, -6/16, -2/16, 1/16}, - {-6/16, -7/16, -4/16, -5/16, -2/16, 2/16}, - {-5/16, -7/16, -5/16, 3/16, -2/16, 3/16}, - {-4/16, -7/16, -6/16, 1/16, -2/16, -5/16}, - {-3/16, -7/16, 3/16, 3/16, -2/16, 4/16}, - { 0 , -7/16, 4/16, 3/16, -2/16, 5/16}, - { 3/16, -7/16, -4/16, 4/16, -2/16, 5/16}, - { 4/16, -7/16, -3/16, 5/16, -2/16, 4/16}, - { 5/16, -7/16, -1/16, 6/16, -2/16, 2/16}, --- { left, bottom, front, right, top , back} - {-6/16, -8/16, -3/16, 3/16, -1/16, 0 }, - {-5/16, -8/16, -4/16, 2/16, -1/16, 1/16}, - {-4/16, -8/16, -5/16, 0 , -1/16, 2/16}, - {-2/16, -8/16, -2/16, 4/16, -1/16, 3/16}, - { 0 , -8/16, 3/16, 3/16, -1/16, 4/16}, - { 4/16, -8/16, -1/16, 5/16, -1/16, 2/16}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-7/16, -1/2, -6/16, 6/16, 0, 5/16}, - }, + selection_box = cbox, + collision_box = cbox, sounds = default.node_sound_stone_defaults(), }) diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png index f85dbbd8..966e9377 100644 Binary files a/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png and b/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png differ diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png index 507778da..306ca6a7 100644 Binary files a/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png and b/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png differ diff --git a/mods/plantlife_modpack/dryplants/crafting.lua b/mods/plantlife_modpack/dryplants/crafting.lua index ae36a3cb..69154b50 100644 --- a/mods/plantlife_modpack/dryplants/crafting.lua +++ b/mods/plantlife_modpack/dryplants/crafting.lua @@ -1,360 +1,360 @@ ------------------------------------------------------------------------------------------------ --- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt ------------------------------------------------------------------------------------------------ --- by Mossmanikin --- License (everything): WTFPL --- Looked at code from: darkage, default, farming, sickle, stairs --- Dependencies: default, farming --- Supports: flint, stoneage, sumpf ------------------------------------------------------------------------------------------------ - ------------------------------------------------------------------------------------------------ --- Short Grass ------------------------------------------------------------------------------------------------ -minetest.register_craft({ - output = "default:dirt", - recipe = { - {"dryplants:grass_short"}, - } -}) - ------------------------------------------------------------------------------------------------ --- Cut Grass ------------------------------------------------------------------------------------------------ --- grass recipes (remove roots) -minetest.register_craft({ - output = "dryplants:grass", - recipe = { - {"default:grass_1"}, - } -}) -minetest.register_craft({ - output = "dryplants:grass", - recipe = { - {"default:junglegrass"}, - } -}) -if minetest.get_modpath("sumpf") ~= nil then - minetest.register_craft({ - output = "dryplants:grass", - recipe = { - {"sumpf:gras"}, - } - }) -end - ------------------------------------------------------------------------------------------------ --- Sickle ------------------------------------------------------------------------------------------------ -minetest.register_craft({ - output = "dryplants:sickle", - recipe = { - {"group:stone",""}, - {"", "default:stick"}, - {"default:stick",""} - } -}) -if minetest.get_modpath("flint") ~= nil then - minetest.register_craft({ - output = "dryplants:sickle", - recipe = { - {"flint:flintstone",""}, - {"", "default:stick"}, - {"default:stick",""} - } - }) -end -if minetest.get_modpath("stoneage") ~= nil then - minetest.register_craft({ - output = "dryplants:sickle", - recipe = { - {"stoneage:silex",""}, - {"", "default:stick"}, - {"default:stick",""} - } - }) -end - ------------------------------------------------------------------------------------------------ --- Hay ------------------------------------------------------------------------------------------------ ---cooking -minetest.register_craft({ - type = "cooking", - output = "dryplants:hay", - recipe = "dryplants:grass", - cooktime = 2, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:hay", - burntime = 1, -}) - ------------------------------------------------------------------------------------------------ --- Wet Reed ------------------------------------------------------------------------------------------------ -minetest.register_craft({ -- papyrus -> wetreed - output = "dryplants:wetreed 2", - recipe = { - {"default:papyrus","default:papyrus"}, - {"default:papyrus","default:papyrus"}, - } -}) -minetest.register_craft({ -- reedmace_sapling -> wetreed - output = "dryplants:wetreed 2", - recipe = { - {"dryplants:reedmace_sapling","dryplants:reedmace_sapling"}, - {"dryplants:reedmace_sapling","dryplants:reedmace_sapling"}, - } -}) -minetest.register_craft({ -- reedmace_top -> wetreed - output = "dryplants:wetreed 2", - recipe = { - {"dryplants:reedmace_top","dryplants:reedmace_top"}, - {"dryplants:reedmace_top","dryplants:reedmace_top"}, - } -}) -minetest.register_craft({ -- reedmace -> wetreed - output = "dryplants:wetreed 2", - recipe = { - {"dryplants:reedmace","dryplants:reedmace"}, - {"dryplants:reedmace","dryplants:reedmace"}, - } -}) -minetest.register_craft({ -- reedmace_bottom -> wetreed - output = "dryplants:wetreed 2", - recipe = { - {"dryplants:reedmace_bottom","dryplants:reedmace_bottom"}, - {"dryplants:reedmace_bottom","dryplants:reedmace_bottom"}, - } -}) - - -local ReeD = { - {"wetreed"}, - {"reed"} -} -for i in pairs(ReeD) do - local reed = "dryplants:"..ReeD[i][1] - local slab = reed.."_slab" - local roof = reed.."_roof" - local corner = roof.."_corner" - local corner_2 = corner.."_2" ------------------------------------------------------------------------------------------------ --- Block ------------------------------------------------------------------------------------------------ - minetest.register_craft({ -- slab -> block - output = reed, - recipe = { - {slab}, - {slab}, - } - }) - minetest.register_craft({ -- roof -> block - output = reed, - recipe = { - {roof}, - {roof}, - } - }) - minetest.register_craft({ -- corner -> block - type = "shapeless", - output = reed.." 3", - recipe = {corner,corner,corner,corner,corner,corner,corner,corner}, -- 8x - }) - minetest.register_craft({ -- corner_2 -> block - type = "shapeless", - output = reed.." 3", - recipe = {corner_2,corner_2,corner_2,corner_2,corner_2,corner_2,corner_2,corner_2}, -- 8x - }) ------------------------------------------------------------------------------------------------ --- Slab ------------------------------------------------------------------------------------------------ - minetest.register_craft({ -- block -> slab - output = slab.." 6", - recipe = { - {reed,reed,reed}, - } - }) - minetest.register_craft({ -- roof -> slab - output = slab, - recipe = { - {roof}, - } - }) - minetest.register_craft({ -- corner -> slab - output = slab.." 3", - recipe = { - {corner,corner}, - {corner,corner}, - } - }) - minetest.register_craft({ -- corner_2 -> slab - output = slab.." 3", - recipe = { - {corner_2,corner_2}, - {corner_2,corner_2}, - } - }) ------------------------------------------------------------------------------------------------ --- Roof ------------------------------------------------------------------------------------------------ - minetest.register_craft({ -- block -> roof - output = roof.." 4", - recipe = { - {reed,""}, - {"",reed}, - } - }) - minetest.register_craft({ -- block -> roof - output = roof.." 4", - recipe = { - {"",reed}, - {reed,""}, - } - }) - minetest.register_craft({ -- slab -> roof - output = roof, - recipe = { - {slab}, - } - }) ------------------------------------------------------------------------------------------------ --- Roof Corner ------------------------------------------------------------------------------------------------ - minetest.register_craft({ -- block -> corner - output = corner.." 8", - recipe = { - {"",reed,""}, - {reed,"",reed}, - } - }) - minetest.register_craft({ -- corner_2 -> corner - output = corner, - recipe = { - {corner_2}, - } - }) ------------------------------------------------------------------------------------------------ --- Roof Corner 2 ------------------------------------------------------------------------------------------------ - minetest.register_craft({ -- block -> corner_2 - output = corner_2.." 8", - recipe = { - {reed,"",reed}, - {"",reed,""}, - } - }) - minetest.register_craft({ -- corner -> corner_2 - output = corner_2, - recipe = { - {corner}, - } - }) -end - ------------------------------------------------------------------------------------------------ --- Reed ------------------------------------------------------------------------------------------------ -minetest.register_craft({ -- hay -> reed - output = "dryplants:reed 2", - recipe = { - {"dryplants:hay","dryplants:hay"}, - {"dryplants:hay","dryplants:hay"}, - } -}) ---cooking -minetest.register_craft({ -- wetreed -> reed - type = "cooking", - output = "dryplants:reed", - recipe = "dryplants:wetreed", - cooktime = 2, -}) ---fuel -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:reed", - burntime = 4, -}) ------------------------------------------------------------------------------------------------ --- Reed Slab ------------------------------------------------------------------------------------------------ ---cooking -minetest.register_craft({ -- wetreed_slab -> reed_slab - type = "cooking", - output = "dryplants:reed_slab", - recipe = "dryplants:wetreed_slab", - cooktime = 1, -}) ---fuel -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:reed_slab", - burntime = 2, -}) ------------------------------------------------------------------------------------------------ --- Reed Roof ------------------------------------------------------------------------------------------------ ---cooking -minetest.register_craft({ -- wetreed_roof -> reed_roof - type = "cooking", - output = "dryplants:reed_roof", - recipe = "dryplants:wetreed_roof", - cooktime = 1, -}) ---fuel -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:reed_roof", - burntime = 2, -}) ------------------------------------------------------------------------------------------------ --- Reed Roof Corner ------------------------------------------------------------------------------------------------ ---cooking -minetest.register_craft({ -- wetreed_roof_corner -> reed_roof_corner - type = "cooking", - output = "dryplants:reed_roof_corner", - recipe = "dryplants:wetreed_roof_corner", - cooktime = 1, -}) ---fuel -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:reed_roof_corner", - burntime = 2, -}) ------------------------------------------------------------------------------------------------ --- Wet Reed Roof Corner 2 ------------------------------------------------------------------------------------------------ ---cooking -minetest.register_craft({ -- wetreed_roof_corner -> reed_roof_corner - type = "cooking", - output = "dryplants:reed_roof_corner_2", - recipe = "dryplants:wetreed_roof_corner_2", - cooktime = 1, -}) ---fuel -minetest.register_craft({ - type = "fuel", - recipe = "dryplants:reed_roof_corner_2", - burntime = 2, -}) ------------------------------------------------------------------------------------------------ --- Dandelion Leave ------------------------------------------------------------------------------------------------ ---[[minetest.register_craftitem("dryplants:dandelion_leave", { - description = "Dandelion Leave", - inventory_image = "dryplants_dandelion_leave.png", - on_use = minetest.item_eat(1), -}) -minetest.register_craft({ - type = "shapeless", - output = "dryplants:dandelion_leave 4", - recipe = {"flowers:dandelion_yellow"}, - replacements = { - {"flowers:dandelion_yellow", "dye:yellow"} - }, +----------------------------------------------------------------------------------------------- +-- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt +----------------------------------------------------------------------------------------------- +-- by Mossmanikin +-- License (everything): WTFPL +-- Looked at code from: darkage, default, farming, sickle, stairs +-- Dependencies: default, farming +-- Supports: flint, stoneage, sumpf +----------------------------------------------------------------------------------------------- + +----------------------------------------------------------------------------------------------- +-- Short Grass +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + output = "default:dirt", + recipe = { + {"dryplants:grass_short"}, + } +}) + +----------------------------------------------------------------------------------------------- +-- Cut Grass +----------------------------------------------------------------------------------------------- +-- grass recipes (remove roots) +minetest.register_craft({ + output = "dryplants:grass", + recipe = { + {"default:grass_1"}, + } +}) +minetest.register_craft({ + output = "dryplants:grass", + recipe = { + {"default:junglegrass"}, + } +}) +if minetest.get_modpath("sumpf") ~= nil then + minetest.register_craft({ + output = "dryplants:grass", + recipe = { + {"sumpf:gras"}, + } + }) +end + +----------------------------------------------------------------------------------------------- +-- Sickle +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + output = "dryplants:sickle", + recipe = { + {"group:stone",""}, + {"", "default:stick"}, + {"default:stick",""} + } +}) +if minetest.get_modpath("flint") ~= nil then + minetest.register_craft({ + output = "dryplants:sickle", + recipe = { + {"flint:flintstone",""}, + {"", "default:stick"}, + {"default:stick",""} + } + }) +end +if minetest.get_modpath("stoneage") ~= nil then + minetest.register_craft({ + output = "dryplants:sickle", + recipe = { + {"stoneage:silex",""}, + {"", "default:stick"}, + {"default:stick",""} + } + }) +end + +----------------------------------------------------------------------------------------------- +-- Hay +----------------------------------------------------------------------------------------------- +--cooking +minetest.register_craft({ + type = "cooking", + output = "dryplants:hay", + recipe = "dryplants:grass", + cooktime = 2, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:hay", + burntime = 1, +}) + +----------------------------------------------------------------------------------------------- +-- Wet Reed +----------------------------------------------------------------------------------------------- +minetest.register_craft({ -- papyrus -> wetreed + output = "dryplants:wetreed 2", + recipe = { + {"default:papyrus","default:papyrus"}, + {"default:papyrus","default:papyrus"}, + } +}) +minetest.register_craft({ -- reedmace_sapling -> wetreed + output = "dryplants:wetreed 2", + recipe = { + {"dryplants:reedmace_sapling","dryplants:reedmace_sapling"}, + {"dryplants:reedmace_sapling","dryplants:reedmace_sapling"}, + } +}) +minetest.register_craft({ -- reedmace_top -> wetreed + output = "dryplants:wetreed 2", + recipe = { + {"dryplants:reedmace_top","dryplants:reedmace_top"}, + {"dryplants:reedmace_top","dryplants:reedmace_top"}, + } +}) +minetest.register_craft({ -- reedmace -> wetreed + output = "dryplants:wetreed 2", + recipe = { + {"dryplants:reedmace","dryplants:reedmace"}, + {"dryplants:reedmace","dryplants:reedmace"}, + } +}) +minetest.register_craft({ -- reedmace_bottom -> wetreed + output = "dryplants:wetreed 2", + recipe = { + {"dryplants:reedmace_bottom","dryplants:reedmace_bottom"}, + {"dryplants:reedmace_bottom","dryplants:reedmace_bottom"}, + } +}) + + +local ReeD = { + {"wetreed"}, + {"reed"} +} +for i in pairs(ReeD) do + local reed = "dryplants:"..ReeD[i][1] + local slab = reed.."_slab" + local roof = reed.."_roof" + local corner = roof.."_corner" + local corner_2 = corner.."_2" +----------------------------------------------------------------------------------------------- +-- Block +----------------------------------------------------------------------------------------------- + minetest.register_craft({ -- slab -> block + output = reed, + recipe = { + {slab}, + {slab}, + } + }) + minetest.register_craft({ -- roof -> block + output = reed, + recipe = { + {roof}, + {roof}, + } + }) + minetest.register_craft({ -- corner -> block + type = "shapeless", + output = reed.." 3", + recipe = {corner,corner,corner,corner,corner,corner,corner,corner}, -- 8x + }) + minetest.register_craft({ -- corner_2 -> block + type = "shapeless", + output = reed.." 3", + recipe = {corner_2,corner_2,corner_2,corner_2,corner_2,corner_2,corner_2,corner_2}, -- 8x + }) +----------------------------------------------------------------------------------------------- +-- Slab +----------------------------------------------------------------------------------------------- + minetest.register_craft({ -- block -> slab + output = slab.." 6", + recipe = { + {reed,reed,reed}, + } + }) + minetest.register_craft({ -- roof -> slab + output = slab, + recipe = { + {roof}, + } + }) + minetest.register_craft({ -- corner -> slab + output = slab.." 3", + recipe = { + {corner,corner}, + {corner,corner}, + } + }) + minetest.register_craft({ -- corner_2 -> slab + output = slab.." 3", + recipe = { + {corner_2,corner_2}, + {corner_2,corner_2}, + } + }) +----------------------------------------------------------------------------------------------- +-- Roof +----------------------------------------------------------------------------------------------- + minetest.register_craft({ -- block -> roof + output = roof.." 4", + recipe = { + {reed,""}, + {"",reed}, + } + }) + minetest.register_craft({ -- block -> roof + output = roof.." 4", + recipe = { + {"",reed}, + {reed,""}, + } + }) + minetest.register_craft({ -- slab -> roof + output = roof, + recipe = { + {slab}, + } + }) +----------------------------------------------------------------------------------------------- +-- Roof Corner +----------------------------------------------------------------------------------------------- + minetest.register_craft({ -- block -> corner + output = corner.." 8", + recipe = { + {"",reed,""}, + {reed,"",reed}, + } + }) + minetest.register_craft({ -- corner_2 -> corner + output = corner, + recipe = { + {corner_2}, + } + }) +----------------------------------------------------------------------------------------------- +-- Roof Corner 2 +----------------------------------------------------------------------------------------------- + minetest.register_craft({ -- block -> corner_2 + output = corner_2.." 8", + recipe = { + {reed,"",reed}, + {"",reed,""}, + } + }) + minetest.register_craft({ -- corner -> corner_2 + output = corner_2, + recipe = { + {corner}, + } + }) +end + +----------------------------------------------------------------------------------------------- +-- Reed +----------------------------------------------------------------------------------------------- +minetest.register_craft({ -- hay -> reed + output = "dryplants:reed 2", + recipe = { + {"dryplants:hay","dryplants:hay"}, + {"dryplants:hay","dryplants:hay"}, + } +}) +--cooking +minetest.register_craft({ -- wetreed -> reed + type = "cooking", + output = "dryplants:reed", + recipe = "dryplants:wetreed", + cooktime = 2, +}) +--fuel +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:reed", + burntime = 4, +}) +----------------------------------------------------------------------------------------------- +-- Reed Slab +----------------------------------------------------------------------------------------------- +--cooking +minetest.register_craft({ -- wetreed_slab -> reed_slab + type = "cooking", + output = "dryplants:reed_slab", + recipe = "dryplants:wetreed_slab", + cooktime = 1, +}) +--fuel +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:reed_slab", + burntime = 2, +}) +----------------------------------------------------------------------------------------------- +-- Reed Roof +----------------------------------------------------------------------------------------------- +--cooking +minetest.register_craft({ -- wetreed_roof -> reed_roof + type = "cooking", + output = "dryplants:reed_roof", + recipe = "dryplants:wetreed_roof", + cooktime = 1, +}) +--fuel +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:reed_roof", + burntime = 2, +}) +----------------------------------------------------------------------------------------------- +-- Reed Roof Corner +----------------------------------------------------------------------------------------------- +--cooking +minetest.register_craft({ -- wetreed_roof_corner -> reed_roof_corner + type = "cooking", + output = "dryplants:reed_roof_corner", + recipe = "dryplants:wetreed_roof_corner", + cooktime = 1, +}) +--fuel +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:reed_roof_corner", + burntime = 2, +}) +----------------------------------------------------------------------------------------------- +-- Wet Reed Roof Corner 2 +----------------------------------------------------------------------------------------------- +--cooking +minetest.register_craft({ -- wetreed_roof_corner -> reed_roof_corner + type = "cooking", + output = "dryplants:reed_roof_corner_2", + recipe = "dryplants:wetreed_roof_corner_2", + cooktime = 1, +}) +--fuel +minetest.register_craft({ + type = "fuel", + recipe = "dryplants:reed_roof_corner_2", + burntime = 2, +}) +----------------------------------------------------------------------------------------------- +-- Dandelion Leave +----------------------------------------------------------------------------------------------- +--[[minetest.register_craftitem("dryplants:dandelion_leave", { + description = "Dandelion Leave", + inventory_image = "dryplants_dandelion_leave.png", + on_use = minetest.item_eat(1), +}) +minetest.register_craft({ + type = "shapeless", + output = "dryplants:dandelion_leave 4", + recipe = {"flowers:dandelion_yellow"}, + replacements = { + {"flowers:dandelion_yellow", "dye:yellow"} + }, })]] \ No newline at end of file diff --git a/mods/plantlife_modpack/dryplants/depends.txt b/mods/plantlife_modpack/dryplants/depends.txt index b5d046a9..5be68335 100644 --- a/mods/plantlife_modpack/dryplants/depends.txt +++ b/mods/plantlife_modpack/dryplants/depends.txt @@ -1,3 +1,3 @@ -default -plants_lib -farming? +default +plants_lib +farming? diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua index 954a840d..3c8b30ae 100644 --- a/mods/plantlife_modpack/dryplants/init.lua +++ b/mods/plantlife_modpack/dryplants/init.lua @@ -1,185 +1,185 @@ ------------------------------------------------------------------------------------------------ -local title = "Grasses" -- former "Dry plants" -local version = "0.1.5" -local mname = "dryplants" ------------------------------------------------------------------------------------------------ --- by Mossmanikin --- textures & ideas partly by Neuromancer - --- License (everything): WTFPL --- Contains code from: default, farming --- Looked at code from: darkage, sickle, stairs --- Dependencies: default, farming, plants_lib --- Supports: ------------------------------------------------------------------------------------------------ -abstract_dryplants = {} - -dofile(minetest.get_modpath("dryplants").."/crafting.lua") -dofile(minetest.get_modpath("dryplants").."/settings.txt") -dofile(minetest.get_modpath("dryplants").."/reed.lua") -if REEDMACE_GENERATES == true then -dofile(minetest.get_modpath("dryplants").."/reedmace.lua") -end -if SMALL_JUNCUS_GENERATES == true then -dofile(minetest.get_modpath("dryplants").."/juncus.lua") -end -if EXTRA_TALL_GRASS_GENERATES == true then -dofile(minetest.get_modpath("dryplants").."/moregrass.lua") -end ---dofile(minetest.get_modpath("dryplants").."/meadowvariation.lua") - ------------------------------------------------------------------------------------------------ --- Sickle ------------------------------------------------------------------------------------------------ --- turns nodes with group flora=1 & flower=0 into cut grass -local function sickle_on_use(itemstack, user, pointed_thing, uses) - local pt = pointed_thing - -- check if pointing at a node - if not pt then - return - end - if pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z} - local above = minetest.get_node(p) - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] then - return - end - if not minetest.registered_nodes[above.name] then - return - end - - local node = minetest.get_node(pt.under) - -- check if something that can be cut using fine tools - if minetest.get_item_group(under.name, "snappy") > 0 then - -- check if flora but no flower - if minetest.get_item_group(under.name, "flora") == 1 and minetest.get_item_group(under.name, "flower") == 0 then - -- turn the node into cut grass, wear out item and play sound - minetest.set_node(pt.under, {name="dryplants:grass"}) - else -- otherwise get the drop - local inv = user:get_inventory() - local name = minetest. get_node(pt.under).name - - local the_drop = minetest.registered_nodes[name].drop - - if the_drop ~= nil then - if inv:room_for_item("main", the_drop) then - inv:add_item("main", the_drop) - end - else - if inv:room_for_item("main", name) then - inv:add_item("main", name) - end - end - minetest.remove_node(pt.under) - end - minetest.sound_play("default_dig_crumbly", { - pos = pt.under, - gain = 0.5, - }) - itemstack:add_wear(65535/(uses-1)) - return itemstack - elseif string.find(node.name, "default:dirt_with_grass") then - minetest.set_node(pt.under, {name="dryplants:grass_short"}) - minetest.set_node(pt.above, {name="dryplants:grass"}) - minetest.sound_play("default_dig_crumbly", { - pos = pt.under, - gain = 0.5, - }) - itemstack:add_wear(65535/(uses-1)) - return itemstack - end -end --- the tool -minetest.register_tool("dryplants:sickle", { - description = "Sickle", - inventory_image = "dryplants_sickle.png", - on_use = function(itemstack, user, pointed_thing) - return sickle_on_use(itemstack, user, pointed_thing, 220) - end, -}) - ------------------------------------------------------------------------------------------------ --- Cut Grass ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:grass", { - description = "Cut Grass", - inventory_image = "dryplants_grass.png", - wield_image = "dryplants_grass.png", - paramtype = "light", - sunlight_propagates = true, - tiles = {"dryplants_grass.png"}, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Cut Grass becomes Hay over time ------------------------------------------------------------------------------------------------ -minetest.register_abm({ - nodenames = {"dryplants:grass"}, - interval = HAY_DRYING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle - chance = 1, - action = function(pos) - minetest.set_node(pos, {name="dryplants:hay"}) - end, -}) - ------------------------------------------------------------------------------------------------ --- Hay ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:hay", { - description = "Hay", - inventory_image = "dryplants_hay.png", - wield_image = "dryplants_hay.png", - paramtype = "light", - sunlight_propagates = true, - tiles = {"dryplants_hay.png"}, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Short Grass ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:grass_short", { - description = "Short Grass", - tiles = {"default_grass.png^dryplants_grass_short.png", "default_dirt.png", "default_dirt.png^default_grass_side.png^dryplants_grass_short_side.png"}, - is_ground_content = true, - groups = {crumbly=3,soil=1,not_in_creative_inventory=1}, - --drop = 'default:dirt', - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.4}, - }), -}) - ------------------------------------------------------------------------------------------------ --- Short Grass becomes Dirt with Grass over time ------------------------------------------------------------------------------------------------ -minetest.register_abm({ - nodenames = {"dryplants:grass_short"}, - interval = GRASS_REGROWING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle - chance = 100/GRASS_REGROWING_CHANCE, - action = function(pos) - minetest.set_node(pos, {name="default:dirt_with_grass"}) - end, -}) - ------------------------------------------------------------------------------------------------ -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ------------------------------------------------------------------------------------------------ +----------------------------------------------------------------------------------------------- +local title = "Grasses" -- former "Dry plants" +local version = "0.1.5" +local mname = "dryplants" +----------------------------------------------------------------------------------------------- +-- by Mossmanikin +-- textures & ideas partly by Neuromancer + +-- License (everything): WTFPL +-- Contains code from: default, farming +-- Looked at code from: darkage, sickle, stairs +-- Dependencies: default, farming, plants_lib +-- Supports: +----------------------------------------------------------------------------------------------- +abstract_dryplants = {} + +dofile(minetest.get_modpath("dryplants").."/crafting.lua") +dofile(minetest.get_modpath("dryplants").."/settings.txt") +dofile(minetest.get_modpath("dryplants").."/reed.lua") +if REEDMACE_GENERATES == true then +dofile(minetest.get_modpath("dryplants").."/reedmace.lua") +end +if SMALL_JUNCUS_GENERATES == true then +dofile(minetest.get_modpath("dryplants").."/juncus.lua") +end +if EXTRA_TALL_GRASS_GENERATES == true then +dofile(minetest.get_modpath("dryplants").."/moregrass.lua") +end +--dofile(minetest.get_modpath("dryplants").."/meadowvariation.lua") + +----------------------------------------------------------------------------------------------- +-- Sickle +----------------------------------------------------------------------------------------------- +-- turns nodes with group flora=1 & flower=0 into cut grass +local function sickle_on_use(itemstack, user, pointed_thing, uses) + local pt = pointed_thing + -- check if pointing at a node + if not pt then + return + end + if pt.type ~= "node" then + return + end + + local under = minetest.get_node(pt.under) + local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z} + local above = minetest.get_node(p) + + -- return if any of the nodes is not registered + if not minetest.registered_nodes[under.name] then + return + end + if not minetest.registered_nodes[above.name] then + return + end + + local node = minetest.get_node(pt.under) + -- check if something that can be cut using fine tools + if minetest.get_item_group(under.name, "snappy") > 0 then + -- check if flora but no flower + if minetest.get_item_group(under.name, "flora") == 1 and minetest.get_item_group(under.name, "flower") == 0 then + -- turn the node into cut grass, wear out item and play sound + minetest.set_node(pt.under, {name="dryplants:grass"}) + else -- otherwise get the drop + local inv = user:get_inventory() + local name = minetest. get_node(pt.under).name + + local the_drop = minetest.registered_nodes[name].drop + + if the_drop ~= nil then + if inv:room_for_item("main", the_drop) then + inv:add_item("main", the_drop) + end + else + if inv:room_for_item("main", name) then + inv:add_item("main", name) + end + end + minetest.remove_node(pt.under) + end + minetest.sound_play("default_dig_crumbly", { + pos = pt.under, + gain = 0.5, + }) + itemstack:add_wear(65535/(uses-1)) + return itemstack + elseif string.find(node.name, "default:dirt_with_grass") then + minetest.set_node(pt.under, {name="dryplants:grass_short"}) + minetest.set_node(pt.above, {name="dryplants:grass"}) + minetest.sound_play("default_dig_crumbly", { + pos = pt.under, + gain = 0.5, + }) + itemstack:add_wear(65535/(uses-1)) + return itemstack + end +end +-- the tool +minetest.register_tool("dryplants:sickle", { + description = "Sickle", + inventory_image = "dryplants_sickle.png", + on_use = function(itemstack, user, pointed_thing) + return sickle_on_use(itemstack, user, pointed_thing, 220) + end, +}) + +----------------------------------------------------------------------------------------------- +-- Cut Grass +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:grass", { + description = "Cut Grass", + inventory_image = "dryplants_grass.png", + wield_image = "dryplants_grass.png", + paramtype = "light", + sunlight_propagates = true, + tiles = {"dryplants_grass.png"}, + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Cut Grass becomes Hay over time +----------------------------------------------------------------------------------------------- +minetest.register_abm({ + nodenames = {"dryplants:grass"}, + interval = HAY_DRYING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle + chance = 1, + action = function(pos) + minetest.set_node(pos, {name="dryplants:hay"}) + end, +}) + +----------------------------------------------------------------------------------------------- +-- Hay +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:hay", { + description = "Hay", + inventory_image = "dryplants_hay.png", + wield_image = "dryplants_hay.png", + paramtype = "light", + sunlight_propagates = true, + tiles = {"dryplants_hay.png"}, + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Short Grass +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:grass_short", { + description = "Short Grass", + tiles = {"default_grass.png^dryplants_grass_short.png", "default_dirt.png", "default_dirt.png^default_grass_side.png^dryplants_grass_short_side.png"}, + is_ground_content = true, + groups = {crumbly=3,soil=1,not_in_creative_inventory=1}, + --drop = 'default:dirt', + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.4}, + }), +}) + +----------------------------------------------------------------------------------------------- +-- Short Grass becomes Dirt with Grass over time +----------------------------------------------------------------------------------------------- +minetest.register_abm({ + nodenames = {"dryplants:grass_short"}, + interval = GRASS_REGROWING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle + chance = 100/GRASS_REGROWING_CHANCE, + action = function(pos) + minetest.set_node(pos, {name="default:dirt_with_grass"}) + end, +}) + +----------------------------------------------------------------------------------------------- +print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/dryplants/moregrass.lua b/mods/plantlife_modpack/dryplants/moregrass.lua index d381e736..aec09b9e 100644 --- a/mods/plantlife_modpack/dryplants/moregrass.lua +++ b/mods/plantlife_modpack/dryplants/moregrass.lua @@ -1,33 +1,33 @@ ------------------------------------------------------------------------------------------------ --- Grasses - More Tall Grass 0.0.2 ------------------------------------------------------------------------------------------------ --- by Mossmanikin - --- License (everything): WTFPL --- Contains code from: plants_lib --- Looked at code from: default ------------------------------------------------------------------------------------------------ - -abstract_dryplants.grow_grass = function(pos) - local right_here = {x=pos.x, y=pos.y+1, z=pos.z} - local grass_size = math.random(1,5) - if minetest.get_node(right_here).name == "air" -- instead of check_air = true, - or minetest.get_node(right_here).name == "default:junglegrass" then - minetest.set_node(right_here, {name="default:grass_"..grass_size}) - end -end - -plantslib:register_generate_plant({ - surface = { - "default:dirt_with_grass", - "stoneage:grass_with_silex", - "sumpf:peat", - "sumpf:sumpf" - }, - max_count = TALL_GRASS_PER_MAPBLOCK, - rarity = 101 - TALL_GRASS_RARITY, - min_elevation = 1, -- above sea level - plantlife_limit = -0.9, - }, - abstract_dryplants.grow_grass -) +----------------------------------------------------------------------------------------------- +-- Grasses - More Tall Grass 0.0.2 +----------------------------------------------------------------------------------------------- +-- by Mossmanikin + +-- License (everything): WTFPL +-- Contains code from: plants_lib +-- Looked at code from: default +----------------------------------------------------------------------------------------------- + +abstract_dryplants.grow_grass = function(pos) + local right_here = {x=pos.x, y=pos.y+1, z=pos.z} + local grass_size = math.random(1,5) + if minetest.get_node(right_here).name == "air" -- instead of check_air = true, + or minetest.get_node(right_here).name == "default:junglegrass" then + minetest.set_node(right_here, {name="default:grass_"..grass_size}) + end +end + +plantslib:register_generate_plant({ + surface = { + "default:dirt_with_grass", + "stoneage:grass_with_silex", + "sumpf:peat", + "sumpf:sumpf" + }, + max_count = TALL_GRASS_PER_MAPBLOCK, + rarity = 101 - TALL_GRASS_RARITY, + min_elevation = 1, -- above sea level + plantlife_limit = -0.9, + }, + abstract_dryplants.grow_grass +) diff --git a/mods/plantlife_modpack/dryplants/reed.lua b/mods/plantlife_modpack/dryplants/reed.lua index 51dc8dd1..6f290285 100644 --- a/mods/plantlife_modpack/dryplants/reed.lua +++ b/mods/plantlife_modpack/dryplants/reed.lua @@ -1,380 +1,380 @@ ------------------------------------------------------------------------------------------------ --- Dry Plants - Reed 0.0.5 ------------------------------------------------------------------------------------------------ --- by Mossmanikin --- License (everything): WTFPL --- Looked at code from: darkage, default, stairs --- Dependencies: default ------------------------------------------------------------------------------------------------ -minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") -minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") -minetest.register_alias("stairs:stair_reed", "dryplants:reed_roof") -minetest.register_alias("stairs:slab_reed", "dryplants:reed_slab") - - ------------------------------------------------------------------------------------------------ --- Wet Reed ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:wetreed", { - description = "Wet Reed", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed_wet.png"}, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Wet Reed Slab ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:wetreed_slab", { - description = "Wet Reed Slab", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed_wet.png"}, - node_box = { - type = "fixed", - fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, - }, - selection_box = { - type = "fixed", - fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Wet Reed Roof ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:wetreed_roof", { - description = "Wet Reed Roof", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed_wet.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, -1/2, -1/2, 1/2, 0, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, -1/2, -1/2, 1/2, 0, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - -if AUTO_ROOF_CORNER == true then - - local CoRNeR = { --- MaTeRiaL - {"wetreed"}, - {"reed"} - } - - for i in pairs(CoRNeR) do - - local MaTeRiaL = CoRNeR[i][1] - local roof = "dryplants:"..MaTeRiaL.."_roof" - local corner = "dryplants:"..MaTeRiaL.."_roof_corner" - local corner_2 = "dryplants:"..MaTeRiaL.."_roof_corner_2" - - minetest.register_abm({ - nodenames = {roof}, - interval = 1, - chance = 1, - action = function(pos) - - local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) - local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) - local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) - local node_south = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1}) - -- corner 1 - if ((node_west.name == roof and node_west.param2 == 0) - or (node_west.name == corner and node_west.param2 == 1)) - and ((node_north.name == roof and node_north.param2 == 3) - or (node_north.name == corner and node_north.param2 == 3)) - then - minetest.set_node(pos, {name=corner, param2=0}) - end - - if ((node_north.name == roof and node_north.param2 == 1) - or (node_north.name == corner and node_north.param2 == 2)) - and ((node_east.name == roof and node_east.param2 == 0) - or (node_east.name == corner and node_east.param2 == 0)) - then - minetest.set_node(pos, {name=corner, param2=1}) - end - - if ((node_east.name == roof and node_east.param2 == 2) - or (node_east.name == corner and node_east.param2 == 3)) - and ((node_south.name == roof and node_south.param2 == 1) - or (node_south.name == corner and node_south.param2 == 1)) - then - minetest.set_node(pos, {name=corner, param2=2}) - end - - if ((node_south.name == roof and node_south.param2 == 3) - or (node_south.name == corner and node_south.param2 == 0)) - and ((node_west.name == roof and node_west.param2 == 2) - or (node_west.name == corner and node_west.param2 == 2)) - then - minetest.set_node(pos, {name=corner, param2=3}) - end - -- corner 2 - if ((node_west.name == roof and node_west.param2 == 2) - or (node_west.name == corner_2 and node_west.param2 == 1)) - and ((node_north.name == roof and node_north.param2 == 1) - or (node_north.name == corner_2 and node_north.param2 == 3)) - then - minetest.set_node(pos, {name=corner_2, param2=0}) - end - - if ((node_north.name == roof and node_north.param2 == 3) - or (node_north.name == corner_2 and node_north.param2 == 2)) - and ((node_east.name == roof and node_east.param2 == 2) - or (node_east.name == corner_2 and node_east.param2 == 0)) - then - minetest.set_node(pos, {name=corner_2, param2=1}) - end - - if ((node_east.name == roof and node_east.param2 == 0) - or (node_east.name == corner_2 and node_east.param2 == 3)) - and ((node_south.name == roof and node_south.param2 == 3) - or (node_south.name == corner_2 and node_south.param2 == 1)) - then - minetest.set_node(pos, {name=corner_2, param2=2}) - end - - if ((node_south.name == roof and node_south.param2 == 1) - or (node_south.name == corner_2 and node_south.param2 == 0)) - and ((node_west.name == roof and node_west.param2 == 0) - or (node_west.name == corner_2 and node_west.param2 == 2)) - then - minetest.set_node(pos, {name=corner_2, param2=3}) - end - - end, - }) - end -end - ------------------------------------------------------------------------------------------------ --- Wet Reed Roof Corner ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:wetreed_roof_corner", { - description = "Wet Reed Roof Corner", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed_wet.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, 0, 0, 0, 1/2, 1/2}, - {0, -1/2, 0, 1/2, 0, 1/2}, - {-1/2, -1/2, -1/2, 0, 0, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, 0, 0, 0, 1/2, 1/2}, - {0, -1/2, 0, 1/2, 0, 1/2}, - {-1/2, -1/2, -1/2, 0, 0, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Wet Reed Roof Corner 2 ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:wetreed_roof_corner_2", { - description = "Wet Reed Roof Corner 2", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed_wet.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, -1/2, 0, 0, 0, 1/2}, - {0, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, 0, -1/2, 0, 1/2, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, -1/2, 0, 0, 0, 1/2}, - {0, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, 0, -1/2, 0, 1/2, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Wet Reed becomes (dry) Reed over time ------------------------------------------------------------------------------------------------ -if REED_WILL_DRY == true then - - local DRyiNG = { --- WeT DRy - {"dryplants:wetreed", "dryplants:reed"}, - {"dryplants:wetreed_slab", "dryplants:reed_slab"}, - {"dryplants:wetreed_roof", "dryplants:reed_roof"}, - {"dryplants:wetreed_roof_corner", "dryplants:reed_roof_corner"}, - {"dryplants:wetreed_roof_corner_2", "dryplants:reed_roof_corner_2"} - } - for i in pairs(DRyiNG) do - - local WeT = DRyiNG[i][1] - local DRy = DRyiNG[i][2] - - minetest.register_abm({ - nodenames = {WeT}, - interval = REED_DRYING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle - chance = 1, - action = function(pos) - local direction = minetest.get_node(pos).param2 - minetest.set_node(pos, {name=DRy, param2=direction}) - end, - }) - end -end - ------------------------------------------------------------------------------------------------ --- Reed ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:reed", { - description = "Reed", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed.png"}, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Reed Slab ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:reed_slab", { - description = "Reed Slab", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed.png"}, - node_box = { - type = "fixed", - fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, - }, - selection_box = { - type = "fixed", - fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Reed Roof ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:reed_roof", { - description = "Reed Roof", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, -1/2, -1/2, 1/2, 0, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, -1/2, -1/2, 1/2, 0, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Reed Roof Corner ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:reed_roof_corner", { - description = "Reed Roof Corner", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, 0, 0, 0, 1/2, 1/2}, - {0, -1/2, 0, 1/2, 0, 1/2}, - {-1/2, -1/2, -1/2, 0, 0, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, 0, 0, 0, 1/2, 1/2}, - {0, -1/2, 0, 1/2, 0, 1/2}, - {-1/2, -1/2, -1/2, 0, 0, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) - ------------------------------------------------------------------------------------------------ --- Reed Roof Corner 2 ------------------------------------------------------------------------------------------------ -minetest.register_node("dryplants:reed_roof_corner_2", { - description = "Reed Roof Corner 2", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - tiles = {"dryplants_reed.png"}, - node_box = { - type = "fixed", --- { left , bottom , front , right , top , back } - fixed = { - {-1/2, -1/2, 0, 0, 0, 1/2}, - {0, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, 0, -1/2, 0, 1/2, 0}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/2, -1/2, 0, 0, 0, 1/2}, - {0, 0, 0, 1/2, 1/2, 1/2}, - {-1/2, 0, -1/2, 0, 1/2, 0}, - } - }, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) +----------------------------------------------------------------------------------------------- +-- Dry Plants - Reed 0.0.5 +----------------------------------------------------------------------------------------------- +-- by Mossmanikin +-- License (everything): WTFPL +-- Looked at code from: darkage, default, stairs +-- Dependencies: default +----------------------------------------------------------------------------------------------- +minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") +minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") +minetest.register_alias("stairs:stair_reed", "dryplants:reed_roof") +minetest.register_alias("stairs:slab_reed", "dryplants:reed_slab") + + +----------------------------------------------------------------------------------------------- +-- Wet Reed +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:wetreed", { + description = "Wet Reed", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed_wet.png"}, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Wet Reed Slab +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:wetreed_slab", { + description = "Wet Reed Slab", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed_wet.png"}, + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Wet Reed Roof +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:wetreed_roof", { + description = "Wet Reed Roof", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed_wet.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, -1/2, -1/2, 1/2, 0, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, -1/2, -1/2, 1/2, 0, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +if AUTO_ROOF_CORNER == true then + + local CoRNeR = { +-- MaTeRiaL + {"wetreed"}, + {"reed"} + } + + for i in pairs(CoRNeR) do + + local MaTeRiaL = CoRNeR[i][1] + local roof = "dryplants:"..MaTeRiaL.."_roof" + local corner = "dryplants:"..MaTeRiaL.."_roof_corner" + local corner_2 = "dryplants:"..MaTeRiaL.."_roof_corner_2" + + minetest.register_abm({ + nodenames = {roof}, + interval = 1, + chance = 1, + action = function(pos) + + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) + local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) + local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) + local node_south = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1}) + -- corner 1 + if ((node_west.name == roof and node_west.param2 == 0) + or (node_west.name == corner and node_west.param2 == 1)) + and ((node_north.name == roof and node_north.param2 == 3) + or (node_north.name == corner and node_north.param2 == 3)) + then + minetest.set_node(pos, {name=corner, param2=0}) + end + + if ((node_north.name == roof and node_north.param2 == 1) + or (node_north.name == corner and node_north.param2 == 2)) + and ((node_east.name == roof and node_east.param2 == 0) + or (node_east.name == corner and node_east.param2 == 0)) + then + minetest.set_node(pos, {name=corner, param2=1}) + end + + if ((node_east.name == roof and node_east.param2 == 2) + or (node_east.name == corner and node_east.param2 == 3)) + and ((node_south.name == roof and node_south.param2 == 1) + or (node_south.name == corner and node_south.param2 == 1)) + then + minetest.set_node(pos, {name=corner, param2=2}) + end + + if ((node_south.name == roof and node_south.param2 == 3) + or (node_south.name == corner and node_south.param2 == 0)) + and ((node_west.name == roof and node_west.param2 == 2) + or (node_west.name == corner and node_west.param2 == 2)) + then + minetest.set_node(pos, {name=corner, param2=3}) + end + -- corner 2 + if ((node_west.name == roof and node_west.param2 == 2) + or (node_west.name == corner_2 and node_west.param2 == 1)) + and ((node_north.name == roof and node_north.param2 == 1) + or (node_north.name == corner_2 and node_north.param2 == 3)) + then + minetest.set_node(pos, {name=corner_2, param2=0}) + end + + if ((node_north.name == roof and node_north.param2 == 3) + or (node_north.name == corner_2 and node_north.param2 == 2)) + and ((node_east.name == roof and node_east.param2 == 2) + or (node_east.name == corner_2 and node_east.param2 == 0)) + then + minetest.set_node(pos, {name=corner_2, param2=1}) + end + + if ((node_east.name == roof and node_east.param2 == 0) + or (node_east.name == corner_2 and node_east.param2 == 3)) + and ((node_south.name == roof and node_south.param2 == 3) + or (node_south.name == corner_2 and node_south.param2 == 1)) + then + minetest.set_node(pos, {name=corner_2, param2=2}) + end + + if ((node_south.name == roof and node_south.param2 == 1) + or (node_south.name == corner_2 and node_south.param2 == 0)) + and ((node_west.name == roof and node_west.param2 == 0) + or (node_west.name == corner_2 and node_west.param2 == 2)) + then + minetest.set_node(pos, {name=corner_2, param2=3}) + end + + end, + }) + end +end + +----------------------------------------------------------------------------------------------- +-- Wet Reed Roof Corner +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:wetreed_roof_corner", { + description = "Wet Reed Roof Corner", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed_wet.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, 0, 0, 0, 1/2, 1/2}, + {0, -1/2, 0, 1/2, 0, 1/2}, + {-1/2, -1/2, -1/2, 0, 0, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, 0, 0, 0, 1/2, 1/2}, + {0, -1/2, 0, 1/2, 0, 1/2}, + {-1/2, -1/2, -1/2, 0, 0, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Wet Reed Roof Corner 2 +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:wetreed_roof_corner_2", { + description = "Wet Reed Roof Corner 2", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed_wet.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, -1/2, 0, 0, 0, 1/2}, + {0, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, 0, -1/2, 0, 1/2, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, -1/2, 0, 0, 0, 1/2}, + {0, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, 0, -1/2, 0, 1/2, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Wet Reed becomes (dry) Reed over time +----------------------------------------------------------------------------------------------- +if REED_WILL_DRY == true then + + local DRyiNG = { +-- WeT DRy + {"dryplants:wetreed", "dryplants:reed"}, + {"dryplants:wetreed_slab", "dryplants:reed_slab"}, + {"dryplants:wetreed_roof", "dryplants:reed_roof"}, + {"dryplants:wetreed_roof_corner", "dryplants:reed_roof_corner"}, + {"dryplants:wetreed_roof_corner_2", "dryplants:reed_roof_corner_2"} + } + for i in pairs(DRyiNG) do + + local WeT = DRyiNG[i][1] + local DRy = DRyiNG[i][2] + + minetest.register_abm({ + nodenames = {WeT}, + interval = REED_DRYING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle + chance = 1, + action = function(pos) + local direction = minetest.get_node(pos).param2 + minetest.set_node(pos, {name=DRy, param2=direction}) + end, + }) + end +end + +----------------------------------------------------------------------------------------------- +-- Reed +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:reed", { + description = "Reed", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed.png"}, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Reed Slab +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:reed_slab", { + description = "Reed Slab", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed.png"}, + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Reed Roof +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:reed_roof", { + description = "Reed Roof", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, -1/2, -1/2, 1/2, 0, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, -1/2, -1/2, 1/2, 0, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Reed Roof Corner +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:reed_roof_corner", { + description = "Reed Roof Corner", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, 0, 0, 0, 1/2, 1/2}, + {0, -1/2, 0, 1/2, 0, 1/2}, + {-1/2, -1/2, -1/2, 0, 0, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, 0, 0, 0, 1/2, 1/2}, + {0, -1/2, 0, 1/2, 0, 1/2}, + {-1/2, -1/2, -1/2, 0, 0, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +----------------------------------------------------------------------------------------------- +-- Reed Roof Corner 2 +----------------------------------------------------------------------------------------------- +minetest.register_node("dryplants:reed_roof_corner_2", { + description = "Reed Roof Corner 2", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = {"dryplants_reed.png"}, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/2, -1/2, 0, 0, 0, 1/2}, + {0, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, 0, -1/2, 0, 1/2, 0}, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/2, -1/2, 0, 0, 0, 1/2}, + {0, 0, 0, 1/2, 1/2, 1/2}, + {-1/2, 0, -1/2, 0, 1/2, 0}, + } + }, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) diff --git a/mods/plantlife_modpack/dryplants/settings.txt b/mods/plantlife_modpack/dryplants/settings.txt index 81dc8997..a9c63699 100644 --- a/mods/plantlife_modpack/dryplants/settings.txt +++ b/mods/plantlife_modpack/dryplants/settings.txt @@ -1,52 +1,52 @@ --- Here you can enable/disable the different plants -REEDMACE_GENERATES = true -SMALL_JUNCUS_GENERATES = true -EXTRA_TALL_GRASS_GENERATES = true - - - --- Amount of Reedmace near water or swamp -REEDMACE_NEAR_WATER_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) -REEDMACE_NEAR_WATER_RARITY = 40 -- percent - --- Amount of Reedmace in water -REEDMACE_IN_WATER_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) -REEDMACE_IN_WATER_RARITY = 65 -- percent - --- Amount of Reedmace for oases, tropical beaches and tropical swamps -REEDMACE_FOR_OASES_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) -REEDMACE_FOR_OASES_RARITY = 90 -- percent - --- growing of reedmace sapling -REEDMACE_GROWING_TIME = 16800 -- seconds -REEDMACE_GROWING_CHANCE = 5 -- percent - - - --- Amount of small Juncus near water or swamp -JUNCUS_NEAR_WATER_PER_MAPBLOCK = 70 -- plants per 80x80x80 nodes (absolute maximum number) -JUNCUS_NEAR_WATER_RARITY = 75 -- percent - --- Amount of small Juncus at dunes/beach -JUNCUS_AT_BEACH_PER_MAPBLOCK = 70 -- plants per 80x80x80 nodes (absolute maximum number) -JUNCUS_AT_BEACH_RARITY = 75 -- percent - - - --- Tall Grass on dirt with grass -TALL_GRASS_PER_MAPBLOCK = 4800 -- plants per 80x80x80 nodes (absolute maximum number) -TALL_GRASS_RARITY = 75 -- percent - - - --- short grass becomes dirt with grass again -GRASS_REGROWING_TIME = 16800 -- seconds -GRASS_REGROWING_CHANCE = 0.5 -- percent - -HAY_DRYING_TIME = 3600 -- seconds - -REED_WILL_DRY = false -- wet reed nodes will become dry reed nodes -REED_DRYING_TIME = 3600 -- seconds - -AUTO_ROOF_CORNER = true - +-- Here you can enable/disable the different plants +REEDMACE_GENERATES = true +SMALL_JUNCUS_GENERATES = true +EXTRA_TALL_GRASS_GENERATES = true + + + +-- Amount of Reedmace near water or swamp +REEDMACE_NEAR_WATER_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) +REEDMACE_NEAR_WATER_RARITY = 40 -- percent + +-- Amount of Reedmace in water +REEDMACE_IN_WATER_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) +REEDMACE_IN_WATER_RARITY = 65 -- percent + +-- Amount of Reedmace for oases, tropical beaches and tropical swamps +REEDMACE_FOR_OASES_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute maximum number) +REEDMACE_FOR_OASES_RARITY = 90 -- percent + +-- growing of reedmace sapling +REEDMACE_GROWING_TIME = 16800 -- seconds +REEDMACE_GROWING_CHANCE = 5 -- percent + + + +-- Amount of small Juncus near water or swamp +JUNCUS_NEAR_WATER_PER_MAPBLOCK = 70 -- plants per 80x80x80 nodes (absolute maximum number) +JUNCUS_NEAR_WATER_RARITY = 75 -- percent + +-- Amount of small Juncus at dunes/beach +JUNCUS_AT_BEACH_PER_MAPBLOCK = 70 -- plants per 80x80x80 nodes (absolute maximum number) +JUNCUS_AT_BEACH_RARITY = 75 -- percent + + + +-- Tall Grass on dirt with grass +TALL_GRASS_PER_MAPBLOCK = 4800 -- plants per 80x80x80 nodes (absolute maximum number) +TALL_GRASS_RARITY = 75 -- percent + + + +-- short grass becomes dirt with grass again +GRASS_REGROWING_TIME = 16800 -- seconds +GRASS_REGROWING_CHANCE = 0.5 -- percent + +HAY_DRYING_TIME = 3600 -- seconds + +REED_WILL_DRY = false -- wet reed nodes will become dry reed nodes +REED_DRYING_TIME = 3600 -- seconds + +AUTO_ROOF_CORNER = true + diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_1.png b/mods/plantlife_modpack/dryplants/textures/default_grass_1.png index 594a23b4..8820e7e3 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/default_grass_1.png and b/mods/plantlife_modpack/dryplants/textures/default_grass_1.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_2.png b/mods/plantlife_modpack/dryplants/textures/default_grass_2.png index 7f1025ae..9929548c 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/default_grass_2.png and b/mods/plantlife_modpack/dryplants/textures/default_grass_2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_3.png b/mods/plantlife_modpack/dryplants/textures/default_grass_3.png index aec589f0..4d62f695 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/default_grass_3.png and b/mods/plantlife_modpack/dryplants/textures/default_grass_3.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_4.png b/mods/plantlife_modpack/dryplants/textures/default_grass_4.png index e9c8c884..8ad76c53 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/default_grass_4.png and b/mods/plantlife_modpack/dryplants/textures/default_grass_4.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_5.png b/mods/plantlife_modpack/dryplants/textures/default_grass_5.png index 20dcd2b4..799b0fd1 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/default_grass_5.png and b/mods/plantlife_modpack/dryplants/textures/default_grass_5.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png index a01ec989..cbd276e9 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png index ad186e5d..30553aad 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png index a6429ac1..bc275074 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png b/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png index a919166a..600c5083 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png index 790fb798..2e4f8403 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_03.png b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_03.png index cad5c753..ff3d9c57 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_03.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_03.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_inv.png b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_inv.png index 4fad2f2a..d5b9dcae 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_inv.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_inv.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png index 565876b7..b350a78a 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png index 106f0694..cd4488a1 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png index ee7840f4..d14686f0 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png index 4e441f43..d83c36d6 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png index ae6c7fc0..4ac816a4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png index 5e2a4702..5cbd8d8a 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png index dc036963..04b8c1ff 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png index efab4689..4a23745f 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png index 6beb5850..8532ece7 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png index 0b2b06d9..3ebf93c8 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png b/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png index 31d21de1..e496062f 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png index c39a0133..aac95202 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png index 2779783d..1ebe95c3 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png index 5af46890..0a2cae11 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png index 8b23c7ad..b771a553 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png index 0ffa0021..a9f4b7e4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png index 7708b49f..67c3cb8c 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png index 9df87244..dc8a33ec 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png index d43af2e0..23b5cf32 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png index e7af0907..d494ae44 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png index c2b1546a..aaab5fe6 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png index 8380c200..5c8751ae 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png index 0ee837db..342b8b86 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png index 800cb964..a1d708db 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png index c28ba71a..643bbea6 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png index 65b544aa..d4150036 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png index 69783a83..1a3bd923 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png index 30b77ac3..b178d4a2 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png index 78395b87..18ae716b 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png index d64b5373..e511b247 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png index 2450ceae..ca505bd7 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png index 395a1102..d2ec7296 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png index 02624ff4..9ba759b6 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png index 34a7a052..33822eff 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png index 85264343..6a18fdab 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png and b/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png index 571019a5..6e7611c4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png index 4fb9f25d..ce49ec24 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png index 2e9af80b..e512a77d 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png index 055a9c09..7644a0d1 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png index 702abce5..801cf23b 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png index 5ccbb7d4..7d25e494 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png index 8a39dcea..a02b19bd 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png index d82ce5a2..0b13beb4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png index a66f882a..784d45d1 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png index 404cac0b..1498b5f4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png index c916975d..db758c47 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png index 5cb09e16..207a7470 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png index 138786af..6d9afced 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png index 07f95394..6eedad4f 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png index 06c8888e..333f5877 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png index cfb4705e..6b10bff4 100644 Binary files a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png and b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png differ diff --git a/mods/plantlife_modpack/ferns/crafting.lua b/mods/plantlife_modpack/ferns/crafting.lua index 656a7632..8d8b3edf 100644 --- a/mods/plantlife_modpack/ferns/crafting.lua +++ b/mods/plantlife_modpack/ferns/crafting.lua @@ -1,104 +1,104 @@ ------------------------------------------------------------------------------------------------ --- Ferns - Crafting 0.0.5 ------------------------------------------------------------------------------------------------ --- (by Mossmanikin) --- License (everything): WTFPL ------------------------------------------------------------------------------------------------ -minetest.register_craft({ - type = "shapeless", - output = "ferns:fiddlehead 3", - recipe = {"ferns:fern_01"}, - replacements = { - {"ferns:fern_01", "ferns:ferntuber"} - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = "ferns:fiddlehead 3", - recipe = {"ferns:tree_fern_leaves"}, - replacements = { - {"ferns:tree_fern_leaves", "ferns:sapling_tree_fern"} - }, -}) ------------------------------------------------------------------------------------------------ --- FIDDLEHEAD ------------------------------------------------------------------------------------------------ -minetest.register_alias("archaeplantae:fiddlehead", "ferns:fiddlehead") - -minetest.register_craftitem("ferns:fiddlehead", { - description = "Fiddlehead", - inventory_image = "ferns_fiddlehead.png", - on_use = minetest.item_eat(-1), -- slightly poisonous when raw -}) -minetest.register_craft({ - type = "cooking", - output = "ferns:fiddlehead_roasted", - recipe = "ferns:fiddlehead", - cooktime = 1, -}) -minetest.register_craftitem("ferns:fiddlehead_roasted", { - description = "Roasted Fiddlehead", - inventory_image = "ferns_fiddlehead_roasted.png", - on_use = minetest.item_eat(1), -- edible when cooked -}) ------------------------------------------------------------------------------------------------ --- FERN TUBER ------------------------------------------------------------------------------------------------ -minetest.register_alias("archaeplantae:ferntuber", "ferns:ferntuber") - -minetest.register_craftitem("ferns:ferntuber", { - description = "Fern Tuber", - inventory_image = "ferns_ferntuber.png", -}) -minetest.register_craft({ - type = "cooking", - output = "ferns:ferntuber_roasted", - recipe = "ferns:ferntuber", - cooktime = 3, -}) - -minetest.register_alias("archaeplantae:ferntuber_roasted", "ferns:ferntuber_roasted") - -minetest.register_craftitem("ferns:ferntuber_roasted", { - description = "Roasted Fern Tuber", - inventory_image = "ferns_ferntuber_roasted.png", - on_use = minetest.item_eat(3), -}) ------------------------------------------------------------------------------------------------ --- HORSETAIL (EQUISETUM) --> GREEN DYE https://en.wikipedia.org/wiki/Equisetum ------------------------------------------------------------------------------------------------ -minetest.register_craft({ - type = "shapeless", - output = "dye:green", - recipe = {"group:horsetail"}, -}) ------------------------------------------------------------------------------------------------ --- GLUE WOODEN TOOLS with RESIN & POLISH them with HORSETAIL (planned) ------------------------------------------------------------------------------------------------ ---[[minetest.register_craft({ - type = "shapeless", - output = "default:pick_wood", - recipe = {"default:pick_wood","group:horsetail","farming:string","default:stick"}, -}) -minetest.register_craft({ - type = "shapeless", - output = "default:shovel_wood", - recipe = {"default:shovel_wood","group:horsetail","farming:string","default:stick"}, -}) -minetest.register_craft({ - type = "shapeless", - output = "default:axe_wood", - recipe = {"default:axe_wood","group:horsetail","farming:string","default:stick"}, -}) -minetest.register_craft({ - type = "shapeless", - output = "default:sword_wood", - recipe = {"default:sword_wood","group:horsetail","farming:string","default:stick"}, -}) -minetest.register_craft({ - type = "shapeless", - output = "farming:hoe_wood", - recipe = {"farming:hoe_wood","group:horsetail","farming:string","default:stick"}, -})]] - +----------------------------------------------------------------------------------------------- +-- Ferns - Crafting 0.0.5 +----------------------------------------------------------------------------------------------- +-- (by Mossmanikin) +-- License (everything): WTFPL +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "shapeless", + output = "ferns:fiddlehead 3", + recipe = {"ferns:fern_01"}, + replacements = { + {"ferns:fern_01", "ferns:ferntuber"} + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "ferns:fiddlehead 3", + recipe = {"ferns:tree_fern_leaves"}, + replacements = { + {"ferns:tree_fern_leaves", "ferns:sapling_tree_fern"} + }, +}) +----------------------------------------------------------------------------------------------- +-- FIDDLEHEAD +----------------------------------------------------------------------------------------------- +minetest.register_alias("archaeplantae:fiddlehead", "ferns:fiddlehead") + +minetest.register_craftitem("ferns:fiddlehead", { + description = "Fiddlehead", + inventory_image = "ferns_fiddlehead.png", + on_use = minetest.item_eat(-1), -- slightly poisonous when raw +}) +minetest.register_craft({ + type = "cooking", + output = "ferns:fiddlehead_roasted", + recipe = "ferns:fiddlehead", + cooktime = 1, +}) +minetest.register_craftitem("ferns:fiddlehead_roasted", { + description = "Roasted Fiddlehead", + inventory_image = "ferns_fiddlehead_roasted.png", + on_use = minetest.item_eat(1), -- edible when cooked +}) +----------------------------------------------------------------------------------------------- +-- FERN TUBER +----------------------------------------------------------------------------------------------- +minetest.register_alias("archaeplantae:ferntuber", "ferns:ferntuber") + +minetest.register_craftitem("ferns:ferntuber", { + description = "Fern Tuber", + inventory_image = "ferns_ferntuber.png", +}) +minetest.register_craft({ + type = "cooking", + output = "ferns:ferntuber_roasted", + recipe = "ferns:ferntuber", + cooktime = 3, +}) + +minetest.register_alias("archaeplantae:ferntuber_roasted", "ferns:ferntuber_roasted") + +minetest.register_craftitem("ferns:ferntuber_roasted", { + description = "Roasted Fern Tuber", + inventory_image = "ferns_ferntuber_roasted.png", + on_use = minetest.item_eat(3), +}) +----------------------------------------------------------------------------------------------- +-- HORSETAIL (EQUISETUM) --> GREEN DYE https://en.wikipedia.org/wiki/Equisetum +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "shapeless", + output = "dye:green", + recipe = {"group:horsetail"}, +}) +----------------------------------------------------------------------------------------------- +-- GLUE WOODEN TOOLS with RESIN & POLISH them with HORSETAIL (planned) +----------------------------------------------------------------------------------------------- +--[[minetest.register_craft({ + type = "shapeless", + output = "default:pick_wood", + recipe = {"default:pick_wood","group:horsetail","farming:string","default:stick"}, +}) +minetest.register_craft({ + type = "shapeless", + output = "default:shovel_wood", + recipe = {"default:shovel_wood","group:horsetail","farming:string","default:stick"}, +}) +minetest.register_craft({ + type = "shapeless", + output = "default:axe_wood", + recipe = {"default:axe_wood","group:horsetail","farming:string","default:stick"}, +}) +minetest.register_craft({ + type = "shapeless", + output = "default:sword_wood", + recipe = {"default:sword_wood","group:horsetail","farming:string","default:stick"}, +}) +minetest.register_craft({ + type = "shapeless", + output = "farming:hoe_wood", + recipe = {"farming:hoe_wood","group:horsetail","farming:string","default:stick"}, +})]] + diff --git a/mods/plantlife_modpack/ferns/depends.txt b/mods/plantlife_modpack/ferns/depends.txt index bde0bdf5..0077f8a1 100644 --- a/mods/plantlife_modpack/ferns/depends.txt +++ b/mods/plantlife_modpack/ferns/depends.txt @@ -1,2 +1,2 @@ -default +default plants_lib \ No newline at end of file diff --git a/mods/plantlife_modpack/ferns/fern.lua b/mods/plantlife_modpack/ferns/fern.lua index f45860a3..f4bbe6fa 100644 --- a/mods/plantlife_modpack/ferns/fern.lua +++ b/mods/plantlife_modpack/ferns/fern.lua @@ -1,196 +1,196 @@ ------------------------------------------------------------------------------------------------ --- Ferns - Fern 0.1.0 ------------------------------------------------------------------------------------------------ --- by Mossmanikin --- License (everything): WTFPL --- Contains code from: plants_lib --- Looked at code from: default, flowers, painting, trees --- Dependencies: plants_lib --- Supports: dryplants, stoneage, sumpf ------------------------------------------------------------------------------------------------ --- some inspiration from here --- https://en.wikipedia.org/wiki/Athyrium_yokoscense --- http://www.mygarden.net.au/gardening/athyrium-yokoscense/3900/1 ------------------------------------------------------------------------------------------------ - -assert(abstract_ferns.config.enable_lady_fern == true) - --- Maintain backward compatibilty -minetest.register_alias("archaeplantae:fern", "ferns:fern_03") -minetest.register_alias("archaeplantae:fern_mid", "ferns:fern_02") -minetest.register_alias("archaeplantae:fern_small", "ferns:fern_01") -minetest.register_alias("ferns:fern_04", "ferns:fern_02") -- for placing - -local nodenames = {} - -local function create_nodes() - local images = { "ferns_fern.png", "ferns_fern_mid.png", "ferns_fern_big.png" } - local vscales = { 1, 2, 2.2 } - local descs = { "Lady-fern (Athyrium)", nil, nil } - - for i = 1, 3 do - local node_on_place = nil - if i == 1 then - node_on_place = function(itemstack, placer, pointed_thing) - -- place a random fern - local stack = ItemStack("ferns:fern_0"..math.random(1,4)) - local ret = minetest.item_place(stack, placer, pointed_thing) - return ItemStack("ferns:fern_01 "..itemstack:get_count()-(1-ret:get_count())) -- TODO FIXME? - end - end - nodenames[i] = "ferns:fern_"..string.format("%02d", i) - minetest.register_node(nodenames[i], { - description = descs[i] or ("Lady-fern (Athyrium) " .. string.format("%02d", i)), - inventory_image = "ferns_fern.png", - drawtype = "plantlike", - visual_scale = vscales[i], - paramtype = "light", - tiles = { images[i] }, - walkable = false, - buildable_to = true, - groups = {snappy=3,flammable=2,attached_node=1,not_in_creative_inventory=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-7/16, -1/2, -7/16, 7/16, 0, 7/16}, - }, - drop = "ferns:fern_01", - on_place = node_on_place - }) - end -end - ------------------------------------------------------------------------------------------------ --- Init ------------------------------------------------------------------------------------------------ - -create_nodes() - ------------------------------------------------------------------------------------------------ --- Spawning ------------------------------------------------------------------------------------------------ - -if abstract_ferns.config.lady_ferns_near_tree == true then - plantslib:register_generate_plant({ -- near trees (woodlands) - surface = { - "default:dirt_with_grass", - "default:mossycobble", - "default:desert_sand", - "default:sand", - "default:jungletree", - "stoneage:grass_with_silex", - "sumpf:sumpf" - }, - max_count = 30, - rarity = 62,--63, - min_elevation = 1, -- above sea level - near_nodes = {"group:tree"}, - near_nodes_size = 3,--4, - near_nodes_vertical = 2,--3, - near_nodes_count = 1, - plantlife_limit = -0.9, - humidity_max = -1.0, - humidity_min = 0.4, - temp_max = -0.5, -- 55 °C (too hot?) - temp_min = 0.75, -- -12 °C - random_facedir = { 0, 179 }, - }, - nodenames - ) -end - -if abstract_ferns.config.lady_ferns_near_rock == true then - plantslib:register_generate_plant({ -- near stone (mountains) - surface = { - "default:dirt_with_grass", - "default:mossycobble", - "group:falling_node", - --"default:jungletree", - "stoneage:grass_with_silex", - "sumpf:sumpf" - }, - max_count = 35, - rarity = 40, - min_elevation = 1, -- above sea level - near_nodes = {"group:stone"}, - near_nodes_size = 1, - near_nodes_count = 16, - plantlife_limit = -0.9, - humidity_max = -1.0, - humidity_min = 0.4, - temp_max = -0.5, -- 55 °C (too hot?) - temp_min = 0.75, -- -12 °C - random_facedir = { 0, 179 }, - }, - nodenames - ) -end - -if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a huge fps drop - plantslib:register_generate_plant({ -- near ores (potential mining sites) - surface = { - "default:dirt_with_grass", - "default:mossycobble", - "default:stone_with_coal", - "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", - "sumpf:sumpf" - }, - max_count = 1200,--1600, -- maybe too much? :D - rarity = 25,--15, - min_elevation = 1, -- above sea level - near_nodes = { - "default:stone_with_iron", - --"default:stone_with_copper", - --"default:stone_with_mese", - --"default:stone_with_gold", - --"default:stone_with_diamond", - "moreores:mineral_tin", - "moreores:mineral_silver" - --"moreores:mineral_mithril" - }, - near_nodes_size = 2, - near_nodes_vertical = 4,--5,--6, - near_nodes_count = 2,--3, - plantlife_limit = -0.9, - humidity_max = -1.0, - humidity_min = 0.4, - temp_max = -0.5, -- 55 °C (too hot?) - temp_min = 0.75, -- -12 °C - random_facedir = { 0, 179 }, - }, - nodenames - ) -end - -if abstract_ferns.config.lady_ferns_in_groups == true then -- this one is meant as a replacement of Ferns_near_Ores - plantslib:register_generate_plant({ - surface = { - "default:dirt_with_grass", - "default:mossycobble", - "default:stone_with_coal", - "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", - "sumpf:sumpf" - }, - max_count = 70, - rarity = 25,--15, - min_elevation = 1, -- above sea level - near_nodes = { - "default:stone" - }, - near_nodes_size = 2, - near_nodes_vertical = 2,--6, - near_nodes_count = 3, - plantlife_limit = -0.9, - humidity_max = -1.0, - humidity_min = 0.4, - temp_max = -0.5, -- 55 °C (too hot?) - temp_min = 0.75, -- -12 °C - random_facedir = { 0, 179 }, - }, - nodenames - ) -end +----------------------------------------------------------------------------------------------- +-- Ferns - Fern 0.1.0 +----------------------------------------------------------------------------------------------- +-- by Mossmanikin +-- License (everything): WTFPL +-- Contains code from: plants_lib +-- Looked at code from: default, flowers, painting, trees +-- Dependencies: plants_lib +-- Supports: dryplants, stoneage, sumpf +----------------------------------------------------------------------------------------------- +-- some inspiration from here +-- https://en.wikipedia.org/wiki/Athyrium_yokoscense +-- http://www.mygarden.net.au/gardening/athyrium-yokoscense/3900/1 +----------------------------------------------------------------------------------------------- + +assert(abstract_ferns.config.enable_lady_fern == true) + +-- Maintain backward compatibilty +minetest.register_alias("archaeplantae:fern", "ferns:fern_03") +minetest.register_alias("archaeplantae:fern_mid", "ferns:fern_02") +minetest.register_alias("archaeplantae:fern_small", "ferns:fern_01") +minetest.register_alias("ferns:fern_04", "ferns:fern_02") -- for placing + +local nodenames = {} + +local function create_nodes() + local images = { "ferns_fern.png", "ferns_fern_mid.png", "ferns_fern_big.png" } + local vscales = { 1, 2, 2.2 } + local descs = { "Lady-fern (Athyrium)", nil, nil } + + for i = 1, 3 do + local node_on_place = nil + if i == 1 then + node_on_place = function(itemstack, placer, pointed_thing) + -- place a random fern + local stack = ItemStack("ferns:fern_0"..math.random(1,4)) + local ret = minetest.item_place(stack, placer, pointed_thing) + return ItemStack("ferns:fern_01 "..itemstack:get_count()-(1-ret:get_count())) -- TODO FIXME? + end + end + nodenames[i] = "ferns:fern_"..string.format("%02d", i) + minetest.register_node(nodenames[i], { + description = descs[i] or ("Lady-fern (Athyrium) " .. string.format("%02d", i)), + inventory_image = "ferns_fern.png", + drawtype = "plantlike", + visual_scale = vscales[i], + paramtype = "light", + tiles = { images[i] }, + walkable = false, + buildable_to = true, + groups = {snappy=3,flammable=2,attached_node=1,not_in_creative_inventory=1}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-7/16, -1/2, -7/16, 7/16, 0, 7/16}, + }, + drop = "ferns:fern_01", + on_place = node_on_place + }) + end +end + +----------------------------------------------------------------------------------------------- +-- Init +----------------------------------------------------------------------------------------------- + +create_nodes() + +----------------------------------------------------------------------------------------------- +-- Spawning +----------------------------------------------------------------------------------------------- + +if abstract_ferns.config.lady_ferns_near_tree == true then + plantslib:register_generate_plant({ -- near trees (woodlands) + surface = { + "default:dirt_with_grass", + "default:mossycobble", + "default:desert_sand", + "default:sand", + "default:jungletree", + "stoneage:grass_with_silex", + "sumpf:sumpf" + }, + max_count = 30, + rarity = 62,--63, + min_elevation = 1, -- above sea level + near_nodes = {"group:tree"}, + near_nodes_size = 3,--4, + near_nodes_vertical = 2,--3, + near_nodes_count = 1, + plantlife_limit = -0.9, + humidity_max = -1.0, + humidity_min = 0.4, + temp_max = -0.5, -- 55 °C (too hot?) + temp_min = 0.75, -- -12 °C + random_facedir = { 0, 179 }, + }, + nodenames + ) +end + +if abstract_ferns.config.lady_ferns_near_rock == true then + plantslib:register_generate_plant({ -- near stone (mountains) + surface = { + "default:dirt_with_grass", + "default:mossycobble", + "group:falling_node", + --"default:jungletree", + "stoneage:grass_with_silex", + "sumpf:sumpf" + }, + max_count = 35, + rarity = 40, + min_elevation = 1, -- above sea level + near_nodes = {"group:stone"}, + near_nodes_size = 1, + near_nodes_count = 16, + plantlife_limit = -0.9, + humidity_max = -1.0, + humidity_min = 0.4, + temp_max = -0.5, -- 55 °C (too hot?) + temp_min = 0.75, -- -12 °C + random_facedir = { 0, 179 }, + }, + nodenames + ) +end + +if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a huge fps drop + plantslib:register_generate_plant({ -- near ores (potential mining sites) + surface = { + "default:dirt_with_grass", + "default:mossycobble", + "default:stone_with_coal", + "default:stone_with_iron", + "moreores:mineral_tin", + "moreores:mineral_silver", + "sumpf:sumpf" + }, + max_count = 1200,--1600, -- maybe too much? :D + rarity = 25,--15, + min_elevation = 1, -- above sea level + near_nodes = { + "default:stone_with_iron", + --"default:stone_with_copper", + --"default:stone_with_mese", + --"default:stone_with_gold", + --"default:stone_with_diamond", + "moreores:mineral_tin", + "moreores:mineral_silver" + --"moreores:mineral_mithril" + }, + near_nodes_size = 2, + near_nodes_vertical = 4,--5,--6, + near_nodes_count = 2,--3, + plantlife_limit = -0.9, + humidity_max = -1.0, + humidity_min = 0.4, + temp_max = -0.5, -- 55 °C (too hot?) + temp_min = 0.75, -- -12 °C + random_facedir = { 0, 179 }, + }, + nodenames + ) +end + +if abstract_ferns.config.lady_ferns_in_groups == true then -- this one is meant as a replacement of Ferns_near_Ores + plantslib:register_generate_plant({ + surface = { + "default:dirt_with_grass", + "default:mossycobble", + "default:stone_with_coal", + "default:stone_with_iron", + "moreores:mineral_tin", + "moreores:mineral_silver", + "sumpf:sumpf" + }, + max_count = 70, + rarity = 25,--15, + min_elevation = 1, -- above sea level + near_nodes = { + "default:stone" + }, + near_nodes_size = 2, + near_nodes_vertical = 2,--6, + near_nodes_count = 3, + plantlife_limit = -0.9, + humidity_max = -1.0, + humidity_min = 0.4, + temp_max = -0.5, -- 55 °C (too hot?) + temp_min = 0.75, -- -12 °C + random_facedir = { 0, 179 }, + }, + nodenames + ) +end diff --git a/mods/plantlife_modpack/ferns/textures/ferns_5.png b/mods/plantlife_modpack/ferns/textures/ferns_5.png index de87d3a0..7e406651 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_5.png and b/mods/plantlife_modpack/ferns/textures/ferns_5.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_6.png b/mods/plantlife_modpack/ferns/textures/ferns_6.png index 7ca1c3f4..107bbf6e 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_6.png and b/mods/plantlife_modpack/ferns/textures/ferns_6.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_7.png b/mods/plantlife_modpack/ferns/textures/ferns_7.png index 71658812..b1ac1f51 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_7.png and b/mods/plantlife_modpack/ferns/textures/ferns_7.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_8.png b/mods/plantlife_modpack/ferns/textures/ferns_8.png index 4a558950..db5510ba 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_8.png and b/mods/plantlife_modpack/ferns/textures/ferns_8.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_fern.png index 36f50f92..7884e5a3 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png index 0c3094fd..42deb953 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png index 39a1d026..32133088 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree.png index 0304897e..8daeafd8 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png index 59580bbc..2e3adb72 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png index 1ea2e43c..54176691 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png index 6b2f2864..16b6e3a0 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png index c00aeecf..768430fc 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png index 057e5ece..24ede0aa 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png index 22d55230..3e3c829e 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png index 03d789b8..8b259cc4 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png and b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png index c7451944..2d6785da 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png and b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png index de610aed..f62a88d6 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png and b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png index b1796b87..0925c780 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png and b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png index 3a3d72c3..9f4943ce 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png and b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png index 90aeadab..60d3ca67 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png and b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png index 7ceae5c7..3c7edf73 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png and b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png index 3ec3a1d1..5d28a468 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png and b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png index 9cab02df..a8254ed5 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png and b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png index 63d5d59e..b459d481 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png and b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png index 6bccc996..e5560166 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png and b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png index 93cbebc2..09cc0012 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png and b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png index b1c9600e..48f7e2cb 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png and b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png differ diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png index d850d3a8..d0064fee 100644 Binary files a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png and b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png b/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png index f3558f7e..6ba89c15 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png b/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png index d5d1c547..de344e63 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png index e7e747a9..0fdf5159 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png index 99b29abc..d30def0b 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png index 64cc6a7b..d146df31 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png index 3c6c4e85..e10460a3 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png index b96e4fab..e2fdb67f 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png index efaf5dbc..eb547e82 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png differ diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png index b4d18b3b..7a126712 100644 Binary files a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png and b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png b/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png index 4bd33e96..a3d403c1 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png and b/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/comb.png b/mods/plantlife_modpack/ferns/textures/old/comb.png index dca2800c..ea1e19f5 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/comb.png and b/mods/plantlife_modpack/ferns/textures/old/comb.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png index d5ee89a0..56762781 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png index 3d65b2a9..36d60403 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png index b0ee0c6b..8aabe61d 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png index 46445f0e..d17ed117 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png index e21cc552..08513c2e 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png index fb58d34a..45996728 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png index 1efdbd82..d83151f3 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png index 4a4ee872..244ddfe6 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png index f8fcc964..872fdabb 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png index 96054129..7d557185 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png index 46614ff3..d0b55630 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png index 153f354a..42cf76e0 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png index bb12dc21..600ebe76 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png index 1e192926..00ec9d89 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png index 6af642fa..ce1a87d8 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png differ diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png index 3c34ad9f..b568383e 100644 Binary files a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png and b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png differ diff --git a/mods/plantlife_modpack/flowers_plus/depends.txt b/mods/plantlife_modpack/flowers_plus/depends.txt index c8f72513..6a669060 100644 --- a/mods/plantlife_modpack/flowers_plus/depends.txt +++ b/mods/plantlife_modpack/flowers_plus/depends.txt @@ -1 +1,2 @@ plants_lib + diff --git a/mods/plantlife_modpack/flowers_plus/init.lua b/mods/plantlife_modpack/flowers_plus/init.lua index 5bf563d4..990c393b 100644 --- a/mods/plantlife_modpack/flowers_plus/init.lua +++ b/mods/plantlife_modpack/flowers_plus/init.lua @@ -1,11 +1,4 @@ --- Boilerplate to support localized strings if intllib mod is installed. -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end +local S = plantslib.intllib -- This file supplies a few additional plants and some related crafts -- for the plantlife modpack. Last revision: 2013-04-24 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png index 7a04dac6..3f849582 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png index 42dd70d5..d978850c 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png index 7c559267..b5bd99c5 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png index 51f791db..7595ebc9 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png index a3195f52..0b24730c 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png index b791ee9d..d9b7f439 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png index 2fccd04e..887c1839 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png index a2dee8ad..7b58bb2e 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png index 3edbc1a0..73647aca 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png index 5ef89f35..7ca683ed 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png index 2e6ca575..234da606 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png index 1f065967..a2d88cd8 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png index 81796c5b..7d2ba869 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png index c7bf2260..bfcab906 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png index 42155bf4..8119ea7c 100644 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png and b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png differ diff --git a/mods/plantlife_modpack/molehills/textures/molehills_side.png b/mods/plantlife_modpack/molehills/textures/molehills_side.png index c82e72a9..554bbecf 100644 Binary files a/mods/plantlife_modpack/molehills/textures/molehills_side.png and b/mods/plantlife_modpack/molehills/textures/molehills_side.png differ diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png index dd7fed9f..5f0f9768 100644 Binary files a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png and b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png differ diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png index fa6a5dd0..55cc5413 100644 Binary files a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png and b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png index c8b5bc99..15f87123 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png b/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png index 15f5b2dd..b192a309 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png b/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png index 5d9d5c9a..189f0540 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png b/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png index 74891db7..76337f0b 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_red.png index cea95f56..0b83830f 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_red.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_red.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png index 584c3f73..3c950d5b 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png index 22bc9d9a..a0818d23 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png differ diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png index b1537ccf..1f1d3a45 100644 Binary files a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png and b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png differ diff --git a/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png b/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png index a5bb2d3b..9d90336d 100644 Binary files a/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png and b/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png differ diff --git a/mods/plantlife_modpack/plants_lib/depends.txt b/mods/plantlife_modpack/plants_lib/depends.txt index 4ad96d51..c48fe0d0 100644 --- a/mods/plantlife_modpack/plants_lib/depends.txt +++ b/mods/plantlife_modpack/plants_lib/depends.txt @@ -1 +1,3 @@ default +intllib? + diff --git a/mods/plantlife_modpack/plants_lib/init.lua b/mods/plantlife_modpack/plants_lib/init.lua index b92bd4b0..f2066354 100644 --- a/mods/plantlife_modpack/plants_lib/init.lua +++ b/mods/plantlife_modpack/plants_lib/init.lua @@ -26,17 +26,17 @@ plantslib.actionslist_aircheck = {} plantslib.actionslist_no_aircheck = {} plantslib.modpath = minetest.get_modpath("plants_lib") -plantslib.intllib_modpath = minetest.get_modpath("intllib") plantslib.total_no_aircheck_calls = 0 +-- Boilerplate to support localized strings if intllib mod is installed. local S -if plantslib.intllib_modpath then - dofile(plantslib.intllib_modpath.."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) +if minetest.get_modpath("intllib") then + S = intllib.Getter() else - S = function ( s ) return s end + S = function(s) return s end end +plantslib.intllib = S local DEBUG = false --... except if you want to spam the console with debugging info :-) diff --git a/mods/plantlife_modpack/poisonivy/depends.txt b/mods/plantlife_modpack/poisonivy/depends.txt index c8f72513..6a669060 100644 --- a/mods/plantlife_modpack/poisonivy/depends.txt +++ b/mods/plantlife_modpack/poisonivy/depends.txt @@ -1 +1,2 @@ plants_lib + diff --git a/mods/plantlife_modpack/poisonivy/init.lua b/mods/plantlife_modpack/poisonivy/init.lua index 3674d3e3..bb321219 100644 --- a/mods/plantlife_modpack/poisonivy/init.lua +++ b/mods/plantlife_modpack/poisonivy/init.lua @@ -1,14 +1,7 @@ -- This file supplies poison ivy for the plantlife modpack -- Last revision: 2013-01-24 --- Boilerplate to support localized strings if intllib mod is installed. -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end +local S = plantslib.intllib local SPAWN_DELAY = 1000 local SPAWN_CHANCE = 200 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png index f9175595..f53f7a39 100644 Binary files a/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png and b/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png differ diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png index 9a7af2b6..281fa754 100644 Binary files a/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png and b/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png differ diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png index cda0554b..92d27429 100644 Binary files a/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png and b/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png index ca5eb14b..e3b77702 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png and b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png index 8dd954f6..20535928 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png and b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png index 05544f40..51071c38 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png index e4bc9f50..518955cb 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png index 3389cd07..157c9570 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png index 11687ddd..9945f226 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png index 54c9dcef..6aacf9d9 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png index cc67ee60..c5286b6c 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png index 1bceec19..9dda4784 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png differ diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png index a86597b6..42a5d451 100644 Binary files a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png and b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss.png b/mods/plantlife_modpack/trunks/textures/trunks_moss.png index 6ce1b620..5ffe58f9 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_moss.png and b/mods/plantlife_modpack/trunks/textures/trunks_moss.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png b/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png index 3b8788ed..fcd4ae2f 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png and b/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png b/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png index 242bb8d0..5bfdac6a 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png and b/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png index bebb38b3..066bbfa9 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png index a345b29a..062d8f69 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png index 69bbfb06..d9f41f8f 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png index b7678d8c..b8cf458c 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png index bf13bf90..64b08ebf 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png index f5c3a321..826253c3 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png index 752003e4..4038e03a 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png index 5bd135a7..971d6497 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png index 79a57f92..5f743345 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png index c6824538..2f6464bf 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png index a37b9b37..8b5e4e1a 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png index b4111876..a9441e95 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png index 176812a5..3e7a3f35 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png and b/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png index a1ebde75..60871bf0 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png and b/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png differ diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png index 828768a7..baf797c1 100644 Binary files a/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png and b/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png differ diff --git a/mods/plantlife_modpack/vines/init.lua b/mods/plantlife_modpack/vines/init.lua index 97cc252c..4491870c 100644 --- a/mods/plantlife_modpack/vines/init.lua +++ b/mods/plantlife_modpack/vines/init.lua @@ -3,10 +3,25 @@ and rope does not drop anything!!!! ]] +vines = {} + local mod_name = "vines" local average_height = 12 local spawn_interval = 90 -local vines_group = {attached_node=1,vines=1,snappy=3,flammable=2,hanging_node=1} +local vines_group = {attached_node=1,vines=1,snappy=3,flammable=2,hanging_node=1,vines_cleanup=1} + +vines.growth_interval = 300 +vines.growth_chance = 2 +vines.rot_interval = 300 +vines.rot_chance = 8 + +local jungle_leaves_list = { + "default:jungleleaves", + "moretrees:jungle_leaves_red", + "moretrees:jungle_leaves_yellow", + "moretrees:jungle_leaves_green" +} + -- Nodes minetest.register_node("vines:rope_block", { description = "Rope", @@ -92,6 +107,7 @@ minetest.register_node("vines:side", { sunlight_propagates = true, paramtype = "light", paramtype2 = "wallmounted", + buildable_to = true, tile_images = { "vines_side.png" }, drawtype = "signlike", inventory_image = "vines_side.png", @@ -119,10 +135,11 @@ minetest.register_node("vines:side_rotten", { sunlight_propagates = true, paramtype = "light", paramtype2 = "wallmounted", + buildable_to = true, tile_images = { "vines_side_rotten.png" }, drawtype = "signlike", inventory_image = "vines_side.png", - groups = {snappy = 3,flammable=2, hanging_node=1}, + groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "wallmounted", @@ -137,6 +154,7 @@ minetest.register_node("vines:willow", { sunlight_propagates = true, paramtype = "light", paramtype2 = "wallmounted", + buildable_to = true, tile_images = { "vines_willow.png" }, drawtype = "signlike", inventory_image = "vines_willow.png", @@ -164,10 +182,11 @@ minetest.register_node("vines:willow_rotten", { paramtype = "light", drop = "", paramtype2 = "wallmounted", + buildable_to = true, tile_images = { "vines_willow_rotten.png" }, drawtype = "signlike", inventory_image = "vines_willow.png", - groups = {snappy = 3,flammable=2, hanging_node=1}, + groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "wallmounted", @@ -180,10 +199,11 @@ minetest.register_node("vines:root", { climbable = true, sunlight_propagates = true, paramtype = "light", + buildable_to = true, tile_images = { "vines_root.png" }, drawtype = "plantlike", inventory_image = "vines_root.png", - groups = {vines=1,snappy = 3,flammable=2, hanging_node=1}, + groups = {vines=1,snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -198,6 +218,7 @@ minetest.register_node("vines:vine", { sunlight_propagates = true, drop = "", paramtype = "light", + buildable_to = true, tile_images = { "vines_vine.png" }, drawtype = "plantlike", inventory_image = "vines_vine.png", @@ -225,10 +246,11 @@ minetest.register_node("vines:vine_rotten", { drop = "", sunlight_propagates = true, paramtype = "light", + buildable_to = true, tile_images = { "vines_vine_rotten.png" }, drawtype = "plantlike", inventory_image = "vines_vine_rotten.png", - groups = {snappy = 3,flammable=2, hanging_node=1}, + groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -236,11 +258,12 @@ minetest.register_node("vines:vine_rotten", { }, }) ---ABM +-- vine rotting + minetest.register_abm({ nodenames = {"vines:vine", "vines:side", "vines:willow"}, - interval = 300, - chance = 8, + interval = vines.rot_interval, + chance = vines.rot_chance, action = function(pos, node, active_object_count, active_object_count_wider) if minetest.find_node_near(pos, 5, "group:tree") == nil then local walldir = node.param2 @@ -249,10 +272,12 @@ minetest.register_abm({ end }) +-- vine growth + minetest.register_abm({ nodenames = {"vines:vine", "vines:side", "vines:willow"}, - interval = 300, - chance = 2, + interval = vines.growth_interval, + chance = vines.growth_chance, action = function(pos, node, active_object_count, active_object_count_wider) local p = {x=pos.x, y=pos.y-1, z=pos.z} local n = minetest.get_node(p) @@ -263,6 +288,24 @@ minetest.register_abm({ end }) +-- cleanup if the initial tree is missing entirely (e.g. has been dug away) + +minetest.register_abm({ + nodenames = {"group:vines_cleanup"}, + interval = 10, + chance = 5, + action = function(pos, node, active_object_count, active_object_count_wider) + if not minetest.find_node_near(pos, 1, jungle_leaves_list) then + local p_top = {x=pos.x, y=pos.y+1, z=pos.z} + if minetest.get_item_group(minetest.get_node(p_top).name, "vines_cleanup") == 0 then + minetest.remove_node(pos) + end + end + end +}) + +-- rope extension + minetest.register_abm({ nodenames = {"vines:rope_end"}, interval = 1, @@ -310,12 +353,10 @@ plantslib:spawn_on_surfaces({ spawn_delay = spawn_interval, spawn_plants = {"vines:side"}, spawn_chance = 10, - spawn_surfaces = {"group:leafdecay"}, + spawn_surfaces = jungle_leaves_list, spawn_on_side = true, - near_nodes = {"default:water_source", "default:jungletree"}, - near_nodes_size = 10, - near_nodes_vertical = 5, - near_nodes_count = 1, + near_nodes = {"default:jungletree"}, + near_nodes_size = 5, plantlife_limit = -0.9, }) diff --git a/mods/plantlife_modpack/vines/textures/new/bottomvine.png b/mods/plantlife_modpack/vines/textures/new/bottomvine.png index c92bb859..49f88c05 100644 Binary files a/mods/plantlife_modpack/vines/textures/new/bottomvine.png and b/mods/plantlife_modpack/vines/textures/new/bottomvine.png differ diff --git a/mods/plantlife_modpack/vines/textures/new/sidevine.png b/mods/plantlife_modpack/vines/textures/new/sidevine.png index 42457113..fdeaeaeb 100644 Binary files a/mods/plantlife_modpack/vines/textures/new/sidevine.png and b/mods/plantlife_modpack/vines/textures/new/sidevine.png differ diff --git a/mods/plantlife_modpack/vines/textures/new/vinesdead.png b/mods/plantlife_modpack/vines/textures/new/vinesdead.png index d001ec9a..3ac6ea51 100644 Binary files a/mods/plantlife_modpack/vines/textures/new/vinesdead.png and b/mods/plantlife_modpack/vines/textures/new/vinesdead.png differ diff --git a/mods/plantlife_modpack/vines/textures/new/vineslive.png b/mods/plantlife_modpack/vines/textures/new/vineslive.png index 6ba42b5a..8afffe89 100644 Binary files a/mods/plantlife_modpack/vines/textures/new/vineslive.png and b/mods/plantlife_modpack/vines/textures/new/vineslive.png differ diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine2.png index b938f4bc..c755da90 100644 Binary files a/mods/plantlife_modpack/vines/textures/old/vines_vine2.png and b/mods/plantlife_modpack/vines/textures/old/vines_vine2.png differ diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png index 11b5474c..c66e12e2 100644 Binary files a/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png and b/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png differ diff --git a/mods/plantlife_modpack/vines/textures/shears.png b/mods/plantlife_modpack/vines/textures/shears.png index f15024c8..c4c39f9f 100644 Binary files a/mods/plantlife_modpack/vines/textures/shears.png and b/mods/plantlife_modpack/vines/textures/shears.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_item.png b/mods/plantlife_modpack/vines/textures/vines_item.png index f02bc653..c66242ef 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_item.png and b/mods/plantlife_modpack/vines/textures/vines_item.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_root.png b/mods/plantlife_modpack/vines/textures/vines_root.png index c92bb859..49f88c05 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_root.png and b/mods/plantlife_modpack/vines/textures/vines_root.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_rope.png b/mods/plantlife_modpack/vines/textures/vines_rope.png index 525bc666..0045c4c3 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_rope.png and b/mods/plantlife_modpack/vines/textures/vines_rope.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_rope_end.png b/mods/plantlife_modpack/vines/textures/vines_rope_end.png index a95048a3..faf2c715 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_rope_end.png and b/mods/plantlife_modpack/vines/textures/vines_rope_end.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_side.png b/mods/plantlife_modpack/vines/textures/vines_side.png index 42457113..fdeaeaeb 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_side.png and b/mods/plantlife_modpack/vines/textures/vines_side.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_side_rotten.png b/mods/plantlife_modpack/vines/textures/vines_side_rotten.png index 87e4360f..2576e935 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_side_rotten.png and b/mods/plantlife_modpack/vines/textures/vines_side_rotten.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_vine.png b/mods/plantlife_modpack/vines/textures/vines_vine.png index 6ba42b5a..8afffe89 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_vine.png and b/mods/plantlife_modpack/vines/textures/vines_vine.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png b/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png index d001ec9a..3ac6ea51 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png and b/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_willow.png b/mods/plantlife_modpack/vines/textures/vines_willow.png index 91f8feff..ca0b8312 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_willow.png and b/mods/plantlife_modpack/vines/textures/vines_willow.png differ diff --git a/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png b/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png index a8f43420..3c0622f7 100644 Binary files a/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png and b/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png b/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png index fd196b88..67253bc6 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png and b/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png index 9001b2e5..907b345c 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png index 1168adc4..103f103c 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png index bb3dda20..ec18dd6a 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png index ac1393b9..d21f2b9e 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png index acea8305..f4e4ce67 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png differ diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png index fbca9d61..08fb4bef 100644 Binary files a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png and b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/bamboo.png b/mods/plantlife_modpack/youngtrees/textures/bamboo.png index c5c42a95..018d42ea 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/bamboo.png and b/mods/plantlife_modpack/youngtrees/textures/bamboo.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png index fd2e331d..a3d51271 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png and b/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png index a8c2a777..45b86ee8 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png and b/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png index cea22f16..9bba6238 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png and b/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png index 36c3bd7f..d83b7a32 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png and b/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png index a0e2cd97..cfe3cf18 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png and b/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png differ diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png b/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png index ce7e3106..89b2f237 100644 Binary files a/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png and b/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png differ