diff --git a/mods/plantlife_modpack/.gitignore b/mods/plantlife_modpack/.gitignore old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/API.txt b/mods/plantlife_modpack/API.txt old mode 100755 new mode 100644 index 730ea67c..8075865f --- a/mods/plantlife_modpack/API.txt +++ b/mods/plantlife_modpack/API.txt @@ -262,8 +262,8 @@ biome = { -- node. Useful in snow biomes to keep -- objects from spawning in snow that's on the -- wrong surface for that object. - avoid_nodes = {table}, -- List of nodes or groups to avoid when - -- spawning. + avoid_nodes = {table}, -- List of nodes to avoid when spawning. + -- Groups are not supported here. avoid_radius = num, -- how much distance to leave between the -- object to be added and the objects to be -- avoided. If this or the avoid_nodes value diff --git a/mods/plantlife_modpack/LICENSE b/mods/plantlife_modpack/LICENSE old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/README b/mods/plantlife_modpack/README old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/depends.txt b/mods/plantlife_modpack/along_shore/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/init.lua b/mods/plantlife_modpack/along_shore/init.lua old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/credit_textures.txt b/mods/plantlife_modpack/along_shore/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png b/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png b/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png b/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png b/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png b/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/depends.txt b/mods/plantlife_modpack/bushes/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/init.lua b/mods/plantlife_modpack/bushes/init.lua old mode 100755 new mode 100644 index d92187b8..99fa116e --- a/mods/plantlife_modpack/bushes/init.lua +++ b/mods/plantlife_modpack/bushes/init.lua @@ -161,8 +161,7 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type) local right_here = {x=pos.x, y=pos.y+1, z=pos.z} local above_right_here = {x=pos.x, y=pos.y+2, z=pos.z} - --local bush_branch_type = math.random(1,3) - --local bush_branch_type = 2 + local bush_branch_type = 2 -- MM: I'm not sure if it's slower now than before... if dir ~= 5 and leaf_type == 1 then diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/blank.png b/mods/plantlife_modpack/bushes/textures/old & unused/blank.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/depends.txt b/mods/plantlife_modpack/bushes_classic/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/image_credits.txt b/mods/plantlife_modpack/bushes_classic/image_credits.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/init.lua b/mods/plantlife_modpack/bushes_classic/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/locale/de.txt b/mods/plantlife_modpack/bushes_classic/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/locale/template.txt b/mods/plantlife_modpack/bushes_classic/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/nodes.lua b/mods/plantlife_modpack/bushes_classic/nodes.lua old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/depends.txt b/mods/plantlife_modpack/cavestuff/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/init.lua b/mods/plantlife_modpack/cavestuff/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/mapgen.lua b/mods/plantlife_modpack/cavestuff/mapgen.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/nodes.lua b/mods/plantlife_modpack/cavestuff/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/copyright.txt b/mods/plantlife_modpack/copyright.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/crafting.lua b/mods/plantlife_modpack/dryplants/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/depends.txt b/mods/plantlife_modpack/dryplants/depends.txt old mode 100755 new mode 100644 index 7e9f4724..af0befc0 --- a/mods/plantlife_modpack/dryplants/depends.txt +++ b/mods/plantlife_modpack/dryplants/depends.txt @@ -1,3 +1,3 @@ default -farming +farming? plants_lib \ No newline at end of file diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/juncus.lua b/mods/plantlife_modpack/dryplants/juncus.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/meadowvariation.lua b/mods/plantlife_modpack/dryplants/meadowvariation.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/models/plantlike.obj b/mods/plantlife_modpack/dryplants/models/plantlike.obj new file mode 100644 index 00000000..3a9ac439 --- /dev/null +++ b/mods/plantlife_modpack/dryplants/models/plantlike.obj @@ -0,0 +1,56 @@ +# Blender v2.69 (sub 0) OBJ File: 'plantlike.blend' +# www.blender.org +mtllib plantlike.mtl +o Plane.001 +v 0.347299 -0.500000 -0.359699 +v -0.347299 -0.500000 0.359699 +v 0.347299 0.500000 -0.359699 +v -0.347299 0.500000 0.359699 +v 0.359699 -0.500000 0.347299 +v -0.359699 -0.500000 -0.347299 +v 0.359699 0.500000 0.347299 +v -0.359699 0.500000 -0.347299 +v -0.347659 -0.500000 0.359352 +v -0.347659 0.500000 0.359351 +v 0.346940 0.500000 -0.360046 +v 0.346940 -0.500000 -0.360046 +v -0.359352 -0.500000 -0.347659 +v -0.359351 0.500000 -0.347659 +v 0.360046 0.500000 0.346939 +v 0.360046 -0.500000 0.346940 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.999500 0.499625 +vt 0.999500 0.000000 +vt 0.999750 0.000000 +vt 0.999750 0.499625 +vt 0.999250 0.499625 +vt 0.999251 0.000000 +vt 0.999750 0.999250 +vt 0.999500 0.999250 +vt 1.000000 0.499625 +vt 1.000000 0.999250 +vt 0.499625 0.999500 +vt 0.000000 0.999500 +vt 0.000000 0.999250 +vt 0.499625 0.999250 +vt 0.999251 0.999250 +vt 0.499625 0.999251 +vt 0.999250 0.999250 +vt 0.999250 0.999500 +usemtl None +s off +f 2/1 1/2 3/3 4/4 +f 6/1 5/2 7/3 8/4 +f 9/2 10/3 11/4 12/1 +f 13/2 14/3 15/4 16/1 +f 5/5 6/6 13/7 16/8 +f 7/6 5/5 16/9 15/10 +f 8/8 7/11 15/12 14/5 +f 6/13 8/14 14/11 13/8 +f 1/15 2/16 9/17 12/18 +f 3/5 1/12 12/19 11/9 +f 4/20 3/21 11/22 10/15 +f 2/2 4/13 10/8 9/7 diff --git a/mods/plantlife_modpack/dryplants/moregrass.lua b/mods/plantlife_modpack/dryplants/moregrass.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/reed.lua b/mods/plantlife_modpack/dryplants/reed.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/reedmace.lua b/mods/plantlife_modpack/dryplants/reedmace.lua old mode 100755 new mode 100644 index 81c54d19..ff7b0c78 --- a/mods/plantlife_modpack/dryplants/reedmace.lua +++ b/mods/plantlife_modpack/dryplants/reedmace.lua @@ -57,21 +57,21 @@ abstract_dryplants.grow_reedmace_water = function(pos) local pos_04 = {x = pos.x, y = pos.y + 4, z = pos.z} minetest.add_entity(pos_01, "dryplants:reedmace_water_entity") if minetest.get_node(pos_02).name == "air" then -- bug fix - if minetest.get_node(pos_03).name ~= "air" then - minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) - elseif minetest.get_node(pos_04).name ~= "air" then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) - elseif size == 1 then - minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) - elseif size == 2 then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) - elseif size == 3 then - if spikes == 1 then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_3_spikes"}) - else - minetest.set_node(pos_02, {name="dryplants:reedmace_height_3"}) - end - end + if minetest.get_node(pos_03).name ~= "air" then + minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) + elseif minetest.get_node(pos_04).name ~= "air" then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) + elseif size == 1 then + minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) + elseif size == 2 then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) + elseif size == 3 then + if spikes == 1 then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_3_spikes"}) + else + minetest.set_node(pos_02, {name="dryplants:reedmace_height_3"}) + end + end end end @@ -125,7 +125,7 @@ minetest.register_node("dryplants:reedmace_top", { minetest.register_node("dryplants:reedmace_height_2", { description = "Reedmace, height: 2", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_2.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -148,7 +148,7 @@ minetest.register_node("dryplants:reedmace_height_2", { minetest.register_node("dryplants:reedmace_height_3", { description = "Reedmace, height: 3", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_3.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -171,7 +171,7 @@ minetest.register_node("dryplants:reedmace_height_3", { minetest.register_node("dryplants:reedmace_height_3_spikes", { description = "Reedmace, height: 3 & Spikes", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_3_spikes.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -308,9 +308,10 @@ minetest.register_node("dryplants:reedmace_water", { -- REEDMACE WATER ENTITY ----------------------------------------------------------------------------------------------- minetest.register_entity("dryplants:reedmace_water_entity",{ - visual = "wielditem", - visual_size = {x=2/3, y=2/3, z=2/3}, - textures = {"dryplants:reedmace_water"}, + visual = "mesh", + mesh = "plantlike.obj", + visual_size = {x=10, y=10}, + textures = {"dryplants_reedmace_water.png"}, collisionbox = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}, on_punch = function(self, puncher) if puncher:is_player() and puncher:get_inventory() then diff --git a/mods/plantlife_modpack/dryplants/settings.txt b/mods/plantlife_modpack/dryplants/settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_1.png b/mods/plantlife_modpack/dryplants/textures/default_grass_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_2.png b/mods/plantlife_modpack/dryplants/textures/default_grass_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_3.png b/mods/plantlife_modpack/dryplants/textures/default_grass_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_4.png b/mods/plantlife_modpack/dryplants/textures/default_grass_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_5.png b/mods/plantlife_modpack/dryplants/textures/default_grass_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png b/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png old mode 100755 new mode 100644 index aebaacee..790fb798 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 old mode 100755 new mode 100644 index 4d675930..cad5c753 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reed.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png old mode 100755 new mode 100644 index fc097818..ae6c7fc0 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 old mode 100755 new mode 100644 index 89c495c7..5e2a4702 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_height_3_spikes.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3_spikes.png old mode 100755 new mode 100644 index a9f2152c..16a29b33 Binary files a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3_spikes.png and b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3_spikes.png differ diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png b/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old3.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/crafting.lua b/mods/plantlife_modpack/ferns/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/depends.txt b/mods/plantlife_modpack/ferns/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/fern.lua b/mods/plantlife_modpack/ferns/fern.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/gianttreefern.lua b/mods/plantlife_modpack/ferns/gianttreefern.lua old mode 100755 new mode 100644 index 5b6feee9..130a0b10 --- a/mods/plantlife_modpack/ferns/gianttreefern.lua +++ b/mods/plantlife_modpack/ferns/gianttreefern.lua @@ -97,7 +97,7 @@ end minetest.register_node("ferns:tree_fern_leaves_giant", { description = "Tree Fern Crown (Dicksonia)", drawtype = "plantlike", - visual_scale = math.sqrt(8), + visual_scale = math.sqrt(64), wield_scale = {x=0.175, y=0.175, z=0.175}, paramtype = "light", tiles = {"ferns_fern_tree_giant.png"}, diff --git a/mods/plantlife_modpack/ferns/horsetail.lua b/mods/plantlife_modpack/ferns/horsetail.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/init.lua b/mods/plantlife_modpack/ferns/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/settings.lua b/mods/plantlife_modpack/ferns/settings.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_5.png b/mods/plantlife_modpack/ferns/textures/ferns_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_6.png b/mods/plantlife_modpack/ferns/textures/ferns_6.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_7.png b/mods/plantlife_modpack/ferns/textures/ferns_7.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_8.png b/mods/plantlife_modpack/ferns/textures/ferns_8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_fern.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png old mode 100755 new mode 100644 index d8ec7383..0c3094fd 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 old mode 100755 new mode 100644 index 4270e967..39a1d026 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 old mode 100755 new mode 100644 index 10c9f668..0304897e 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 old mode 100755 new mode 100644 index f8f1189b..59580bbc 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png b/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/comb.png b/mods/plantlife_modpack/ferns/textures/old/comb.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_old2.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/treefern.lua b/mods/plantlife_modpack/ferns/treefern.lua old mode 100755 new mode 100644 index 2878f57f..4c3e6b0d --- a/mods/plantlife_modpack/ferns/treefern.lua +++ b/mods/plantlife_modpack/ferns/treefern.lua @@ -42,7 +42,7 @@ end minetest.register_node("ferns:tree_fern_leaves", { description = "Tree Fern Crown (Dicksonia)", drawtype = "plantlike", - visual_scale = 2, + visual_scale = math.sqrt(32), paramtype = "light", paramtype2 = "facedir", --tiles = {"[combine:32x32:0,0=top_left.png:0,16=bottom_left.png:16,0=top_right.png:16,16=bottom_right.png"}, @@ -70,7 +70,7 @@ minetest.register_node("ferns:tree_fern_leaves", { }) minetest.register_node("ferns:tree_fern_leaves_02", { drawtype = "plantlike", - visual_scale = 2, + visual_scale = math.sqrt(32), paramtype = "light", tiles = {"ferns_fern_big.png"}, walkable = false, diff --git a/mods/plantlife_modpack/flowers_plus/depends.txt b/mods/plantlife_modpack/flowers_plus/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/flowers-changelog.txt b/mods/plantlife_modpack/flowers_plus/flowers-changelog.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/init.lua b/mods/plantlife_modpack/flowers_plus/init.lua old mode 100755 new mode 100644 index 132375e2..5bf563d4 --- a/mods/plantlife_modpack/flowers_plus/init.lua +++ b/mods/plantlife_modpack/flowers_plus/init.lua @@ -94,7 +94,7 @@ for i in ipairs(lilies_list) do place_pos = pt.above end - if not minetest.is_protected(place_pos, placer:get_player_name()) then + if place_pos and not minetest.is_protected(place_pos, placer:get_player_name()) then local nodename = "default:cobble" -- if this block appears, something went....wrong :-) if place_pos == nil then return itemstack end -- pour éviter crash avec nénuphare @@ -118,7 +118,7 @@ for i in ipairs(lilies_list) do elseif waterlily == 8 then nodename = "flowers:waterlily_s4" end -minetest.set_node(place_pos, {name = nodename, param2 = math.random(0,3) }) + minetest.set_node(place_pos, {name = nodename, param2 = math.random(0,3) }) else local fdir = minetest.dir_to_facedir(placer:get_look_dir()) minetest.set_node(place_pos, {name = "flowers:waterlily", param2 = fdir}) diff --git a/mods/plantlife_modpack/flowers_plus/locale/de.txt b/mods/plantlife_modpack/flowers_plus/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/locale/template.txt b/mods/plantlife_modpack/flowers_plus/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/junglegrass/init.lua b/mods/plantlife_modpack/junglegrass/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/modpack.txt b/mods/plantlife_modpack/modpack.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/depends.txt b/mods/plantlife_modpack/molehills/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/init.lua b/mods/plantlife_modpack/molehills/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/molehills_settings.txt b/mods/plantlife_modpack/molehills/molehills_settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/molehills_dirt.png b/mods/plantlife_modpack/molehills/textures/molehills_dirt.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/molehills_side.png b/mods/plantlife_modpack/molehills/textures/molehills_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/compat.lua b/mods/plantlife_modpack/mushroom/compat.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/crafting.lua b/mods/plantlife_modpack/mushroom/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/depends.txt b/mods/plantlife_modpack/mushroom/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/init.lua b/mods/plantlife_modpack/mushroom/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png b/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png b/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png b/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_red.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/blossom.lua b/mods/plantlife_modpack/nature_classic/blossom.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/config.lua b/mods/plantlife_modpack/nature_classic/config.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/depends.txt b/mods/plantlife_modpack/nature_classic/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/global_function.lua b/mods/plantlife_modpack/nature_classic/global_function.lua old mode 100755 new mode 100644 index 659e29d5..6d640c2a --- a/mods/plantlife_modpack/nature_classic/global_function.lua +++ b/mods/plantlife_modpack/nature_classic/global_function.lua @@ -1,16 +1,21 @@ local NODE_YOUNG = "young" +local SETTING_TRUE = "true" +local SETTING_FALSE = "false" + +local YOUTH_DELAY = 5 + nature = {} local function set_young_node(pos) local meta = minetest.get_meta(pos) - meta:set_string(NODE_YOUNG, "true") - minetest.after(5, - function(pos) - local meta = minetest.get_meta(pos) - meta:set_string(NODE_YOUNG, "false") - end, + meta:set_string(NODE_YOUNG, SETTING_TRUE) + minetest.after(YOUTH_DELAY, + function(pos) + local meta = minetest.get_meta(pos) + meta:set_string(NODE_YOUNG, SETTING_FALSE) + end, pos) end @@ -18,26 +23,26 @@ local function is_not_young(pos) local meta = minetest.get_meta(pos) local young = meta:get_string(NODE_YOUNG) - return young ~= "true" + return young ~= SETTING_TRUE end function nature:grow_node(pos, nodename) if pos ~= nil then - local light_enough = minetest.get_node_light(pos, nil) - >= MINIMUM_GROWTH_LIGHT + local light_enough = minetest.get_node_light(pos, nil) + >= MINIMUM_GROWTH_LIGHT - if is_not_young(pos) and light_enough then - minetest.remove_node(pos) - minetest.set_node(pos, { name = nodename }) - set_young_node(pos) + if is_not_young(pos) and light_enough then + minetest.remove_node(pos) + minetest.set_node(pos, { name = nodename }) + set_young_node(pos) - minetest.log("info", nodename .. " has grown at " .. pos.x .. "," - .. pos.y .. "," .. pos.z) - end + minetest.log("info", nodename .. " has grown at " .. pos.x .. "," + .. pos.y .. "," .. pos.z) + end end end function nature:is_near_water(pos) - return minetest.find_node_near(pos, DISTANCE_FROM_WATER, - { "default:water_source" }) ~= nil or DISTANCE_FROM_WATER == -1 + return DISTANCE_FROM_WATER == -1 or minetest.find_node_near(pos, DISTANCE_FROM_WATER, + { "default:water_source" }) ~= nil end diff --git a/mods/plantlife_modpack/nature_classic/init.lua b/mods/plantlife_modpack/nature_classic/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png b/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/depends.txt b/mods/plantlife_modpack/plants_lib/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/init.lua b/mods/plantlife_modpack/plants_lib/init.lua old mode 100755 new mode 100644 index f38f1852..b92bd4b0 --- a/mods/plantlife_modpack/plants_lib/init.lua +++ b/mods/plantlife_modpack/plants_lib/init.lua @@ -10,10 +10,25 @@ plantslib = {} +plantslib.blocklist_aircheck = {} +plantslib.blocklist_no_aircheck = {} + +plantslib.surface_nodes_aircheck = {} +plantslib.surface_nodes_no_aircheck = {} + +plantslib.surfaceslist_aircheck = {} +plantslib.surfaceslist_no_aircheck = {} + +plantslib.actioncount_aircheck = {} +plantslib.actioncount_no_aircheck = {} + +plantslib.actionslist_aircheck = {} +plantslib.actionslist_no_aircheck = {} + plantslib.modpath = minetest.get_modpath("plants_lib") plantslib.intllib_modpath = minetest.get_modpath("intllib") -plantslib.total_no_air_check_calls = 0 +plantslib.total_no_aircheck_calls = 0 local S if plantslib.intllib_modpath then @@ -98,12 +113,6 @@ function plantslib:set_defaults(biome) biome.facedir = biome.facedir or 0 end -plantslib.surfaces_list = {} -plantslib.actions_list = {} - -plantslib.surfaces_list_noaircheck = {} -plantslib.actions_list_noaircheck = {} - local function search_table(t, s) for i = 1, #t do if t[i] == s then return true end @@ -133,12 +142,12 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) if biomedef.check_air == false then plantslib:dbg("Register no-air-check mapgen hook: "..dump(nodes_or_function_or_model)) - plantslib.actions_list_noaircheck[#plantslib.actions_list_noaircheck + 1] = { biomedef, nodes_or_function_or_model } + plantslib.actionslist_no_aircheck[#plantslib.actionslist_no_aircheck + 1] = { biomedef, nodes_or_function_or_model } local s = biomedef.surface if type(s) == "string" then - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list_noaircheck, s) then - plantslib.surfaces_list_noaircheck[#plantslib.surfaces_list_noaircheck + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_no_aircheck, s) then + plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored no-air-check registration for undefined surface node: "..dump(s)) @@ -146,9 +155,9 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) else for i = 1, #biomedef.surface do local s = biomedef.surface[i] - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list_noaircheck, s) then - plantslib.surfaces_list_noaircheck[#plantslib.surfaces_list_noaircheck + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_no_aircheck, s) then + plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored no-air-check registration for undefined surface node: "..dump(s)) @@ -157,12 +166,12 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) end else plantslib:dbg("Register with-air-checking mapgen hook: "..dump(nodes_or_function_or_model)) - plantslib.actions_list[#plantslib.actions_list + 1] = { biomedef, nodes_or_function_or_model } + plantslib.actionslist_aircheck[#plantslib.actionslist_aircheck + 1] = { biomedef, nodes_or_function_or_model } local s = biomedef.surface if type(s) == "string" then - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list, s) then - plantslib.surfaces_list[#plantslib.surfaces_list + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_aircheck, s) then + plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored with-air-checking registration for undefined surface node: "..dump(s)) @@ -170,9 +179,9 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) else for i = 1, #biomedef.surface do local s = biomedef.surface[i] - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list, s) then - plantslib.surfaces_list[#plantslib.surfaces_list + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_aircheck, s) then + plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored with-air-checking registration for undefined surface node: "..dump(s)) @@ -182,283 +191,243 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) end end +function plantslib:populate_surfaces(biome, nodes_or_function_or_model, snodes, checkair) + + plantslib:set_defaults(biome) + + -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. + + local in_biome_nodes = {} + local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) + + for i = 1, #snodes do + local pos = snodes[i] + local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } + local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) + local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) + local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) + local biome_surfaces_string = dump(biome.surface) + local surface_ok = false + + if not biome.depth then + local dest_node = minetest.get_node(pos) + if string.find(biome_surfaces_string, dest_node.name) then + surface_ok = true + else + if string.find(biome_surfaces_string, "group:") then + for j = 1, #biome.surface do + if string.find(biome.surface[j], "^group:") + and minetest.get_item_group(dest_node.name, biome.surface[j]) then + surface_ok = true + break + end + end + end + end + elseif not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name) then + surface_ok = true + end + + if surface_ok + and (not checkair or minetest.get_node(p_top).name == "air") + and pos.y >= biome.min_elevation + and pos.y <= biome.max_elevation + and noise1 > biome.plantlife_limit + and noise2 <= biome.temp_min + and noise2 >= biome.temp_max + and noise3 <= biome.humidity_min + and noise3 >= biome.humidity_max + and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) + and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) + and math.random(1,100) > biome.rarity + and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) + then + in_biome_nodes[#in_biome_nodes + 1] = pos + end + end + + -- filter stage 2 - find places within that biome area to place the plants. + + local num_in_biome_nodes = #in_biome_nodes + + if num_in_biome_nodes > 0 then + for i = 1, math.min(biome.max_count, num_in_biome_nodes) do + local tries = 0 + local spawned = false + while tries < 2 and not spawned do + local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] + if biome.spawn_replace_node then + pos.y = pos.y-1 + end + local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } + + if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then + if biome.delete_above then + minetest.remove_node(p_top) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) + end + + if biome.delete_above_surround then + minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) + minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) + minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) + minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) + + minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) + minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) + end + + if biome.spawn_replace_node then + minetest.remove_node(pos) + end + + local objtype = type(nodes_or_function_or_model) + + if objtype == "table" then + if nodes_or_function_or_model.axiom then + plantslib:generate_tree(pos, nodes_or_function_or_model) + spawned = true + else + local fdir = nil + if biome.random_facedir then + fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) + end + minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) + spawned = true + end + elseif objtype == "string" and + minetest.registered_nodes[nodes_or_function_or_model] then + local fdir = nil + if biome.random_facedir then + fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) + end + minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) + spawned = true + elseif objtype == "function" then + nodes_or_function_or_model(pos) + spawned = true + elseif objtype == "string" and pcall(loadstring(("return %s(...)"): + format(nodes_or_function_or_model)),pos) then + spawned = true + else + plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") + end + else + tries = tries + 1 + end + end + end + end +end + -- Primary mapgen spawner, for mods that can work with air checking enabled on -- a surface during the initial map read stage. -function plantslib:generate_block_with_air_checking(minp, maxp, blockseed) - return function(minp, maxp, blockseed) +function plantslib:generate_block_with_air_checking(dtime) - -- use the block hash as a unique key into the surface_nodes - -- table, so that we can write the table thread-safely. + if #plantslib.blocklist_aircheck > 0 then - local blockhash = minetest.hash_node_position(minp) - local search_area = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaces_list) + local minp = plantslib.blocklist_aircheck[1][1] + local maxp = plantslib.blocklist_aircheck[1][2] - -- search the generated block for surfaces + -- use the block hash as a unique key into the surface nodes + -- tables, so that we can write the tables thread-safely. - local surface_nodes = {} - surface_nodes.blockhash = {} + local blockhash = minetest.hash_node_position(minp) - for i = 1, #search_area do - local pos = search_area[i] - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - if minetest.get_node(p_top).name == "air" then - surface_nodes.blockhash[#surface_nodes.blockhash + 1] = pos - end - end + if not plantslib.surface_nodes_aircheck.blockhash then - for action = 1, #plantslib.actions_list do - local biome = plantslib.actions_list[action][1] - local nodes_or_function_or_model = plantslib.actions_list[action][2] + local search_area = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_aircheck) - plantslib:set_defaults(biome) + -- search the generated block for air-bounded surfaces - -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. + plantslib.surface_nodes_aircheck.blockhash = {} - local in_biome_nodes = {} - local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) - - for i = 1, #surface_nodes.blockhash do - local pos = surface_nodes.blockhash[i] - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) - local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) - local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) - local biome_surfaces_string = dump(biome.surface) - if ((not biome.depth and string.find(biome_surfaces_string, minetest.get_node(pos).name)) or (biome.depth and not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name))) - and minetest.get_node(p_top).name == "air" - and pos.y >= biome.min_elevation - and pos.y <= biome.max_elevation - and noise1 > biome.plantlife_limit - and noise2 <= biome.temp_min - and noise2 >= biome.temp_max - and noise3 <= biome.humidity_min - and noise3 >= biome.humidity_max - and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) - and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) - and math.random(1,100) > biome.rarity - and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) - then - in_biome_nodes[#in_biome_nodes + 1] = pos + for i = 1, #search_area do + local pos = search_area[i] + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + if minetest.get_node(p_top).name == "air" then + plantslib.surface_nodes_aircheck.blockhash[#plantslib.surface_nodes_aircheck.blockhash + 1] = pos end end + plantslib.actioncount_aircheck.blockhash = 1 - -- filter stage 2 - find places within that biome area to place the plants. - - local num_in_biome_nodes = #in_biome_nodes - - if num_in_biome_nodes > 0 then - for i = 1, math.min(biome.max_count, num_in_biome_nodes) do - local tries = 0 - local spawned = false - while tries < 2 and not spawned do - local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] - if biome.spawn_replace_node then - pos.y = pos.y-1 - end - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - - if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then - if biome.delete_above then - minetest.remove_node(p_top) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) - end - - if biome.delete_above_surround then - minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) - - minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) - end - - if biome.spawn_replace_node then - minetest.remove_node(pos) - end - - local objtype = type(nodes_or_function_or_model) - - if objtype == "table" then - if nodes_or_function_or_model.axiom then - plantslib:generate_tree(pos, nodes_or_function_or_model) - spawned = true - else - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) - spawned = true - end - elseif objtype == "string" and - minetest.registered_nodes[nodes_or_function_or_model] then - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) - spawned = true - elseif objtype == "function" then - nodes_or_function_or_model(pos) - spawned = true - elseif objtype == "string" and pcall(loadstring(("return %s(...)"): - format(nodes_or_function_or_model)),pos) then - spawned = true - else - plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") - end - else - tries = tries + 1 - end - end + else + if plantslib.actioncount_aircheck.blockhash <= #plantslib.actionslist_aircheck then + -- [1] is biome, [2] is node/function/model + plantslib:populate_surfaces( + plantslib.actionslist_aircheck[plantslib.actioncount_aircheck.blockhash][1], + plantslib.actionslist_aircheck[plantslib.actioncount_aircheck.blockhash][2], + plantslib.surface_nodes_aircheck.blockhash, true) + plantslib.actioncount_aircheck.blockhash = plantslib.actioncount_aircheck.blockhash + 1 + else + if plantslib.surface_nodes_aircheck.blockhash then + table.remove(plantslib.blocklist_aircheck, 1) + plantslib.surface_nodes_aircheck.blockhash = nil end end end end end --- Separate copy of the mapgen spawner, for mods that require disabling of +-- Secondary mapgen spawner, for mods that require disabling of -- checking for air during the initial map read stage. -function plantslib:generate_block_no_air_check(minp, maxp, blockseed) - return function(minp, maxp, blockseed) +function plantslib:generate_block_no_aircheck(dtime) - -- use the block hash as a unique key into the surface_nodes - -- table, so that we can write the table thread-safely. + if #plantslib.blocklist_no_aircheck > 0 then - local blockhash = minetest.hash_node_position(minp) + local minp = plantslib.blocklist_no_aircheck[1][1] + local maxp = plantslib.blocklist_no_aircheck[1][2] - -- read the generated block into the block cache, filtered for "surfaces" + local blockhash = minetest.hash_node_position(minp) - local surface_nodes = {} - surface_nodes.blockhash = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaces_list_noaircheck) + if not plantslib.surface_nodes_no_aircheck.blockhash then - for action = 1, #plantslib.actions_list_noaircheck do - local biome = plantslib.actions_list_noaircheck[action][1] - local nodes_or_function_or_model = plantslib.actions_list_noaircheck[action][2] + -- directly read the block to be searched into the chunk cache - plantslib:set_defaults(biome) + plantslib.surface_nodes_no_aircheck.blockhash = + minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_no_aircheck) + plantslib.actioncount_no_aircheck.blockhash = 1 - -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. - - local in_biome_nodes = {} - local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) - - for i = 1, #surface_nodes.blockhash do - local pos = surface_nodes.blockhash[i] - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) - local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) - local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) - local biome_surfaces_string = dump(biome.surface) - if ((not biome.depth and string.find(biome_surfaces_string, minetest.get_node(pos).name)) or (biome.depth and not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name))) - and pos.y >= biome.min_elevation - and pos.y <= biome.max_elevation - and noise1 > biome.plantlife_limit - and noise2 <= biome.temp_min - and noise2 >= biome.temp_max - and noise3 <= biome.humidity_min - and noise3 >= biome.humidity_max - and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) - and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) - and math.random(1,100) > biome.rarity - and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) - then - in_biome_nodes[#in_biome_nodes + 1] = pos - end - end - - -- filter stage 2 - find places within that biome area to place the plants. - - local num_in_biome_nodes = #in_biome_nodes - - if num_in_biome_nodes > 0 then - for i = 1, math.min(biome.max_count, num_in_biome_nodes) do - local tries = 0 - local spawned = false - while tries < 2 and not spawned do - local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] - if biome.spawn_replace_node then - pos.y = pos.y-1 - end - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - - if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then - if biome.delete_above then - minetest.remove_node(p_top) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) - end - - if biome.delete_above_surround then - minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) - - minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) - end - - if biome.spawn_replace_node then - minetest.remove_node(pos) - end - - local objtype = type(nodes_or_function_or_model) - - if objtype == "table" then - if nodes_or_function_or_model.axiom then - plantslib:generate_tree(pos, nodes_or_function_or_model) - spawned = true - else - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) - spawned = true - end - elseif objtype == "string" and - minetest.registered_nodes[nodes_or_function_or_model] then - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) - spawned = true - elseif objtype == "function" then - nodes_or_function_or_model(pos) - spawned = true - elseif objtype == "string" and pcall(loadstring(("return %s(...)"): - format(nodes_or_function_or_model)),pos) then - spawned = true - else - plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") - end - else - tries = tries + 1 - end - end + else + if plantslib.actioncount_no_aircheck.blockhash <= #plantslib.actionslist_no_aircheck then + plantslib:populate_surfaces( + plantslib.actionslist_no_aircheck[plantslib.actioncount_no_aircheck.blockhash][1], + plantslib.actionslist_no_aircheck[plantslib.actioncount_no_aircheck.blockhash][2], + plantslib.surface_nodes_no_aircheck.blockhash, false) + plantslib.actioncount_no_aircheck.blockhash = plantslib.actioncount_no_aircheck.blockhash + 1 + else + if plantslib.surface_nodes_no_aircheck.blockhash then + table.remove(plantslib.blocklist_no_aircheck, 1) + plantslib.surface_nodes_no_aircheck.blockhash = nil end end end end end --- And here we actually register the mapgen hooks with the engine +-- "Record" the chunks being generated by the core mapgen -minetest.register_on_generated( - plantslib:generate_block_with_air_checking(minp, maxp, blockseed) -) +minetest.register_on_generated(function(minp, maxp, blockseed) + plantslib.blocklist_aircheck[#plantslib.blocklist_aircheck + 1] = { minp, maxp } +end) -minetest.register_on_generated( - plantslib:generate_block_no_air_check(minp, maxp, blockseed) -) +minetest.register_on_generated(function(minp, maxp, blockseed) + plantslib.blocklist_no_aircheck[#plantslib.blocklist_no_aircheck + 1] = { minp, maxp } +end) + +-- "Play" them back, populating them with new stuff in the process + +minetest.register_globalstep(function(dtime) + plantslib:generate_block_with_air_checking(dtime) +end) + +minetest.register_globalstep(function(dtime) + plantslib:generate_block_no_aircheck(dtime) +end) -- The spawning ABM @@ -530,8 +499,8 @@ function plantslib:spawn_on_surfaces(sd,sp,sr,sc,ss,sa) if biome.random_facedir then fdir = math.random(biome.random_facedir[1],biome.random_facedir[2]) end - if type(spawn_plants) == "string" then - assert(loadstring(spawn_plants.."(...)"))(pos) + if type(biome.spawn_plants) == "string" then + assert(loadstring(biome.spawn_plants.."(...)"))(pos) elseif not biome.spawn_on_side and not biome.spawn_on_bottom and not biome.spawn_replace_node then if n_top.name == "air" then minetest.set_node(p_top, { name = plant_to_spawn, param2 = fdir }) @@ -714,7 +683,7 @@ end print("[Plants Lib] Loaded") minetest.after(0, function() - print("[Plants Lib] Registered a total of "..(#plantslib.surfaces_list)+(#plantslib.surfaces_list_noaircheck).." surface types to be evaluated, spread") - print("[Plants Lib] across "..#plantslib.actions_list.." actions with air-checking and "..#plantslib.actions_list_noaircheck.." actions without.") + print("[Plants Lib] Registered a total of "..(#plantslib.surfaceslist_aircheck)+(#plantslib.surfaceslist_no_aircheck).." surface types to be evaluated, spread") + print("[Plants Lib] across "..#plantslib.actionslist_aircheck.." actions with air-checking and "..#plantslib.actionslist_no_aircheck.." actions without.") end) diff --git a/mods/plantlife_modpack/plants_lib/locale/de.txt b/mods/plantlife_modpack/plants_lib/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/locale/template.txt b/mods/plantlife_modpack/plants_lib/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/depends.txt b/mods/plantlife_modpack/poisonivy/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/init.lua b/mods/plantlife_modpack/poisonivy/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/locale/de.txt b/mods/plantlife_modpack/poisonivy/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/locale/template.txt b/mods/plantlife_modpack/poisonivy/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/crafting.lua b/mods/plantlife_modpack/trunks/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/depends.txt b/mods/plantlife_modpack/trunks/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/generating.lua b/mods/plantlife_modpack/trunks/generating.lua old mode 100755 new mode 100644 index 6b5b897c..77962134 --- a/mods/plantlife_modpack/trunks/generating.lua +++ b/mods/plantlife_modpack/trunks/generating.lua @@ -1,8 +1,8 @@ -- Code by Mossmanikin, Neuromancer, and others local function clone_node(name) - node2={} - node=minetest.registered_nodes[name] + local node2 = {} + local node = minetest.registered_nodes[name] for k,v in pairs(node) do node2[k]=v end diff --git a/mods/plantlife_modpack/trunks/init.lua b/mods/plantlife_modpack/trunks/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/nodes.lua b/mods/plantlife_modpack/trunks/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/credit_textures.txt b/mods/plantlife_modpack/trunks/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss.png b/mods/plantlife_modpack/trunks/textures/trunks_moss.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png b/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png b/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/trunks_settings.txt b/mods/plantlife_modpack/trunks/trunks_settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/depends.txt b/mods/plantlife_modpack/vines/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/init.lua b/mods/plantlife_modpack/vines/init.lua old mode 100755 new mode 100644 index b4638c26..97cc252c --- a/mods/plantlife_modpack/vines/init.lua +++ b/mods/plantlife_modpack/vines/init.lua @@ -243,7 +243,7 @@ minetest.register_abm({ chance = 8, action = function(pos, node, active_object_count, active_object_count_wider) if minetest.find_node_near(pos, 5, "group:tree") == nil then - walldir = node.param2 + local walldir = node.param2 minetest.add_node(pos, {name=node.name.."_rotten", param2 = walldir}) end end @@ -257,7 +257,7 @@ minetest.register_abm({ local p = {x=pos.x, y=pos.y-1, z=pos.z} local n = minetest.get_node(p) if n.name == "air" then - walldir = node.param2 + local walldir = node.param2 minetest.add_node(p, {name=node.name, param2 = walldir}) end end diff --git a/mods/plantlife_modpack/vines/readme.txt b/mods/plantlife_modpack/vines/readme.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/bottomvine.png b/mods/plantlife_modpack/vines/textures/new/bottomvine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/sidevine.png b/mods/plantlife_modpack/vines/textures/new/sidevine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/vinesdead.png b/mods/plantlife_modpack/vines/textures/new/vinesdead.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/vineslive.png b/mods/plantlife_modpack/vines/textures/new/vineslive.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/shears.png b/mods/plantlife_modpack/vines/textures/shears.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_item.png b/mods/plantlife_modpack/vines/textures/vines_item.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_root.png b/mods/plantlife_modpack/vines/textures/vines_root.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_rope.png b/mods/plantlife_modpack/vines/textures/vines_rope.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_rope_end.png b/mods/plantlife_modpack/vines/textures/vines_rope_end.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_side.png b/mods/plantlife_modpack/vines/textures/vines_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_side_rotten.png b/mods/plantlife_modpack/vines/textures/vines_side_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_vine.png b/mods/plantlife_modpack/vines/textures/vines_vine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png b/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_willow.png b/mods/plantlife_modpack/vines/textures/vines_willow.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png b/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/depends.txt b/mods/plantlife_modpack/woodsoils/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/generating.lua b/mods/plantlife_modpack/woodsoils/generating.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/init.lua b/mods/plantlife_modpack/woodsoils/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/nodes.lua b/mods/plantlife_modpack/woodsoils/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/credit_textures.txt b/mods/plantlife_modpack/woodsoils/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png b/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/depends.txt b/mods/plantlife_modpack/youngtrees/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/init.lua b/mods/plantlife_modpack/youngtrees/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/bamboo.png b/mods/plantlife_modpack/youngtrees/textures/bamboo.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png b/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png old mode 100755 new mode 100644