diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/3dmushrooms/depends.txt b/3dmushrooms/depends.txt old mode 100644 new mode 100755 diff --git a/3dmushrooms/init.lua b/3dmushrooms/init.lua old mode 100644 new mode 100755 index 369da9c..55fd531 --- a/3dmushrooms/init.lua +++ b/3dmushrooms/init.lua @@ -5,17 +5,6 @@ mushroom = {} -minetest.override_item("flowers:mushroom_fertile_brown", { - drawtype = "mesh", - mesh = "3dmushrooms.obj", - tiles = {"3dmushrooms_brown.png"}, - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} - }, - inventory_image = "3dmushrooms_brown_inv.png" -}) - minetest.override_item("flowers:mushroom_brown", { drawtype = "mesh", mesh = "3dmushrooms.obj", @@ -27,17 +16,6 @@ minetest.override_item("flowers:mushroom_brown", { inventory_image = "3dmushrooms_brown_inv.png" }) -minetest.override_item("flowers:mushroom_fertile_red", { - drawtype = "mesh", - mesh = "3dmushrooms.obj", - tiles = {"3dmushrooms_red.png"}, - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} - }, - inventory_image = "3dmushrooms_red_inv.png" -}) - minetest.override_item("flowers:mushroom_red", { drawtype = "mesh", mesh = "3dmushrooms.obj", @@ -52,17 +30,17 @@ minetest.override_item("flowers:mushroom_red", { -- aliases to the default mushrooms minetest.register_alias("mushroom:brown", "flowers:mushroom_brown") -minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_fertile_brown") -minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_spores_brown") -minetest.register_alias("mushroom:spore2", "flowers:mushroom_spores_brown") +minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_brown") +minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_brown") +minetest.register_alias("mushroom:spore2", "flowers:mushroom_brown") minetest.register_alias("mushroom:brown_essence", "flowers:mushroom_brown") minetest.register_alias("mushroom:red", "flowers:mushroom_red") -minetest.register_alias("mushroom:red_natural", "flowers:mushroom_fertile_red") -minetest.register_alias("mushroom:spore_red", "flowers:mushroom_spores_red") -minetest.register_alias("mushroom:spore1", "flowers:mushroom_spores_red") +minetest.register_alias("mushroom:red_natural", "flowers:mushroom_red") +minetest.register_alias("mushroom:spore_red", "flowers:mushroom_red") +minetest.register_alias("mushroom:spore1", "flowers:mushroom_red") minetest.register_alias("mushroom:poison", "flowers:mushroom_red") minetest.register_alias("mushroom:identifier", "default:mese_crystal_fragment") -print("[3D Mushrooms] loaded.") +minetest.log("action", "[3D Mushrooms] loaded.") diff --git a/3dmushrooms/models/3dmushrooms.obj b/3dmushrooms/models/3dmushrooms.obj old mode 100644 new mode 100755 diff --git a/3dmushrooms/textures/3dmushrooms_brown.png b/3dmushrooms/textures/3dmushrooms_brown.png index c36f524..14776be 100644 Binary files a/3dmushrooms/textures/3dmushrooms_brown.png and b/3dmushrooms/textures/3dmushrooms_brown.png differ diff --git a/3dmushrooms/textures/3dmushrooms_brown_inv.png b/3dmushrooms/textures/3dmushrooms_brown_inv.png index c9a7b3c..f9c63ce 100644 Binary files a/3dmushrooms/textures/3dmushrooms_brown_inv.png and b/3dmushrooms/textures/3dmushrooms_brown_inv.png differ diff --git a/3dmushrooms/textures/3dmushrooms_red.png b/3dmushrooms/textures/3dmushrooms_red.png index dc80e32..07bcc6f 100644 Binary files a/3dmushrooms/textures/3dmushrooms_red.png and b/3dmushrooms/textures/3dmushrooms_red.png differ diff --git a/3dmushrooms/textures/3dmushrooms_red_inv.png b/3dmushrooms/textures/3dmushrooms_red_inv.png index 796f867..dfff6b4 100644 Binary files a/3dmushrooms/textures/3dmushrooms_red_inv.png and b/3dmushrooms/textures/3dmushrooms_red_inv.png differ diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/along_shore/depends.txt b/along_shore/depends.txt old mode 100644 new mode 100755 diff --git a/along_shore/init.lua b/along_shore/init.lua old mode 100644 new mode 100755 index 719d324..8b957dd --- a/along_shore/init.lua +++ b/along_shore/init.lua @@ -5,5 +5,5 @@ local mname = "along_shore" ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/along_shore/textures/along_shore_seaweed_1Darker.png b/along_shore/textures/along_shore_seaweed_1Darker.png old mode 100644 new mode 100755 index b5bd99c..76cafa0 Binary files a/along_shore/textures/along_shore_seaweed_1Darker.png and b/along_shore/textures/along_shore_seaweed_1Darker.png differ diff --git a/along_shore/textures/credit_textures.txt b/along_shore/textures/credit_textures.txt old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/LillyPad3x16.png b/along_shore/textures/old/LillyPad3x16.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/MultiLilly16x.png b/along_shore/textures/old/MultiLilly16x.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_empty.png b/along_shore/textures/old/along_shore_empty.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_lilypads_1.png b/along_shore/textures/old/along_shore_lilypads_1.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_lilypads_2.png b/along_shore/textures/old/along_shore_lilypads_2.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_lilypads_3.png b/along_shore/textures/old/along_shore_lilypads_3.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_lilypads_4.png b/along_shore/textures/old/along_shore_lilypads_4.png old mode 100644 new mode 100755 index 9b6387f..d1c4199 Binary files a/along_shore/textures/old/along_shore_lilypads_4.png and b/along_shore/textures/old/along_shore_lilypads_4.png differ diff --git a/along_shore/textures/old/along_shore_pondscum_1.png b/along_shore/textures/old/along_shore_pondscum_1.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/along_shore_seaweed_1.png b/along_shore/textures/old/along_shore_seaweed_1.png old mode 100644 new mode 100755 index 7595ebc..4240d79 Binary files a/along_shore/textures/old/along_shore_seaweed_1.png and b/along_shore/textures/old/along_shore_seaweed_1.png differ diff --git a/along_shore/textures/old/along_shore_seaweed_2.png b/along_shore/textures/old/along_shore_seaweed_2.png old mode 100644 new mode 100755 index 0b24730..4c32033 Binary files a/along_shore/textures/old/along_shore_seaweed_2.png and b/along_shore/textures/old/along_shore_seaweed_2.png differ diff --git a/along_shore/textures/old/along_shore_seaweed_3.png b/along_shore/textures/old/along_shore_seaweed_3.png old mode 100644 new mode 100755 index d9b7f43..4710727 Binary files a/along_shore/textures/old/along_shore_seaweed_3.png and b/along_shore/textures/old/along_shore_seaweed_3.png differ diff --git a/along_shore/textures/old/along_shore_seaweed_4.png b/along_shore/textures/old/along_shore_seaweed_4.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/flowers_seaweed.png b/along_shore/textures/old/flowers_seaweed.png old mode 100644 new mode 100755 index 7595ebc..4240d79 Binary files a/along_shore/textures/old/flowers_seaweed.png and b/along_shore/textures/old/flowers_seaweed.png differ diff --git a/along_shore/textures/old/flowers_waterlily.png b/along_shore/textures/old/flowers_waterlily.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/flowers_waterlily_22.5.png b/along_shore/textures/old/flowers_waterlily_22.5.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/flowers_waterlily_45.png b/along_shore/textures/old/flowers_waterlily_45.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/flowers_waterlily_67.5.png b/along_shore/textures/old/flowers_waterlily_67.5.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/lillyPad5x16.png b/along_shore/textures/old/lillyPad5x16.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/lillypad3Flower16x.png b/along_shore/textures/old/lillypad3Flower16x.png old mode 100644 new mode 100755 diff --git a/along_shore/textures/old/pondscum16xc.png b/along_shore/textures/old/pondscum16xc.png old mode 100644 new mode 100755 diff --git a/bushes/depends.txt b/bushes/depends.txt old mode 100644 new mode 100755 diff --git a/bushes/init.lua b/bushes/init.lua old mode 100644 new mode 100755 index 3dc9801..631d7b5 --- a/bushes/init.lua +++ b/bushes/init.lua @@ -4,15 +4,15 @@ -- bush leaf textures are cc-by-sa 3.0. from VannessaE's moretrees mod. (Leaf texture created by RealBadAngel or VanessaE) -- Branch textures created by Neuromancer. -- Licence for Code and Non-Bush leaf code is WTFPL. - - abstract_bushes = {} + + abstract_bushes = {} minetest.register_node("bushes:youngtree2_bottom", { - description = "Young Tree 2 (bottom)", + description = "Young Tree 2 (bottom)", drawtype="nodebox", tiles = {"bushes_youngtree2trunk.png"}, inventory_image = "bushes_youngtree2trunk_inv.png", - wield_image = "bushes_youngtree2trunk_inv.png", + wield_image = "bushes_youngtree2trunk_inv.png", paramtype = "light", walkable = false, is_ground_content = true, @@ -27,7 +27,7 @@ node_box = { sounds = default.node_sound_leaves_defaults(), drop = 'default:stick' }) - + local BushBranchCenter = { {1,1}, {3,2} } for i in pairs(BushBranchCenter) do local Num = BushBranchCenter[i][1] @@ -56,8 +56,8 @@ for i in pairs(BushBranchCenter) do sunlight_propagates = true, groups = { -- tree=1, -- MM: disabled because some recipes use group:tree for trunks - snappy=3, - flammable=2, + snappy=3, + flammable=2, leaves=1 }, sounds = default.node_sound_leaves_defaults(), @@ -77,8 +77,8 @@ for i in pairs(BushBranchSide) do --[[bottom]]"bushes_branches_center_"..TexNum..".png", --[[right]] "bushes_branches_left_"..TexNum..".png", --[[left]] "bushes_branches_right_"..TexNum..".png", -- MM: We could also mirror the previous here, ---[[back]] "bushes_branches_center_"..TexNum..".png",-- unless U really want 'em 2 B different ---[[front]] "bushes_branches_right_"..TexNum..".png" +--[[back]] "bushes_branches_center_"..TexNum..".png",-- unless U really want 'em 2 B different +--[[front]] "bushes_branches_right_"..TexNum..".png" }, node_box = { type = "fixed", @@ -99,8 +99,8 @@ for i in pairs(BushBranchSide) do sunlight_propagates = true, groups = { -- tree=1, -- MM: disabled because some recipes use group:tree for trunks - snappy=3, - flammable=2, + snappy=3, + flammable=2, leaves=1 }, sounds = default.node_sound_leaves_defaults(), @@ -110,23 +110,23 @@ end local BushLeafNode = { {1}, {2}} for i in pairs(BushLeafNode) do - local Num = BushLeafNode[i][1] + local Num = BushLeafNode[i][1] minetest.register_node("bushes:BushLeaves"..Num, { description = "Bush Leaves "..Num, drawtype = "allfaces_optional", tiles = {"bushes_leaves_"..Num..".png"}, paramtype = "light", - groups = { -- MM: Should we add leafdecay? + groups = { -- MM: Should we add leafdecay? snappy=3, flammable=2, attached_node=1 }, - sounds = default.node_sound_leaves_defaults(), - }) + sounds = default.node_sound_leaves_defaults(), + }) end abstract_bushes.grow_bush = function(pos) - local leaf_type = math.random(1,2) + local leaf_type = math.random(1,2) local bush_side_height = math.random(0,1) local chance_of_bush_node_right = math.random(1,10) if chance_of_bush_node_right> 5 then @@ -144,25 +144,25 @@ abstract_bushes.grow_bush = function(pos) bush_side_height = math.random(0,1) local front_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z+1} abstract_bushes.grow_bush_node(front_pos,2,leaf_type) - end + end local chance_of_bush_node_back = math.random(1,10) if chance_of_bush_node_back> 5 then bush_side_height = math.random(0,1) local back_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z-1} abstract_bushes.grow_bush_node(back_pos,0,leaf_type) end - + abstract_bushes.grow_bush_node(pos,5,leaf_type) end 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 = 2 - + -- MM: I'm not sure if it's slower now than before... if dir ~= 5 and leaf_type == 1 then bush_branch_type = 2 @@ -178,7 +178,7 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type) bush_branch_type = 3 dir = 1 end - + if minetest.get_node(right_here).name == "air" -- instead of check_air = true, or minetest.get_node(right_here).name == "default:junglegrass" then minetest.set_node(right_here, {name="bushes:bushbranches"..bush_branch_type , param2=dir}) @@ -196,10 +196,11 @@ end biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", "stoneage:grass_with_silex", "sumpf:peat", - "sumpf:sumpf" + "sumpf:sumpf", + "default:dirt_with_dry_grass" }, max_count = 15, --10,15 rarity = 101 - 4, --3,4 @@ -207,21 +208,21 @@ biome_lib:register_generate_plant({ plantlife_limit = -0.9, }, abstract_bushes.grow_bush -) +) abstract_bushes.grow_youngtree2 = function(pos) - local height = math.random(4,5) - abstract_bushes.grow_youngtree_node2(pos,height) + local height = math.random(4,5) + return abstract_bushes.grow_youngtree_node2(pos,height) end abstract_bushes.grow_youngtree_node2 = function(pos, height) - - + + 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 two_above_right_here = {x=pos.x, y=pos.y+3, z=pos.z} local three_above_right_here = {x=pos.x, y=pos.y+4, z=pos.z} - + if minetest.get_node(right_here).name == "air" -- instead of check_air = true, or minetest.get_node(right_here).name == "default:junglegrass" then if height == 4 then @@ -234,17 +235,17 @@ abstract_bushes.grow_youngtree_node2 = function(pos, height) minetest.set_node(three_above_right_here, {name="bushes:BushLeaves1" }) minetest.set_node(three_above_right_here_south, {name="bushes:BushLeaves1" }) end - + end end - biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", "stoneage:grass_with_silex", "sumpf:peat", - "sumpf:sumpf" + "sumpf:sumpf", + "default:dirt_with_dry_grass" }, max_count = 55, --10,15 rarity = 101 - 4, --3,4 @@ -252,6 +253,6 @@ biome_lib:register_generate_plant({ plantlife_limit = -0.9, }, abstract_bushes.grow_youngtree2 -) - +) + --http://dev.minetest.net/Node_Drawtypes diff --git a/bushes/textures/bushes_branches_center_1.png b/bushes/textures/bushes_branches_center_1.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_branches_center_2.png b/bushes/textures/bushes_branches_center_2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_branches_left_1.png b/bushes/textures/bushes_branches_left_1.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_branches_left_2.png b/bushes/textures/bushes_branches_left_2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_branches_right_1.png b/bushes/textures/bushes_branches_right_1.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_branches_right_2.png b/bushes/textures/bushes_branches_right_2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_leaves_1.png b/bushes/textures/bushes_leaves_1.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_leaves_2.png b/bushes/textures/bushes_leaves_2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_youngtree2trunk.png b/bushes/textures/bushes_youngtree2trunk.png old mode 100644 new mode 100755 diff --git a/bushes/textures/bushes_youngtree2trunk_inv.png b/bushes/textures/bushes_youngtree2trunk_inv.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BlockBranch1.png b/bushes/textures/old & unused/BlockBranch1.png index 28fe91f..3b54a4d 100644 Binary files a/bushes/textures/old & unused/BlockBranch1.png and b/bushes/textures/old & unused/BlockBranch1.png differ diff --git a/bushes/textures/old & unused/BlockBranch1L.png b/bushes/textures/old & unused/BlockBranch1L.png index 1d8a8e2..5159c95 100644 Binary files a/bushes/textures/old & unused/BlockBranch1L.png and b/bushes/textures/old & unused/BlockBranch1L.png differ diff --git a/bushes/textures/old & unused/BlockBranch1R.png b/bushes/textures/old & unused/BlockBranch1R.png index 514b888..4885237 100644 Binary files a/bushes/textures/old & unused/BlockBranch1R.png and b/bushes/textures/old & unused/BlockBranch1R.png differ diff --git a/bushes/textures/old & unused/BushBranches1.png b/bushes/textures/old & unused/BushBranches1.png index 5bb2b46..e3c4220 100644 Binary files a/bushes/textures/old & unused/BushBranches1.png and b/bushes/textures/old & unused/BushBranches1.png differ diff --git a/bushes/textures/old & unused/BushBranches1sm.png b/bushes/textures/old & unused/BushBranches1sm.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranches1sm2.png b/bushes/textures/old & unused/BushBranches1sm2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranches1sm3.png b/bushes/textures/old & unused/BushBranches1sm3.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranches1sm4.png b/bushes/textures/old & unused/BushBranches1sm4.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranchesCenter.png b/bushes/textures/old & unused/BushBranchesCenter.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranchesSide1.png b/bushes/textures/old & unused/BushBranchesSide1.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/BushBranchesSide2.png b/bushes/textures/old & unused/BushBranchesSide2.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/blank.png b/bushes/textures/old & unused/blank.png old mode 100644 new mode 100755 diff --git a/bushes/textures/old & unused/moretrees_pine_leaves3.png b/bushes/textures/old & unused/moretrees_pine_leaves3.png old mode 100644 new mode 100755 diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua old mode 100644 new mode 100755 index c672975..e667b28 --- a/bushes_classic/cooking.lua +++ b/bushes_classic/cooking.lua @@ -12,6 +12,17 @@ minetest.register_craft({ -- Sugar +-- Use the sugar from farming redo if available +if minetest.get_modpath("farming") and farming.mod == "redo" then + --[[ We really have nothing to do to use farming:sugar in the recipes + because they use the generic group group:food_sugar + which is added to the groups list of farming:sugar by the mod "food". + --]] + + --Temporary alias to replace existing bushes:sugar in the world + minetest.register_alias("bushes:sugar", "farming:sugar") + +else minetest.register_craftitem(":bushes:sugar", { description = S("Sugar"), inventory_image = "bushes_sugar.png", @@ -25,6 +36,7 @@ minetest.register_craft({ { "default:papyrus", "default:papyrus" }, }, }) +end for i, berry in ipairs(bushes_classic.bushes) do local desc = bushes_classic.bushes_descriptions[i] diff --git a/bushes_classic/depends.txt b/bushes_classic/depends.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/image_credits.txt b/bushes_classic/image_credits.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/init.lua b/bushes_classic/init.lua old mode 100644 new mode 100755 index 021f569..31edc93 --- a/bushes_classic/init.lua +++ b/bushes_classic/init.lua @@ -56,4 +56,4 @@ biome_lib:spawn_on_surfaces({ minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry") -print(S("[Bushes] Loaded.")) +minetest.log("action", S("[Bushes] Loaded.")) diff --git a/bushes_classic/locale/de.txt b/bushes_classic/locale/de.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/locale/fr.txt b/bushes_classic/locale/fr.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/locale/template.txt b/bushes_classic/locale/template.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/locale/tr.txt b/bushes_classic/locale/tr.txt old mode 100644 new mode 100755 diff --git a/bushes_classic/models/bushes_basket_empty.obj b/bushes_classic/models/bushes_basket_empty.obj old mode 100644 new mode 100755 diff --git a/bushes_classic/models/bushes_basket_full.obj b/bushes_classic/models/bushes_basket_full.obj old mode 100644 new mode 100755 diff --git a/bushes_classic/models/bushes_bush.obj b/bushes_classic/models/bushes_bush.obj old mode 100644 new mode 100755 diff --git a/bushes_classic/nodes.lua b/bushes_classic/nodes.lua old mode 100644 new mode 100755 index 352e2a9..af72452 --- a/bushes_classic/nodes.lua +++ b/bushes_classic/nodes.lua @@ -11,7 +11,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger) -- find out which bush type we are dealing with local bush_name = "" local can_harvest = false - + if oldnode.name == "bushes:fruitless_bush" then -- this bush has not grown fruits yet (but will eventually) bush_name = oldmetadata.fields.bush_type diff --git a/bushes_classic/textures/bushes_basket.png b/bushes_classic/textures/bushes_basket.png old mode 100644 new mode 100755 index 4384fba..32e5ebc Binary files a/bushes_classic/textures/bushes_basket.png and b/bushes_classic/textures/bushes_basket.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_blackberry.png b/bushes_classic/textures/bushes_basket_pie_blackberry.png old mode 100644 new mode 100755 index 83ee63c..ca2d229 Binary files a/bushes_classic/textures/bushes_basket_pie_blackberry.png and b/bushes_classic/textures/bushes_basket_pie_blackberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_blueberry.png b/bushes_classic/textures/bushes_basket_pie_blueberry.png old mode 100644 new mode 100755 index 9f9b2c6..0432a05 Binary files a/bushes_classic/textures/bushes_basket_pie_blueberry.png and b/bushes_classic/textures/bushes_basket_pie_blueberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_gooseberry.png b/bushes_classic/textures/bushes_basket_pie_gooseberry.png old mode 100644 new mode 100755 index d6bdff4..22be1c1 Binary files a/bushes_classic/textures/bushes_basket_pie_gooseberry.png and b/bushes_classic/textures/bushes_basket_pie_gooseberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png old mode 100644 new mode 100755 index ff271ff..3106274 Binary files a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png and b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_raspberry.png b/bushes_classic/textures/bushes_basket_pie_raspberry.png old mode 100644 new mode 100755 index 3bfd42f..aebd126 Binary files a/bushes_classic/textures/bushes_basket_pie_raspberry.png and b/bushes_classic/textures/bushes_basket_pie_raspberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_strawberry.png b/bushes_classic/textures/bushes_basket_pie_strawberry.png old mode 100644 new mode 100755 index c27b0b3..2545cff Binary files a/bushes_classic/textures/bushes_basket_pie_strawberry.png and b/bushes_classic/textures/bushes_basket_pie_strawberry.png differ diff --git a/bushes_classic/textures/bushes_blackberry.png b/bushes_classic/textures/bushes_blackberry.png old mode 100644 new mode 100755 index 76b742b..ea91c58 Binary files a/bushes_classic/textures/bushes_blackberry.png and b/bushes_classic/textures/bushes_blackberry.png differ diff --git a/bushes_classic/textures/bushes_blackberry_pie_cooked.png b/bushes_classic/textures/bushes_blackberry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_blackberry_pie_raw.png b/bushes_classic/textures/bushes_blackberry_pie_raw.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_blackberry_pie_slice.png b/bushes_classic/textures/bushes_blackberry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_blueberry.png b/bushes_classic/textures/bushes_blueberry.png old mode 100644 new mode 100755 index e15047f..b150a65 Binary files a/bushes_classic/textures/bushes_blueberry.png and b/bushes_classic/textures/bushes_blueberry.png differ diff --git a/bushes_classic/textures/bushes_blueberry_pie_cooked.png b/bushes_classic/textures/bushes_blueberry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_blueberry_pie_raw.png b/bushes_classic/textures/bushes_blueberry_pie_raw.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_blueberry_pie_slice.png b/bushes_classic/textures/bushes_blueberry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_bush_blackberry.png b/bushes_classic/textures/bushes_bush_blackberry.png old mode 100644 new mode 100755 index fa76c61..cf94e6d Binary files a/bushes_classic/textures/bushes_bush_blackberry.png and b/bushes_classic/textures/bushes_bush_blackberry.png differ diff --git a/bushes_classic/textures/bushes_bush_blueberry.png b/bushes_classic/textures/bushes_bush_blueberry.png old mode 100644 new mode 100755 index 3a305ca..3ad7ae5 Binary files a/bushes_classic/textures/bushes_bush_blueberry.png and b/bushes_classic/textures/bushes_bush_blueberry.png differ diff --git a/bushes_classic/textures/bushes_bush_fruitless.png b/bushes_classic/textures/bushes_bush_fruitless.png old mode 100644 new mode 100755 index ffa2e0a..2205c6e Binary files a/bushes_classic/textures/bushes_bush_fruitless.png and b/bushes_classic/textures/bushes_bush_fruitless.png differ diff --git a/bushes_classic/textures/bushes_bush_gooseberry.png b/bushes_classic/textures/bushes_bush_gooseberry.png old mode 100644 new mode 100755 index 52eca60..9e222bf Binary files a/bushes_classic/textures/bushes_bush_gooseberry.png and b/bushes_classic/textures/bushes_bush_gooseberry.png differ diff --git a/bushes_classic/textures/bushes_bush_raspberry.png b/bushes_classic/textures/bushes_bush_raspberry.png old mode 100644 new mode 100755 index 01809de..9ec7a34 Binary files a/bushes_classic/textures/bushes_bush_raspberry.png and b/bushes_classic/textures/bushes_bush_raspberry.png differ diff --git a/bushes_classic/textures/bushes_bush_strawberry.png b/bushes_classic/textures/bushes_bush_strawberry.png old mode 100644 new mode 100755 index a5060e2..1875d71 Binary files a/bushes_classic/textures/bushes_bush_strawberry.png and b/bushes_classic/textures/bushes_bush_strawberry.png differ diff --git a/bushes_classic/textures/bushes_gooseberry.png b/bushes_classic/textures/bushes_gooseberry.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_gooseberry_pie_cooked.png b/bushes_classic/textures/bushes_gooseberry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_gooseberry_pie_raw.png b/bushes_classic/textures/bushes_gooseberry_pie_raw.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_gooseberry_pie_slice.png b/bushes_classic/textures/bushes_gooseberry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png b/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_raw.png b/bushes_classic/textures/bushes_mixed_berry_pie_raw.png old mode 100644 new mode 100755 index 6486989..6d0a1d5 Binary files a/bushes_classic/textures/bushes_mixed_berry_pie_raw.png and b/bushes_classic/textures/bushes_mixed_berry_pie_raw.png differ diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_slice.png b/bushes_classic/textures/bushes_mixed_berry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_raspberry.png b/bushes_classic/textures/bushes_raspberry.png old mode 100644 new mode 100755 index 034fd48..c25bbff Binary files a/bushes_classic/textures/bushes_raspberry.png and b/bushes_classic/textures/bushes_raspberry.png differ diff --git a/bushes_classic/textures/bushes_raspberry_pie_cooked.png b/bushes_classic/textures/bushes_raspberry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_raspberry_pie_raw.png b/bushes_classic/textures/bushes_raspberry_pie_raw.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_raspberry_pie_slice.png b/bushes_classic/textures/bushes_raspberry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_strawberry.png b/bushes_classic/textures/bushes_strawberry.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_strawberry_pie_cooked.png b/bushes_classic/textures/bushes_strawberry_pie_cooked.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_strawberry_pie_raw.png b/bushes_classic/textures/bushes_strawberry_pie_raw.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_strawberry_pie_slice.png b/bushes_classic/textures/bushes_strawberry_pie_slice.png old mode 100644 new mode 100755 diff --git a/bushes_classic/textures/bushes_sugar.png b/bushes_classic/textures/bushes_sugar.png old mode 100644 new mode 100755 index 726196b..ceda6a0 Binary files a/bushes_classic/textures/bushes_sugar.png and b/bushes_classic/textures/bushes_sugar.png differ diff --git a/cavestuff/depends.txt b/cavestuff/depends.txt old mode 100644 new mode 100755 index 3a7daa1..eacc44c --- a/cavestuff/depends.txt +++ b/cavestuff/depends.txt @@ -1,2 +1,3 @@ default +watershed? diff --git a/cavestuff/init.lua b/cavestuff/init.lua old mode 100644 new mode 100755 index f2bed1a..d5209cb --- a/cavestuff/init.lua +++ b/cavestuff/init.lua @@ -9,4 +9,4 @@ dofile(minetest.get_modpath("cavestuff").."/mapgen.lua") ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") diff --git a/cavestuff/mapgen.lua b/cavestuff/mapgen.lua old mode 100644 new mode 100755 index a91a2f0..fc890b3 --- a/cavestuff/mapgen.lua +++ b/cavestuff/mapgen.lua @@ -28,7 +28,7 @@ minetest.register_on_generated(function(minp, maxp, seed) break end end - + if ground_y then local p = {x=x,y=ground_y+1,z=z} local nn = minetest.get_node(p).name @@ -44,7 +44,7 @@ minetest.register_on_generated(function(minp, maxp, seed) end end end - + end end end diff --git a/cavestuff/models/cavestuff_pebble.obj b/cavestuff/models/cavestuff_pebble.obj old mode 100644 new mode 100755 diff --git a/cavestuff/nodes.lua b/cavestuff/nodes.lua old mode 100644 new mode 100755 index dc537cf..89c8807 --- a/cavestuff/nodes.lua +++ b/cavestuff/nodes.lua @@ -64,7 +64,7 @@ minetest.register_node("cavestuff:desert_pebble_2",{ tiles = {"default_desert_stone.png"}, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, stone=1, not_in_creative__inventory=1}, + groups = {cracky=3, stone=1, not_in_creative_inventory=1}, selection_box = cbox, collision_box = cbox, sounds = default.node_sound_stone_defaults(), @@ -88,10 +88,10 @@ minetest.register_node("cavestuff:stalactite_1",{ {-0.037500,-0.837500,0.037500,0.037500,0.500000,-0.025000}, } }, - + on_place = function(itemstack, placer, pointed_thing) local pt = pointed_thing - if minetest.get_node(pt.under).name=="default:stone" + if minetest.get_node(pt.under).name=="default:stone" and minetest.get_node({x=pt.under.x, y=pt.under.y-1, z=pt.under.z}).name=="air" and minetest.get_node({x=pt.under.x, y=pt.under.y-2, z=pt.under.z}).name=="air" then minetest.set_node({x=pt.under.x, y=pt.under.y-1, z=pt.under.z}, {name="cavestuff:stalactite_"..math.random(1,3)}) diff --git a/cavestuff/textures/undergrowth_desert_pebble.png b/cavestuff/textures/undergrowth_desert_pebble.png old mode 100644 new mode 100755 diff --git a/cavestuff/textures/undergrowth_pebble.png b/cavestuff/textures/undergrowth_pebble.png old mode 100644 new mode 100755 diff --git a/copyright.txt b/copyright.txt old mode 100644 new mode 100755 diff --git a/dryplants/crafting.lua b/dryplants/crafting.lua old mode 100644 new mode 100755 index 69154b5..af06153 --- a/dryplants/crafting.lua +++ b/dryplants/crafting.lua @@ -2,10 +2,10 @@ -- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt ----------------------------------------------------------------------------------------------- -- by Mossmanikin --- License (everything): WTFPL +-- License (everything): WTFPL -- Looked at code from: darkage, default, farming, sickle, stairs -- Dependencies: default, farming --- Supports: flint, stoneage, sumpf +-- Supports: flint, stoneage, sumpf ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- @@ -220,7 +220,7 @@ for i in pairs(ReeD) do recipe = { {slab}, } - }) + }) ----------------------------------------------------------------------------------------------- -- Roof Corner ----------------------------------------------------------------------------------------------- @@ -343,7 +343,7 @@ minetest.register_craft({ burntime = 2, }) ----------------------------------------------------------------------------------------------- --- Dandelion Leave +-- Dandelion Leave ----------------------------------------------------------------------------------------------- --[[minetest.register_craftitem("dryplants:dandelion_leave", { description = "Dandelion Leave", diff --git a/dryplants/depends.txt b/dryplants/depends.txt old mode 100644 new mode 100755 diff --git a/dryplants/init.lua b/dryplants/init.lua old mode 100644 new mode 100755 index e6baa7a..e78fa10 --- a/dryplants/init.lua +++ b/dryplants/init.lua @@ -7,10 +7,10 @@ local mname = "dryplants" -- textures & ideas partly by Neuromancer -- License (everything): WTFPL --- Contains code from: default, farming +-- Contains code from: default, farming -- Looked at code from: darkage, sickle, stairs -- Dependencies: default, farming, biome_lib --- Supports: +-- Supports: ----------------------------------------------------------------------------------------------- abstract_dryplants = {} @@ -190,14 +190,14 @@ minetest.register_abm({ interval = GRASS_REGROWING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle chance = 100/GRASS_REGROWING_CHANCE, action = function(pos) - -- Only become dirt with grass if no cut grass or hay lies on top - local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) - if above.name ~= "dryplants:grass" and above.name ~= "dryplants:hay" then + -- Only become dirt with grass if no cut grass or hay lies on top + local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) + if above.name ~= "dryplants:grass" and above.name ~= "dryplants:hay" then minetest.set_node(pos, {name="default:dirt_with_grass"}) - end + end end, }) ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/dryplants/juncus.lua b/dryplants/juncus.lua old mode 100644 new mode 100755 index bfbf23c..8cf3543 --- a/dryplants/juncus.lua +++ b/dryplants/juncus.lua @@ -6,7 +6,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- abstract_dryplants.grow_juncus = function(pos) @@ -92,7 +92,7 @@ minetest.register_node("dryplants:juncus_02", { -- near water or swamp biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", --"default:desert_sand", --"default:sand", "stoneage:grass_with_silex", @@ -113,7 +113,7 @@ biome_lib:register_generate_plant({ -- at dunes/beach biome_lib:register_generate_plant({ surface = { - --"default:dirt_with_grass", + --"default:dirt_with_grass", --"default:desert_sand", "default:sand", --"stoneage:grass_with_silex", diff --git a/dryplants/meadowvariation.lua b/dryplants/meadowvariation.lua old mode 100644 new mode 100755 index 8477657..f94590a --- a/dryplants/meadowvariation.lua +++ b/dryplants/meadowvariation.lua @@ -5,7 +5,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- abstract_dryplants.grow_grass_variation = function(pos) diff --git a/dryplants/models/plantlike.obj b/dryplants/models/plantlike.obj old mode 100644 new mode 100755 diff --git a/dryplants/moregrass.lua b/dryplants/moregrass.lua old mode 100644 new mode 100755 index 88761c8..46add74 --- a/dryplants/moregrass.lua +++ b/dryplants/moregrass.lua @@ -5,7 +5,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- abstract_dryplants.grow_grass = function(pos) diff --git a/dryplants/reed.lua b/dryplants/reed.lua old mode 100644 new mode 100755 index 6f29028..22f0429 --- a/dryplants/reed.lua +++ b/dryplants/reed.lua @@ -4,7 +4,7 @@ -- by Mossmanikin -- License (everything): WTFPL -- Looked at code from: darkage, default, stairs --- Dependencies: default +-- Dependencies: default ----------------------------------------------------------------------------------------------- minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") @@ -93,7 +93,7 @@ if AUTO_ROOF_CORNER == true then interval = 1, chance = 1, action = function(pos) - + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) @@ -106,7 +106,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 1) or (node_north.name == corner and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 0) @@ -114,7 +114,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 2) or (node_east.name == corner and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 1) @@ -122,7 +122,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 3) or (node_south.name == corner and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 2) @@ -138,7 +138,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 3) or (node_north.name == corner_2 and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 2) @@ -146,7 +146,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 0) or (node_east.name == corner_2 and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 3) @@ -154,7 +154,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 1) or (node_south.name == corner_2 and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 0) @@ -227,7 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", { groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) - + ----------------------------------------------------------------------------------------------- -- Wet Reed becomes (dry) Reed over time ----------------------------------------------------------------------------------------------- diff --git a/dryplants/reedmace.lua b/dryplants/reedmace.lua old mode 100644 new mode 100755 index 9547c7a..7a5c4c2 --- a/dryplants/reedmace.lua +++ b/dryplants/reedmace.lua @@ -6,7 +6,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default, trees +-- Looked at code from: default, trees ----------------------------------------------------------------------------------------------- -- NOTES (from wikipedia, some of this might get implemented) @@ -70,7 +70,7 @@ abstract_dryplants.grow_reedmace_water = function(pos) 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 end @@ -212,8 +212,8 @@ minetest.register_node("dryplants:reedmace", { after_destruct = function(pos,oldnode) local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) if node.name == "dryplants:reedmace_top" - or node.name == "dryplants:reedmace_spikes" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) + or node.name == "dryplants:reedmace_spikes" then + minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) minetest.add_item(pos,"dryplants:reedmace_sapling") end end, @@ -241,10 +241,10 @@ minetest.register_node("dryplants:reedmace_bottom", { }, after_destruct = function(pos,oldnode) local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) - if node.name == "dryplants:reedmace" + if node.name == "dryplants:reedmace" or node.name == "dryplants:reedmace_top" - or node.name == "dryplants:reedmace_spikes" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) + or node.name == "dryplants:reedmace_spikes" then + minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) minetest.add_item(pos,"dryplants:reedmace_sapling") end end, @@ -348,7 +348,7 @@ minetest.register_entity("dryplants:reedmace_water_entity",{ -- near water or swamp biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", "default:desert_sand", "stoneage:grass_with_silex", "sumpf:peat", @@ -370,7 +370,7 @@ biome_lib:register_generate_plant({ biome_lib:register_generate_plant({ surface = { "default:dirt", - "default:dirt_with_grass", + "default:dirt_with_grass", --"default:desert_sand", --"stoneage:grass_with_silex", "stoneage:sand_with_silex", diff --git a/dryplants/settings.txt b/dryplants/settings.txt old mode 100644 new mode 100755 index cc12a9c..a9c6369 --- a/dryplants/settings.txt +++ b/dryplants/settings.txt @@ -18,7 +18,7 @@ REEDMACE_FOR_OASES_PER_MAPBLOCK = 35 -- plants per 80x80x80 nodes (absolute ma REEDMACE_FOR_OASES_RARITY = 90 -- percent -- growing of reedmace sapling -REEDMACE_GROWING_TIME = 600 -- seconds +REEDMACE_GROWING_TIME = 16800 -- seconds REEDMACE_GROWING_CHANCE = 5 -- percent @@ -40,8 +40,8 @@ TALL_GRASS_RARITY = 75 -- percent -- short grass becomes dirt with grass again -GRASS_REGROWING_TIME = 1200 -- seconds -GRASS_REGROWING_CHANCE = 5 -- percent +GRASS_REGROWING_TIME = 16800 -- seconds +GRASS_REGROWING_CHANCE = 0.5 -- percent HAY_DRYING_TIME = 3600 -- seconds diff --git a/dryplants/textures/default_grass_1.png b/dryplants/textures/default_grass_1.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/default_grass_2.png b/dryplants/textures/default_grass_2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/default_grass_3.png b/dryplants/textures/default_grass_3.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/default_grass_4.png b/dryplants/textures/default_grass_4.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/default_grass_5.png b/dryplants/textures/default_grass_5.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_grass.png b/dryplants/textures/dryplants_grass.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_grass_short.png b/dryplants/textures/dryplants_grass_short.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_grass_short_side.png b/dryplants/textures/dryplants_grass_short_side.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_hay.png b/dryplants/textures/dryplants_hay.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_juncus_02.png b/dryplants/textures/dryplants_juncus_02.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_juncus_03.png b/dryplants/textures/dryplants_juncus_03.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_juncus_inv.png b/dryplants/textures/dryplants_juncus_inv.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reed.png b/dryplants/textures/dryplants_reed.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reed_wet.png b/dryplants/textures/dryplants_reed_wet.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace.png b/dryplants/textures/dryplants_reedmace.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace_bottom.png b/dryplants/textures/dryplants_reedmace_bottom.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace_height_2.png b/dryplants/textures/dryplants_reedmace_height_2.png old mode 100644 new mode 100755 index 4ac816a..41ce547 Binary files a/dryplants/textures/dryplants_reedmace_height_2.png and b/dryplants/textures/dryplants_reedmace_height_2.png differ diff --git a/dryplants/textures/dryplants_reedmace_height_3.png b/dryplants/textures/dryplants_reedmace_height_3.png old mode 100644 new mode 100755 index 5cbd8d8..b9c2ed1 Binary files a/dryplants/textures/dryplants_reedmace_height_3.png and b/dryplants/textures/dryplants_reedmace_height_3.png differ diff --git a/dryplants/textures/dryplants_reedmace_height_3_spikes.png b/dryplants/textures/dryplants_reedmace_height_3_spikes.png old mode 100644 new mode 100755 index 16a29b3..37b93b5 Binary files a/dryplants/textures/dryplants_reedmace_height_3_spikes.png and b/dryplants/textures/dryplants_reedmace_height_3_spikes.png differ diff --git a/dryplants/textures/dryplants_reedmace_sapling.png b/dryplants/textures/dryplants_reedmace_sapling.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace_spikes.png b/dryplants/textures/dryplants_reedmace_spikes.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace_top.png b/dryplants/textures/dryplants_reedmace_top.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_reedmace_water.png b/dryplants/textures/dryplants_reedmace_water.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/dryplants_sickle.png b/dryplants/textures/dryplants_sickle.png old mode 100644 new mode 100755 index e496062..fe6ea60 Binary files a/dryplants/textures/dryplants_sickle.png and b/dryplants/textures/dryplants_sickle.png differ diff --git a/dryplants/textures/not_in_use/big_pic_8.png b/dryplants/textures/not_in_use/big_pic_8.png old mode 100644 new mode 100755 index aac9520..bd33107 Binary files a/dryplants/textures/not_in_use/big_pic_8.png and b/dryplants/textures/not_in_use/big_pic_8.png differ diff --git a/dryplants/textures/not_in_use/big_pic_9.png b/dryplants/textures/not_in_use/big_pic_9.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png b/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png old mode 100644 new mode 100755 index 0a2cae1..0475397 Binary files a/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png and b/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_left.png b/dryplants/textures/not_in_use/dryplants_juncus_02_left.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_right.png b/dryplants/textures/not_in_use/dryplants_juncus_02_right.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png b/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_left.png b/dryplants/textures/not_in_use/dryplants_juncus_03_left.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_right.png b/dryplants/textures/not_in_use/dryplants_juncus_03_right.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png b/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_01.png b/dryplants/textures/not_in_use/dryplants_reedmace_01.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_02.png b/dryplants/textures/not_in_use/dryplants_reedmace_02.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_03.png b/dryplants/textures/not_in_use/dryplants_reedmace_03.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_04.png b/dryplants/textures/not_in_use/dryplants_reedmace_04.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_left.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_right.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/reedmace2.png b/dryplants/textures/not_in_use/reedmace2.png old mode 100644 new mode 100755 index ca505bd..2780318 Binary files a/dryplants/textures/not_in_use/reedmace2.png and b/dryplants/textures/not_in_use/reedmace2.png differ diff --git a/dryplants/textures/not_in_use/reedmace3.png b/dryplants/textures/not_in_use/reedmace3.png old mode 100644 new mode 100755 index d2ec729..a93d8b4 Binary files a/dryplants/textures/not_in_use/reedmace3.png and b/dryplants/textures/not_in_use/reedmace3.png differ diff --git a/dryplants/textures/not_in_use/reedmace4.png b/dryplants/textures/not_in_use/reedmace4.png old mode 100644 new mode 100755 index 9ba759b..ae5db72 Binary files a/dryplants/textures/not_in_use/reedmace4.png and b/dryplants/textures/not_in_use/reedmace4.png differ diff --git a/dryplants/textures/not_in_use/reedtest.png b/dryplants/textures/not_in_use/reedtest.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/not_in_use/texturing.png b/dryplants/textures/not_in_use/texturing.png old mode 100644 new mode 100755 index 6a18fda..1d7eab6 Binary files a/dryplants/textures/not_in_use/texturing.png and b/dryplants/textures/not_in_use/texturing.png differ diff --git a/dryplants/textures/old/dryplants_grass_short_old3.png b/dryplants/textures/old/dryplants_grass_short_old3.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_grass_short_old4.png b/dryplants/textures/old/dryplants_grass_short_old4.png old mode 100644 new mode 100755 index 6e7611c..ca3d94f Binary files a/dryplants/textures/old/dryplants_grass_short_old4.png and b/dryplants/textures/old/dryplants_grass_short_old4.png differ diff --git a/dryplants/textures/old/dryplants_juncus_02_left_old.png b/dryplants/textures/old/dryplants_juncus_02_left_old.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_juncus_02_right_old.png b/dryplants/textures/old/dryplants_juncus_02_right_old.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_juncus_03_left_old.png b/dryplants/textures/old/dryplants_juncus_03_left_old.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_juncus_03_right_old.png b/dryplants/textures/old/dryplants_juncus_03_right_old.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png b/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_old4.png b/dryplants/textures/old/dryplants_reedmace_bottom_old4.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png b/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_left_old2.png b/dryplants/textures/old/dryplants_reedmace_left_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_old8.png b/dryplants/textures/old/dryplants_reedmace_old8.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_right_old2.png b/dryplants/textures/old/dryplants_reedmace_right_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_spikes_old3.png b/dryplants/textures/old/dryplants_reedmace_spikes_old3.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_top_left_old2.png b/dryplants/textures/old/dryplants_reedmace_top_left_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_top_old3.png b/dryplants/textures/old/dryplants_reedmace_top_old3.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_top_right_old2.png b/dryplants/textures/old/dryplants_reedmace_top_right_old2.png old mode 100644 new mode 100755 diff --git a/dryplants/textures/old/dryplants_reedmace_water_old2.png b/dryplants/textures/old/dryplants_reedmace_water_old2.png old mode 100644 new mode 100755 diff --git a/ferns/crafting.lua b/ferns/crafting.lua old mode 100644 new mode 100755 index 8d8b3ed..10531ad --- a/ferns/crafting.lua +++ b/ferns/crafting.lua @@ -2,7 +2,7 @@ -- Ferns - Crafting 0.0.5 ----------------------------------------------------------------------------------------------- -- (by Mossmanikin) --- License (everything): WTFPL +-- License (everything): WTFPL ----------------------------------------------------------------------------------------------- minetest.register_craft({ type = "shapeless", diff --git a/ferns/depends.txt b/ferns/depends.txt old mode 100644 new mode 100755 diff --git a/ferns/fern.lua b/ferns/fern.lua old mode 100644 new mode 100755 index 51cac8f..2276cd7 --- a/ferns/fern.lua +++ b/ferns/fern.lua @@ -133,8 +133,8 @@ if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a "default:mossycobble", "default:stone_with_coal", "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", + "default:stone_with_tin", + "default:stone_with_silver", "sumpf:sumpf" }, max_count = 1200,--1600, -- maybe too much? :D @@ -146,9 +146,9 @@ if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a --"default:stone_with_mese", --"default:stone_with_gold", --"default:stone_with_diamond", - "moreores:mineral_tin", - "moreores:mineral_silver" - --"moreores:mineral_mithril" + "default:stone_with_tin", + "default:stone_with_silver" + --"default:mineral_mithril" }, near_nodes_size = 2, near_nodes_vertical = 4,--5,--6, @@ -171,8 +171,8 @@ if abstract_ferns.config.lady_ferns_in_groups == true then -- this one is meant "default:mossycobble", "default:stone_with_coal", "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", + "default:stone_with_tin", + "default:stone_with_silver", "sumpf:sumpf" }, max_count = 70, diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua old mode 100644 new mode 100755 index bc6516b..f10b106 --- a/ferns/gianttreefern.lua +++ b/ferns/gianttreefern.lua @@ -5,7 +5,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib -- Looked at code from: 4seasons, default --- Supports: vines +-- Supports: vines ----------------------------------------------------------------------------------------------- assert(abstract_ferns.config.enable_giant_treefern == true) @@ -21,7 +21,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos) end local size = math.random(12,16) -- min of range must be >= 4 - + local leafchecks = { { direction = 3, @@ -242,13 +242,12 @@ minetest.register_node("ferns:fern_trunk_big", { }, groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, sounds = default.node_sound_wood_defaults(), - after_destruct = function(pos,oldnode) - local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) - if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) - minetest.add_item(pos,"ferns:fern_trunk_big") - end - end, + after_dig_node = function(pos, oldnode, oldmetadata, digger) + local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) + if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then + minetest.node_dig({x=pos.x,y=pos.y+1,z=pos.z}, node, digger) + end + end, }) ----------------------------------------------------------------------------------------------- @@ -276,7 +275,7 @@ minetest.register_abm({ chance = 4, action = function(pos, node, _, _) abstract_ferns.grow_giant_tree_fern({x = pos.x, y = pos.y-1, z = pos.z}) - end + end }) ----------------------------------------------------------------------------------------------- diff --git a/ferns/horsetail.lua b/ferns/horsetail.lua old mode 100644 new mode 100755 index b87f1f9..66cb3b6 --- a/ferns/horsetail.lua +++ b/ferns/horsetail.lua @@ -6,7 +6,7 @@ -- Contains code from: biome_lib -- Looked at code from: default, flowers, trees -- Dependencies: biome_lib --- Supports: dryplants, stoneage, sumpf +-- Supports: dryplants, stoneage, sumpf ----------------------------------------------------------------------------------------------- assert(abstract_ferns.config.enable_horsetails == true) diff --git a/ferns/init.lua b/ferns/init.lua old mode 100644 new mode 100755 index b629d5d..80ebd5e --- a/ferns/init.lua +++ b/ferns/init.lua @@ -4,7 +4,7 @@ local version = "0.2.0" local mname = "ferns" -- former "archaeplantae" ----------------------------------------------------------------------------------------------- -- (by Mossmanikin) --- License (everything): WTFPL +-- License (everything): WTFPL ----------------------------------------------------------------------------------------------- abstract_ferns = {} @@ -43,20 +43,20 @@ if run_tests then -- Check node names if abstract_ferns.config.enable_horsetails then - print("[Mod] " ..title.. " Checking horsetail item strings") + minetest.log("action", "[Mod] " ..title.. " Checking horsetail item strings") assert(minetest.registered_items["ferns:horsetail_01"] ~= nil) assert(minetest.registered_items["ferns:horsetail_02"] ~= nil) assert(minetest.registered_items["ferns:horsetail_03"] ~= nil) assert(minetest.registered_items["ferns:horsetail_04"] ~= nil) end if abstract_ferns.config.enable_lady_fern then - print("[Mod] ".. title .." Checking lady fern item strings") + minetest.log("action", "[Mod] ".. title .." Checking lady fern item strings") assert(minetest.registered_items["ferns:fern_01"] ~= nil) assert(minetest.registered_items["ferns:fern_02"] ~= nil) assert(minetest.registered_items["ferns:fern_03"] ~= nil) end if abstract_ferns.config.enable_treefern then - print("[Mod] ".. title .." Checking tree fern item strings") + minetest.log("action", "[Mod] ".. title .." Checking tree fern item strings") assert(minetest.registered_items["ferns:tree_fern_leaves"] ~= nil) assert(minetest.registered_items["ferns:tree_fern_leaves_02"] ~= nil) assert(minetest.registered_items["ferns:fern_trunk"] ~= nil) @@ -65,5 +65,5 @@ if run_tests then end ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/ferns/settings.lua b/ferns/settings.lua old mode 100644 new mode 100755 index 8254fcf..15a224d --- a/ferns/settings.lua +++ b/ferns/settings.lua @@ -1,6 +1,6 @@ -- In case you don't wanna have errors: --- Only change what's behind a "=" (or "--"). +-- Only change what's behind a "=" (or "--"). -- Don't use caps (behind a "="). -- If there's a "false" (behind a "=") you can change it to "true" (and the other way around). diff --git a/ferns/textures/ferns_5.png b/ferns/textures/ferns_5.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_6.png b/ferns/textures/ferns_6.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_7.png b/ferns/textures/ferns_7.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_8.png b/ferns/textures/ferns_8.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern.png b/ferns/textures/ferns_fern.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_big.png b/ferns/textures/ferns_fern_big.png old mode 100644 new mode 100755 index 42deb95..01865a1 Binary files a/ferns/textures/ferns_fern_big.png and b/ferns/textures/ferns_fern_big.png differ diff --git a/ferns/textures/ferns_fern_mid.png b/ferns/textures/ferns_fern_mid.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_tree.png b/ferns/textures/ferns_fern_tree.png old mode 100644 new mode 100755 index 8daeafd..03b95e7 Binary files a/ferns/textures/ferns_fern_tree.png and b/ferns/textures/ferns_fern_tree.png differ diff --git a/ferns/textures/ferns_fern_tree_giant.png b/ferns/textures/ferns_fern_tree_giant.png old mode 100644 new mode 100755 index 2e3adb7..284e505 Binary files a/ferns/textures/ferns_fern_tree_giant.png and b/ferns/textures/ferns_fern_tree_giant.png differ diff --git a/ferns/textures/ferns_fern_tree_inv.png b/ferns/textures/ferns_fern_tree_inv.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_tree_tl.png b/ferns/textures/ferns_fern_tree_tl.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_tree_tr.png b/ferns/textures/ferns_fern_tree_tr.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_trunk.png b/ferns/textures/ferns_fern_trunk.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_trunk_big.png b/ferns/textures/ferns_fern_trunk_big.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_trunk_big_top.png b/ferns/textures/ferns_fern_trunk_big_top.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fern_trunk_top.png b/ferns/textures/ferns_fern_trunk_top.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_ferntuber.png b/ferns/textures/ferns_ferntuber.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_ferntuber_roasted.png b/ferns/textures/ferns_ferntuber_roasted.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fiddlehead.png b/ferns/textures/ferns_fiddlehead.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_fiddlehead_roasted.png b/ferns/textures/ferns_fiddlehead_roasted.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_horsetail_01.png b/ferns/textures/ferns_horsetail_01.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_horsetail_02.png b/ferns/textures/ferns_horsetail_02.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_horsetail_03.png b/ferns/textures/ferns_horsetail_03.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_horsetail_04.png b/ferns/textures/ferns_horsetail_04.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_sapling_tree_fern.png b/ferns/textures/ferns_sapling_tree_fern.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_sapling_tree_fern_giant.png b/ferns/textures/ferns_sapling_tree_fern_giant.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_tree_fern_leave_big.png b/ferns/textures/ferns_tree_fern_leave_big.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_tree_fern_leave_big_cross.png b/ferns/textures/ferns_tree_fern_leave_big_cross.png old mode 100644 new mode 100755 diff --git a/ferns/textures/ferns_tree_fern_leave_big_end.png b/ferns/textures/ferns_tree_fern_leave_big_end.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/archaeplantae_horsetails.png b/ferns/textures/not_in_use/archaeplantae_horsetails.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/big picture 3.png b/ferns/textures/not_in_use/big picture 3.png old mode 100644 new mode 100755 index de344e6..ed7987a Binary files a/ferns/textures/not_in_use/big picture 3.png and b/ferns/textures/not_in_use/big picture 3.png differ diff --git a/ferns/textures/not_in_use/ferns_fern_big_left.png b/ferns/textures/not_in_use/ferns_fern_big_left.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_big_right.png b/ferns/textures/not_in_use/ferns_fern_big_right.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_mid_left.png b/ferns/textures/not_in_use/ferns_fern_mid_left.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_mid_right.png b/ferns/textures/not_in_use/ferns_fern_mid_right.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_tree_bl.png b/ferns/textures/not_in_use/ferns_fern_tree_bl.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_tree_br.png b/ferns/textures/not_in_use/ferns_fern_tree_br.png old mode 100644 new mode 100755 diff --git a/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png b/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/archaeplantae_fern_old4.png b/ferns/textures/old/archaeplantae_fern_old4.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/comb.png b/ferns/textures/old/comb.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_5_old.png b/ferns/textures/old/ferns_5_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_6_old.png b/ferns/textures/old/ferns_6_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_7_old.png b/ferns/textures/old/ferns_7_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_fern_big_old.png b/ferns/textures/old/ferns_fern_big_old.png old mode 100644 new mode 100755 index d17ed11..3ebc911 Binary files a/ferns/textures/old/ferns_fern_big_old.png and b/ferns/textures/old/ferns_fern_big_old.png differ diff --git a/ferns/textures/old/ferns_fern_mid_old.png b/ferns/textures/old/ferns_fern_mid_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_fern_tree_old.png b/ferns/textures/old/ferns_fern_tree_old.png old mode 100644 new mode 100755 index 4599672..73e784f Binary files a/ferns/textures/old/ferns_fern_tree_old.png and b/ferns/textures/old/ferns_fern_tree_old.png differ diff --git a/ferns/textures/old/ferns_fern_trunk_big_old2.png b/ferns/textures/old/ferns_fern_trunk_big_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_fern_trunk_big_top_old.png b/ferns/textures/old/ferns_fern_trunk_big_top_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_fern_trunk_big_top_old2.png b/ferns/textures/old/ferns_fern_trunk_big_top_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_fern_trunk_top_old.png b/ferns/textures/old/ferns_fern_trunk_top_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_horsetail_01_old2.png b/ferns/textures/old/ferns_horsetail_01_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_horsetail_02_old2.png b/ferns/textures/old/ferns_horsetail_02_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_horsetail_03_old2.png b/ferns/textures/old/ferns_horsetail_03_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_horsetail_04_old2.png b/ferns/textures/old/ferns_horsetail_04_old2.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png old mode 100644 new mode 100755 diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_old.png old mode 100644 new mode 100755 index b568383..d5a6b0e Binary files a/ferns/textures/old/ferns_tree_fern_leave_big_old.png and b/ferns/textures/old/ferns_tree_fern_leave_big_old.png differ diff --git a/ferns/treefern.lua b/ferns/treefern.lua old mode 100644 new mode 100755 index 4ba502b..f7e59df --- a/ferns/treefern.lua +++ b/ferns/treefern.lua @@ -4,7 +4,7 @@ -- by Mossmanikin -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default , trees +-- Looked at code from: default , trees ----------------------------------------------------------------------------------------------- assert(abstract_ferns.config.enable_treefern == true) @@ -17,14 +17,14 @@ abstract_ferns.grow_tree_fern = function(pos) and minetest.get_node(pos_01).name ~= "default:junglegrass" then return end - + local size = math.random(1, 4) + math.random(1, 4) if (size > 5) then size = 10 - size end size = size + 1 local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[math.random(1, 2)] - + local i = 1 while (i < size-1) do if minetest.get_node({x = pos.x, y = pos.y + i + 1, z = pos.z}).name ~= "air" then @@ -67,9 +67,9 @@ minetest.register_node("ferns:tree_fern_leaves", { { items = {"ferns:sapling_tree_fern"}, }, - { - items = {"ferns:tree_fern_leaves"}, - } +-- { +-- items = {"ferns:tree_fern_leaves"}, +-- } } }, sounds = default.node_sound_leaves_defaults(), @@ -98,9 +98,9 @@ minetest.register_node("ferns:tree_fern_leaves_02", { { items = {"ferns:sapling_tree_fern"}, }, - { - items = {"ferns:tree_fern_leaves"}, - } +-- { +-- items = {"ferns:tree_fern_leaves"}, +-- } } }, sounds = default.node_sound_leaves_defaults(), @@ -131,11 +131,10 @@ minetest.register_node("ferns:fern_trunk", { }, groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, sounds = default.node_sound_wood_defaults(), - after_destruct = function(pos,oldnode) + after_dig_node = function(pos, oldnode, oldmetadata, digger) local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) - if node.name == "ferns:fern_trunk" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) - minetest.add_item(pos,"ferns:fern_trunk") + if node.name == "ferns:fern_trunk" then + minetest.node_dig({x=pos.x,y=pos.y+1,z=pos.z}, node, digger) end end, }) diff --git a/flowers_plus/depends.txt b/flowers_plus/depends.txt old mode 100644 new mode 100755 diff --git a/flowers_plus/flowers-changelog.txt b/flowers_plus/flowers-changelog.txt old mode 100644 new mode 100755 diff --git a/flowers_plus/init.lua b/flowers_plus/init.lua old mode 100644 new mode 100755 index f8aa93d..5b68d83 --- a/flowers_plus/init.lua +++ b/flowers_plus/init.lua @@ -42,7 +42,7 @@ for i in ipairs(lilies_list) do minetest.register_node(":flowers:waterlily"..deg1, { description = S("Waterlily"), drawtype = "nodebox", - tiles = { + tiles = { "flowers_waterlily"..deg2..".png", "flowers_waterlily"..deg2..".png^[transformFY" }, @@ -79,7 +79,7 @@ for i in ipairs(lilies_list) do if biome_lib:get_nodedef_field(under_node.name, "buildable_to") then if under_node.name ~= "default:water_source" then place_pos = pt.under - elseif top_node.name ~= "default:water_source" + elseif top_node.name ~= "default:water_source" and biome_lib:get_nodedef_field(top_node.name, "buildable_to") then place_pos = top_pos else @@ -138,11 +138,11 @@ for i in ipairs(algae_list) do num = "_"..algae_list[i][1] algae_groups = { snappy = 3,flammable=2,flower=1, not_in_creative_inventory=1 } end - + minetest.register_node(":flowers:seaweed"..num, { description = S("Seaweed"), drawtype = "nodebox", - tiles = { + tiles = { "flowers_seaweed"..num..".png", "flowers_seaweed"..num..".png^[transformFY" }, @@ -161,9 +161,9 @@ for i in ipairs(algae_list) do node_box = { type = "fixed", fixed = { -0.5, -0.49, -0.5, 0.5, -0.49, 0.5 }, - }, + }, buildable_to = true, - + liquids_pointable = true, drop = "flowers:seaweed", on_place = function(itemstack, placer, pointed_thing) @@ -179,7 +179,7 @@ for i in ipairs(algae_list) do if biome_lib:get_nodedef_field(under_node.name, "buildable_to") then if under_node.name ~= "default:water_source" then place_pos = pt.under - elseif top_node.name ~= "default:water_source" + elseif top_node.name ~= "default:water_source" and biome_lib:get_nodedef_field(top_node.name, "buildable_to") then place_pos = top_pos else @@ -226,7 +226,7 @@ local box = { } local sunflower_drop = "farming:seed_wheat" -if minetest.registered_items["farming:seed_spelt"] then +if minetest.registered_items["farming:seed_spelt"] then sunflower_drop = "farming:seed_spelt" end @@ -290,7 +290,7 @@ flowers_plus.grow_waterlily = function(pos) if lilies_list[i][1] ~= nil then ext = "_"..lilies_list[i][1] end - + if chance == num then minetest.set_node(right_here, {name="flowers:waterlily"..ext, param2=math.random(0,3)}) end @@ -468,7 +468,7 @@ biome_lib:spawn_on_surfaces({ -- cotton wads -> string (can be crafted into wool blocks) -- potted cotton plants -> potted white dandelions -minetest.register_alias("flowers:cotton_plant", "farming:cotton_8") +minetest.register_alias("flowers:cotton_plant", "farming:cotton_8") minetest.register_alias("flowers:flower_cotton", "farming:cotton_8") minetest.register_alias("flowers:flower_cotton_pot", "flowers:potted_dandelion_white") minetest.register_alias("flowers:potted_cotton_plant", "flowers:potted_dandelion_white") @@ -476,4 +476,4 @@ minetest.register_alias("flowers:cotton", "farming:string") minetest.register_alias("flowers:cotton_wad", "farming:string") minetest.register_alias("sunflower:sunflower", "flowers:sunflower") -print(S("[Flowers] Loaded.")) +minetest.log("action", S("[Flowers] Loaded.")) diff --git a/flowers_plus/locale/de.txt b/flowers_plus/locale/de.txt old mode 100644 new mode 100755 diff --git a/flowers_plus/locale/fr.txt b/flowers_plus/locale/fr.txt old mode 100644 new mode 100755 diff --git a/flowers_plus/locale/template.txt b/flowers_plus/locale/template.txt old mode 100644 new mode 100755 diff --git a/flowers_plus/models/flowers_sunflower.obj b/flowers_plus/models/flowers_sunflower.obj old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_seaweed.png b/flowers_plus/textures/flowers_seaweed.png old mode 100644 new mode 100755 index b5bd99c..76cafa0 Binary files a/flowers_plus/textures/flowers_seaweed.png and b/flowers_plus/textures/flowers_seaweed.png differ diff --git a/flowers_plus/textures/flowers_seaweedLight.png b/flowers_plus/textures/flowers_seaweedLight.png old mode 100644 new mode 100755 index 7595ebc..4240d79 Binary files a/flowers_plus/textures/flowers_seaweedLight.png and b/flowers_plus/textures/flowers_seaweedLight.png differ diff --git a/flowers_plus/textures/flowers_seaweed_2.png b/flowers_plus/textures/flowers_seaweed_2.png old mode 100644 new mode 100755 index 0b24730..4c32033 Binary files a/flowers_plus/textures/flowers_seaweed_2.png and b/flowers_plus/textures/flowers_seaweed_2.png differ diff --git a/flowers_plus/textures/flowers_seaweed_3.png b/flowers_plus/textures/flowers_seaweed_3.png old mode 100644 new mode 100755 index d9b7f43..4710727 Binary files a/flowers_plus/textures/flowers_seaweed_3.png and b/flowers_plus/textures/flowers_seaweed_3.png differ diff --git a/flowers_plus/textures/flowers_seaweed_4.png b/flowers_plus/textures/flowers_seaweed_4.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_sunflower.png b/flowers_plus/textures/flowers_sunflower.png old mode 100644 new mode 100755 index fb95cb4..916c830 Binary files a/flowers_plus/textures/flowers_sunflower.png and b/flowers_plus/textures/flowers_sunflower.png differ diff --git a/flowers_plus/textures/flowers_sunflower_inv.png b/flowers_plus/textures/flowers_sunflower_inv.png old mode 100644 new mode 100755 index c36ed01..62e3e80 Binary files a/flowers_plus/textures/flowers_sunflower_inv.png and b/flowers_plus/textures/flowers_sunflower_inv.png differ diff --git a/flowers_plus/textures/flowers_waterlily.png b/flowers_plus/textures/flowers_waterlily.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_22.5.png b/flowers_plus/textures/flowers_waterlily_22.5.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_45.png b/flowers_plus/textures/flowers_waterlily_45.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_67.5.png b/flowers_plus/textures/flowers_waterlily_67.5.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_small_1.png b/flowers_plus/textures/flowers_waterlily_small_1.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_small_2.png b/flowers_plus/textures/flowers_waterlily_small_2.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_small_3.png b/flowers_plus/textures/flowers_waterlily_small_3.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/flowers_waterlily_small_4.png b/flowers_plus/textures/flowers_waterlily_small_4.png old mode 100644 new mode 100755 diff --git a/flowers_plus/textures/tr.txt b/flowers_plus/textures/tr.txt old mode 100644 new mode 100755 diff --git a/junglegrass/init.lua b/junglegrass/init.lua old mode 100644 new mode 100755 diff --git a/modpack.txt b/modpack.txt old mode 100644 new mode 100755 diff --git a/molehills/depends.txt b/molehills/depends.txt old mode 100644 new mode 100755 diff --git a/molehills/init.lua b/molehills/init.lua old mode 100644 new mode 100755 index d0a1941..c3a707e --- a/molehills/init.lua +++ b/molehills/init.lua @@ -73,6 +73,19 @@ biome_lib:register_generate_plant({ abstract_molehills.place_molehill ) +biome_lib:register_generate_plant({ + surface = {"default:dirt_with_dry_grass"}, + max_count = Molehills_Max_Count, + rarity = 97, + min_elevation = 1, + max_elevation = 40, + avoid_nodes = {"group:tree","group:liquid","group:stone","group:falling_node"--[[,"air"]]}, + avoid_radius = 4, + plantlife_limit = -0.3, + }, + abstract_molehills.place_molehill +) + ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/molehills/models/molehill_molehill.obj b/molehills/models/molehill_molehill.obj old mode 100644 new mode 100755 diff --git a/molehills/molehills_settings.txt b/molehills/molehills_settings.txt old mode 100644 new mode 100755 diff --git a/molehills/textures/molehills_dirt.png b/molehills/textures/molehills_dirt.png old mode 100644 new mode 100755 diff --git a/molehills/textures/molehills_side.png b/molehills/textures/molehills_side.png old mode 100644 new mode 100755 diff --git a/molehills/textures/old & unused/molehill_side.png b/molehills/textures/old & unused/molehill_side.png old mode 100644 new mode 100755 diff --git a/molehills/textures/old & unused/molehill_top.png b/molehills/textures/old & unused/molehill_top.png old mode 100644 new mode 100755 diff --git a/nature_classic/blossom.lua b/nature_classic/blossom.lua old mode 100644 new mode 100755 diff --git a/nature_classic/config.lua b/nature_classic/config.lua old mode 100644 new mode 100755 diff --git a/nature_classic/depends.txt b/nature_classic/depends.txt old mode 100644 new mode 100755 diff --git a/nature_classic/global_function.lua b/nature_classic/global_function.lua old mode 100644 new mode 100755 index 3a5b9e3..c6b158a --- a/nature_classic/global_function.lua +++ b/nature_classic/global_function.lua @@ -64,7 +64,7 @@ end function nature:grow_node(pos, nodename) if pos ~= nil then local light_enough = (minetest.get_node_light(pos, nil) or 0) - >= nature.minimum_growth_light + >= nature.minimum_growth_light if is_not_young(pos) and light_enough then minetest.set_node(pos, { name = nodename }) diff --git a/nature_classic/init.lua b/nature_classic/init.lua old mode 100644 new mode 100755 diff --git a/nature_classic/textures/nature_blossom.png b/nature_classic/textures/nature_blossom.png old mode 100644 new mode 100755 diff --git a/poisonivy/depends.txt b/poisonivy/depends.txt old mode 100644 new mode 100755 diff --git a/poisonivy/init.lua b/poisonivy/init.lua old mode 100644 new mode 100755 index 466b930..ebbede6 --- a/poisonivy/init.lua +++ b/poisonivy/init.lua @@ -100,4 +100,4 @@ biome_lib:grow_plants({ ground_nodes = {"default:dirt_with_grass"} }) -print(S("[Poison Ivy] Loaded.")) +minetest.log("action", S("[Poison Ivy] Loaded.")) diff --git a/poisonivy/locale/de.txt b/poisonivy/locale/de.txt old mode 100644 new mode 100755 diff --git a/poisonivy/locale/fr.txt b/poisonivy/locale/fr.txt old mode 100644 new mode 100755 diff --git a/poisonivy/locale/template.txt b/poisonivy/locale/template.txt old mode 100644 new mode 100755 diff --git a/poisonivy/locale/tr.txt b/poisonivy/locale/tr.txt old mode 100644 new mode 100755 diff --git a/poisonivy/textures/poisonivy_climbing.png b/poisonivy/textures/poisonivy_climbing.png old mode 100644 new mode 100755 index f53f7a3..0358fdd Binary files a/poisonivy/textures/poisonivy_climbing.png and b/poisonivy/textures/poisonivy_climbing.png differ diff --git a/poisonivy/textures/poisonivy_seedling.png b/poisonivy/textures/poisonivy_seedling.png old mode 100644 new mode 100755 diff --git a/poisonivy/textures/poisonivy_sproutling.png b/poisonivy/textures/poisonivy_sproutling.png old mode 100644 new mode 100755 index 92d2742..aeca171 Binary files a/poisonivy/textures/poisonivy_sproutling.png and b/poisonivy/textures/poisonivy_sproutling.png differ diff --git a/trunks/crafting.lua b/trunks/crafting.lua old mode 100644 new mode 100755 index 02f3991..a1823ee --- a/trunks/crafting.lua +++ b/trunks/crafting.lua @@ -35,7 +35,7 @@ minetest.register_craft({ }) minetest.register_craft({ output = "trunks:twig_1 4", - recipe = {{"bushes:bushbranches2a"}} + recipe = {{"bushes:bushbranches2"}} }) minetest.register_craft({ output = "trunks:twig_1 4", diff --git a/trunks/depends.txt b/trunks/depends.txt old mode 100644 new mode 100755 diff --git a/trunks/generating.lua b/trunks/generating.lua old mode 100644 new mode 100755 index e544a21..52383e1 --- a/trunks/generating.lua +++ b/trunks/generating.lua @@ -15,7 +15,7 @@ end abstract_trunks.place_twig = function(pos) local twig_size = math.random(1,27) - + local right_here = {x=pos.x , y=pos.y+1, z=pos.z } local north = {x=pos.x , y=pos.y+1, z=pos.z+1} local north_east = {x=pos.x+1, y=pos.y+1, z=pos.z+1} @@ -25,7 +25,7 @@ abstract_trunks.place_twig = function(pos) local south_west = {x=pos.x-1, y=pos.y+1, z=pos.z-1} local west = {x=pos.x-1, y=pos.y+1, z=pos.z } local north_west = {x=pos.x-1, y=pos.y+1, z=pos.z+1} - + local node_here = minetest.get_node(right_here) local node_north = minetest.get_node(north) local node_n_e = minetest.get_node(north_east) @@ -35,17 +35,17 @@ abstract_trunks.place_twig = function(pos) local node_s_w = minetest.get_node(south_west) local node_west = minetest.get_node(west) local node_n_w = minetest.get_node(north_west) --- small twigs +-- small twigs if twig_size <= 16 then minetest.set_node(right_here, {name="trunks:twig_"..math.random(1,4), param2=math.random(0,3)}) end -- big twigs if Big_Twigs == true then --- big twig 1 +-- big twig 1 if twig_size == 17 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z+1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_5"}) end @@ -59,7 +59,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 18 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z-1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x,y=pos.y,z=pos.z-1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_5", param2=1}) end @@ -73,7 +73,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 19 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z-1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_5", param2=2}) end @@ -87,7 +87,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 20 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_5", param2=3}) end @@ -98,11 +98,11 @@ abstract_trunks.place_twig = function(pos) minetest.set_node(north, {name="trunks:twig_8", param2=3}) end end --- big twig 2 +-- big twig 2 elseif twig_size == 21 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z+1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_9"}) end @@ -116,7 +116,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 22 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z-1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_9", param2=1}) end @@ -130,7 +130,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 23 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x,y=pos.y,z=pos.z-1}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z-1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_9", param2=2}) end @@ -144,7 +144,7 @@ abstract_trunks.place_twig = function(pos) elseif twig_size == 24 then if not (minetest.registered_nodes[minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z}).name].buildable_to or minetest.registered_nodes[minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1}).name].buildable_to) then - + if minetest.registered_nodes[node_here.name].buildable_to then minetest.set_node(right_here, {name="trunks:twig_9", param2=3}) end @@ -227,7 +227,7 @@ for i in pairs(TRuNKS) do local TRuNK = TRuNKS[i][2] local NR = TRuNKS[i][3] local trunkname = MoD..":"..TRuNK - if minetest.get_modpath(MoD) ~= nil + if minetest.get_modpath(MoD) ~= nil and NR < 6 -- moretrees trunks allready have facedir and minetest.registered_nodes[trunkname] then -- the node being called exists. temptrunk = clone_node(trunkname) @@ -236,9 +236,9 @@ for i in pairs(TRuNKS) do end end end - + abstract_trunks.place_trunk = function(pos) - + local right_here = {x=pos.x, y=pos.y+1, z=pos.z} local north = {x=pos.x, y=pos.y+1, z=pos.z+1} local north2 = {x=pos.x, y=pos.y+1, z=pos.z+2} @@ -248,7 +248,7 @@ abstract_trunks.place_trunk = function(pos) local west2 = {x=pos.x-2, y=pos.y+1, z=pos.z} local east = {x=pos.x+1, y=pos.y+1, z=pos.z} local east2 = {x=pos.x+2, y=pos.y+1, z=pos.z} - + local node_here = minetest.get_node(right_here) local node_north = minetest.get_node(north) local node_north2 = minetest.get_node(north2) @@ -278,7 +278,7 @@ abstract_trunks.place_trunk = function(pos) if minetest.registered_nodes[node_north.name].buildable_to then minetest.set_node(north, {name=MoD..":"..TRuNK, param2=4}) end - + if length >= 4 and minetest.registered_nodes[node_north2.name].buildable_to then minetest.set_node(north2, {name=MoD..":"..TRuNK, param2=4}) end @@ -365,13 +365,13 @@ if Moss_on_ground == true then abstract_trunks.grow_moss_on_ground = function(pos) local on_ground = {x=pos.x, y=pos.y+1, z=pos.z} local moss_type = math.random(1,21) - + if moss_type == 1 then minetest.set_node(on_ground, {name="trunks:moss_fungus", param2=math.random(0,3)}) else minetest.set_node(on_ground, {name="trunks:moss", param2=math.random(0,3)}) end - + end biome_lib:register_generate_plant({ @@ -406,14 +406,14 @@ abstract_trunks.grow_moss_on_trunk = function(pos) local at_side_s = {x=pos.x, y=pos.y, z=pos.z-1} local at_side_w = {x=pos.x-1, y=pos.y, z=pos.z} local undrneath = {x=pos.x, y=pos.y-1, z=pos.z} - + local node_here = minetest.get_node(on_ground) local node_north = minetest.get_node(at_side_n) local node_east = minetest.get_node(at_side_e) local node_south = minetest.get_node(at_side_s) local node_west = minetest.get_node(at_side_w) local node_under = minetest.get_node(undrneath) - + --if minetest.get_item_group(node_under.name, "tree") < 1 then local moss_type = math.random(1,41) if minetest.registered_nodes[node_here.name].buildable_to then -- instead of check_air = true, @@ -491,20 +491,20 @@ biome_lib:register_generate_plant({ end ----------------------------------------------------------------------------------------------- --- RooTS +-- RooTS ----------------------------------------------------------------------------------------------- if Roots == true then -- see settings.txt abstract_trunks.grow_roots = function(pos) local twig_size = math.random(1,27) - + local right_here = {x=pos.x , y=pos.y , z=pos.z } local below = {x=pos.x , y=pos.y-1, z=pos.z } local north = {x=pos.x , y=pos.y , z=pos.z+1} local east = {x=pos.x+1, y=pos.y , z=pos.z } local south = {x=pos.x , y=pos.y , z=pos.z-1} local west = {x=pos.x-1, y=pos.y , z=pos.z } - + local node_here = minetest.get_node(right_here) local node_below = minetest.get_node(below) local node_north = minetest.get_node(north) @@ -515,8 +515,8 @@ abstract_trunks.grow_roots = function(pos) for i in pairs(TRuNKS) do local MoD = TRuNKS[i][1] local TRuNK = TRuNKS[i][2] - if minetest.get_modpath(MoD) ~= nil - and node_here.name == MoD..":"..TRuNK + if minetest.get_modpath(MoD) ~= nil + and node_here.name == MoD..":"..TRuNK and string.find(node_below.name, "dirt") and node_here.param2 == 0 then if minetest.registered_nodes[node_north.name].buildable_to then diff --git a/trunks/init.lua b/trunks/init.lua old mode 100644 new mode 100755 index ee9427d..f4dda2e --- a/trunks/init.lua +++ b/trunks/init.lua @@ -13,5 +13,5 @@ dofile(minetest.get_modpath("trunks").."/nodes.lua") dofile(minetest.get_modpath("trunks").."/crafting.lua") ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/trunks/nodes.lua b/trunks/nodes.lua old mode 100644 new mode 100755 index f490871..b1ab4f5 --- a/trunks/nodes.lua +++ b/trunks/nodes.lua @@ -17,7 +17,7 @@ for i in pairs(NoDe) do inventory_image = "trunks_twig_"..NR..".png", wield_image = "trunks_twig_"..NR..".png", drawtype = "nodebox", - tiles = { + tiles = { "trunks_twig_"..NR..".png", "trunks_twig_"..NR..".png^[transformFY", -- mirror "trunks_twig_6.png" -- empty @@ -214,7 +214,7 @@ if Auto_Roof_Corner == true then interval = 1, chance = 1, action = function(pos) - + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) @@ -227,7 +227,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 1) or (node_north.name == corner and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 0) @@ -235,7 +235,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 2) or (node_east.name == corner and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 1) @@ -243,7 +243,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 3) or (node_south.name == corner and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 2) @@ -259,7 +259,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner_2, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 3) or (node_north.name == corner_2 and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 2) @@ -267,7 +267,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner_2, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 0) or (node_east.name == corner_2 and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 3) @@ -275,7 +275,7 @@ if Auto_Roof_Corner == true then then minetest.set_node(pos, {name=corner_2, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 1) or (node_south.name == corner_2 and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 0) @@ -291,7 +291,7 @@ end -- MM: The following stuff is just for testing purposes for now; no generating of roots. -- I'm not satisfied with this; they should be either bigger or a different drawtype. ----------------------------------------------------------------------------------------------- --- RooTS +-- RooTS ----------------------------------------------------------------------------------------------- if Roots == true then -- see settings.txt @@ -347,7 +347,7 @@ for i in pairs(TRuNKS) do selection_box = {type = "fixed", fixed = roots_cube}, node_box = {type = "fixed", fixed = roots_sheet}, groups = { - tree=1, + tree_root=1, snappy=1, choppy=2, oddly_breakable_by_hand=1, diff --git a/trunks/textures/credit_textures.txt b/trunks/textures/credit_textures.txt old mode 100644 new mode 100755 diff --git a/trunks/textures/old & unused/comboSticks.png b/trunks/textures/old & unused/comboSticks.png old mode 100644 new mode 100755 index e3b7770..342bcc2 Binary files a/trunks/textures/old & unused/comboSticks.png and b/trunks/textures/old & unused/comboSticks.png differ diff --git a/trunks/textures/old & unused/comboSticks_2.png b/trunks/textures/old & unused/comboSticks_2.png old mode 100644 new mode 100755 index 2053592..4b05dc1 Binary files a/trunks/textures/old & unused/comboSticks_2.png and b/trunks/textures/old & unused/comboSticks_2.png differ diff --git a/trunks/textures/old & unused/trunks_root_mask_old.png b/trunks/textures/old & unused/trunks_root_mask_old.png old mode 100644 new mode 100755 diff --git a/trunks/textures/old & unused/trunks_twig_1e.png b/trunks/textures/old & unused/trunks_twig_1e.png old mode 100644 new mode 100755 index 518955c..e606e62 Binary files a/trunks/textures/old & unused/trunks_twig_1e.png and b/trunks/textures/old & unused/trunks_twig_1e.png differ diff --git a/trunks/textures/old & unused/trunks_twig_1n.png b/trunks/textures/old & unused/trunks_twig_1n.png old mode 100644 new mode 100755 diff --git a/trunks/textures/old & unused/trunks_twig_2n.png b/trunks/textures/old & unused/trunks_twig_2n.png old mode 100644 new mode 100755 diff --git a/trunks/textures/old & unused/trunks_twig_3n.png b/trunks/textures/old & unused/trunks_twig_3n.png old mode 100644 new mode 100755 index 6aacf9d..ff76eb1 Binary files a/trunks/textures/old & unused/trunks_twig_3n.png and b/trunks/textures/old & unused/trunks_twig_3n.png differ diff --git a/trunks/textures/old & unused/trunks_twig_4n.png b/trunks/textures/old & unused/trunks_twig_4n.png old mode 100644 new mode 100755 diff --git a/trunks/textures/old & unused/trunks_twig_5-8.png b/trunks/textures/old & unused/trunks_twig_5-8.png old mode 100644 new mode 100755 index 9dda478..a7b4e06 Binary files a/trunks/textures/old & unused/trunks_twig_5-8.png and b/trunks/textures/old & unused/trunks_twig_5-8.png differ diff --git a/trunks/textures/old & unused/trunks_twig_9-12.png b/trunks/textures/old & unused/trunks_twig_9-12.png old mode 100644 new mode 100755 index 42a5d45..0e8f049 Binary files a/trunks/textures/old & unused/trunks_twig_9-12.png and b/trunks/textures/old & unused/trunks_twig_9-12.png differ diff --git a/trunks/textures/trunks_moss.png b/trunks/textures/trunks_moss.png old mode 100644 new mode 100755 index 5ffe58f..eb18e29 Binary files a/trunks/textures/trunks_moss.png and b/trunks/textures/trunks_moss.png differ diff --git a/trunks/textures/trunks_moss_fungus.png b/trunks/textures/trunks_moss_fungus.png old mode 100644 new mode 100755 index fcd4ae2..73475b3 Binary files a/trunks/textures/trunks_moss_fungus.png and b/trunks/textures/trunks_moss_fungus.png differ diff --git a/trunks/textures/trunks_root_mask.png b/trunks/textures/trunks_root_mask.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_1.png b/trunks/textures/trunks_twig_1.png old mode 100644 new mode 100755 index 066bbfa..8b3f554 Binary files a/trunks/textures/trunks_twig_1.png and b/trunks/textures/trunks_twig_1.png differ diff --git a/trunks/textures/trunks_twig_10.png b/trunks/textures/trunks_twig_10.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_11.png b/trunks/textures/trunks_twig_11.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_12.png b/trunks/textures/trunks_twig_12.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_13.png b/trunks/textures/trunks_twig_13.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_2.png b/trunks/textures/trunks_twig_2.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_3.png b/trunks/textures/trunks_twig_3.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_4.png b/trunks/textures/trunks_twig_4.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_5.png b/trunks/textures/trunks_twig_5.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_6.png b/trunks/textures/trunks_twig_6.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_7.png b/trunks/textures/trunks_twig_7.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_8.png b/trunks/textures/trunks_twig_8.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twig_9.png b/trunks/textures/trunks_twig_9.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twigs.png b/trunks/textures/trunks_twigs.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twigs_corner.png b/trunks/textures/trunks_twigs_corner.png old mode 100644 new mode 100755 diff --git a/trunks/textures/trunks_twigs_top.png b/trunks/textures/trunks_twigs_top.png old mode 100644 new mode 100755 diff --git a/trunks/trunks_settings.txt b/trunks/trunks_settings.txt old mode 100644 new mode 100755 diff --git a/vines/LICENSE.md b/vines/LICENSE.md old mode 100644 new mode 100755 diff --git a/vines/README.md b/vines/README.md old mode 100644 new mode 100755 diff --git a/vines/aliases.lua b/vines/aliases.lua old mode 100644 new mode 100755 diff --git a/vines/crafts.lua b/vines/crafts.lua old mode 100644 new mode 100755 diff --git a/vines/depends.txt b/vines/depends.txt old mode 100644 new mode 100755 diff --git a/vines/functions.lua b/vines/functions.lua old mode 100644 new mode 100755 index db120a6..150a3f8 --- a/vines/functions.lua +++ b/vines/functions.lua @@ -123,7 +123,7 @@ vines.dig_vine = function( pos, node_name, user ) --only dig give the vine if shears are used if not user then return false end local wielded = user:get_wielded_item() - if 'vines:shears' == wielded:get_name() then + if 'vines:shears' == wielded:get_name() then local inv = user:get_inventory() if inv then inv:add_item("main", ItemStack( node_name )) diff --git a/vines/init.lua b/vines/init.lua old mode 100644 new mode 100755 index 72eda93..bf5694f --- a/vines/init.lua +++ b/vines/init.lua @@ -11,4 +11,4 @@ dofile( minetest.get_modpath( vines.name ) .. "/nodes.lua" ) dofile( minetest.get_modpath( vines.name ) .. "/shear.lua" ) dofile( minetest.get_modpath( vines.name ) .. "/vines.lua" ) -print("[Vines] Loaded!") +minetest.log("action", "[Vines] Loaded!") diff --git a/vines/nodes.lua b/vines/nodes.lua old mode 100644 new mode 100755 diff --git a/vines/recipes.lua b/vines/recipes.lua old mode 100644 new mode 100755 index d2b928a..900ec07 --- a/vines/recipes.lua +++ b/vines/recipes.lua @@ -6,7 +6,8 @@ vines.recipes['rope_block'] = { vines.recipes['shears'] = { {'', 'default:steel_ingot', ''}, - {'default:stick', 'default:wood', 'default:steel_ingot'}, - {'', '', 'default:stick'} + {'group:stick', 'group:wood', 'default:steel_ingot'}, + {'', '', 'group:stick'} + -- MODIFICATION MADE FOR MFF ^ (Mg|2/4/15) } diff --git a/vines/shear.lua b/vines/shear.lua old mode 100644 new mode 100755 index e6d915a..d031750 --- a/vines/shear.lua +++ b/vines/shear.lua @@ -1,5 +1,5 @@ minetest.register_tool("vines:shears", { - description = "Shears", + description = "Shears for Vines", inventory_image = "vines_shears.png", wield_image = "vines_shears.png", stack_max = 1, @@ -8,8 +8,8 @@ minetest.register_tool("vines:shears", { full_punch_interval = 1.0, max_drop_level=0, groupcaps={ - snappy={times={[3]=0.2}, maxwear=0.05, maxlevel=3}, - wool={times={[3]=0.2}, maxwear=0.05, maxlevel=3} + snappy={times={[3]=0.2}, uses = 1/0.05, maxlevel=3}, + wool={times={[3]=0.2}, uses = 1/0.05, maxlevel=3} } }, }) diff --git a/vines/textures/vines_item.png b/vines/textures/vines_item.png old mode 100644 new mode 100755 diff --git a/vines/textures/vines_jungle_end.png b/vines/textures/vines_jungle_end.png old mode 100644 new mode 100755 index 6c8d339..3e9a460 Binary files a/vines/textures/vines_jungle_end.png and b/vines/textures/vines_jungle_end.png differ diff --git a/vines/textures/vines_jungle_middle.png b/vines/textures/vines_jungle_middle.png old mode 100644 new mode 100755 index bf838a5..475612d Binary files a/vines/textures/vines_jungle_middle.png and b/vines/textures/vines_jungle_middle.png differ diff --git a/vines/textures/vines_root_end.png b/vines/textures/vines_root_end.png old mode 100644 new mode 100755 index 4fc3f87..7bf6ff6 Binary files a/vines/textures/vines_root_end.png and b/vines/textures/vines_root_end.png differ diff --git a/vines/textures/vines_root_middle.png b/vines/textures/vines_root_middle.png old mode 100644 new mode 100755 diff --git a/vines/textures/vines_rope.png b/vines/textures/vines_rope.png old mode 100644 new mode 100755 diff --git a/vines/textures/vines_rope_end.png b/vines/textures/vines_rope_end.png old mode 100644 new mode 100755 diff --git a/vines/textures/vines_shears.png b/vines/textures/vines_shears.png old mode 100644 new mode 100755 index c4c39f9..f1b5509 Binary files a/vines/textures/vines_shears.png and b/vines/textures/vines_shears.png differ diff --git a/vines/textures/vines_side_end.png b/vines/textures/vines_side_end.png old mode 100644 new mode 100755 index 5b3b28f..0164e47 Binary files a/vines/textures/vines_side_end.png and b/vines/textures/vines_side_end.png differ diff --git a/vines/textures/vines_side_middle.png b/vines/textures/vines_side_middle.png old mode 100644 new mode 100755 diff --git a/vines/textures/vines_vine_end.png b/vines/textures/vines_vine_end.png old mode 100644 new mode 100755 index 062857b..0e0254d Binary files a/vines/textures/vines_vine_end.png and b/vines/textures/vines_vine_end.png differ diff --git a/vines/textures/vines_vine_middle.png b/vines/textures/vines_vine_middle.png old mode 100644 new mode 100755 index 8afffe8..12b605e Binary files a/vines/textures/vines_vine_middle.png and b/vines/textures/vines_vine_middle.png differ diff --git a/vines/textures/vines_willow_end.png b/vines/textures/vines_willow_end.png old mode 100644 new mode 100755 index b5b8e59..1456980 Binary files a/vines/textures/vines_willow_end.png and b/vines/textures/vines_willow_end.png differ diff --git a/vines/textures/vines_willow_middle.png b/vines/textures/vines_willow_middle.png old mode 100644 new mode 100755 diff --git a/vines/vines.lua b/vines/vines.lua old mode 100644 new mode 100755 diff --git a/woodsoils/depends.txt b/woodsoils/depends.txt old mode 100644 new mode 100755 diff --git a/woodsoils/generating.lua b/woodsoils/generating.lua old mode 100644 new mode 100755 index 1d03ed7..087e03c --- a/woodsoils/generating.lua +++ b/woodsoils/generating.lua @@ -26,7 +26,7 @@ local RaDiuS = { } -- e = + , n = + abstract_woodsoils.place_soil = function(pos) - + if minetest.get_item_group(minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name, "soil") > 0 or minetest.get_item_group(minetest.get_node({x=pos.x,y=pos.y-2,z=pos.z}).name, "soil") > 0 then for i in pairs(RaDiuS) do diff --git a/woodsoils/init.lua b/woodsoils/init.lua old mode 100644 new mode 100755 index 9037d45..b954e2b --- a/woodsoils/init.lua +++ b/woodsoils/init.lua @@ -10,14 +10,14 @@ dofile(minetest.get_modpath("woodsoils").."/nodes.lua") dofile(minetest.get_modpath("woodsoils").."/generating.lua") -- felt like playing a bit :D ---[[print(" _____ __") +--[[print(" _____ __") print("_/ ____\\___________ ____ _______/ |_") print("\\ __\\/ _ \\_ __ \\_/ __ \\ / ___/\\ __\\") -print(" | | ( <_> ) | \\/\\ ___/ \\___ \\ | |") -print(" |__| \\____/|__| \\___ >____ > |__|") +print(" | | ( <_> ) | \\/\\ ___/ \\___ \\ | |") +print(" |__| \\____/|__| \\___ >____ > |__|") print(" \\/ \\/") -print(" .__.__") +print(" .__.__") print(" __________ |__| | ______") print(" / ___/ _ \\| | | / ___/") print(" \\___ ( <_> ) | |__\\___ \\") @@ -25,5 +25,5 @@ print("/____ >____/|__|____/____ >") print(" \\/ \\/")]] ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/woodsoils/nodes.lua b/woodsoils/nodes.lua old mode 100644 new mode 100755 index e80c522..db05993 --- a/woodsoils/nodes.lua +++ b/woodsoils/nodes.lua @@ -3,8 +3,8 @@ minetest.register_node("woodsoils:dirt_with_leaves_1", { description = "Forest Soil 1", tiles = { - "default_dirt.png^woodsoils_ground_cover.png", - "default_dirt.png", + "default_dirt.png^woodsoils_ground_cover.png", + "default_dirt.png", "default_dirt.png^woodsoils_ground_cover_side.png"}, is_ground_content = true, groups = { @@ -21,8 +21,8 @@ minetest.register_node("woodsoils:dirt_with_leaves_1", { minetest.register_node("woodsoils:dirt_with_leaves_2", { description = "Forest Soil 2", tiles = { - "woodsoils_ground.png", - "default_dirt.png", + "woodsoils_ground.png", + "default_dirt.png", "default_dirt.png^woodsoils_ground_side.png"}, is_ground_content = true, groups = { @@ -39,8 +39,8 @@ minetest.register_node("woodsoils:dirt_with_leaves_2", { minetest.register_node("woodsoils:grass_with_leaves_1", { description = "Forest Soil 3", tiles = { - "default_grass.png^woodsoils_ground_cover2.png", - "default_dirt.png", + "default_grass.png^woodsoils_ground_cover2.png", + "default_dirt.png", "default_dirt.png^default_grass_side.png^woodsoils_ground_cover_side2.png"}, is_ground_content = true, groups = { @@ -57,8 +57,8 @@ minetest.register_node("woodsoils:grass_with_leaves_1", { minetest.register_node("woodsoils:grass_with_leaves_2", { description = "Forest Soil 4", tiles = { - "default_grass.png^woodsoils_ground_cover.png", - "default_dirt.png", + "default_grass.png^woodsoils_ground_cover.png", + "default_dirt.png", "default_dirt.png^default_grass_side.png^woodsoils_ground_cover_side.png"}, is_ground_content = true, groups = { diff --git a/woodsoils/textures/credit_textures.txt b/woodsoils/textures/credit_textures.txt old mode 100644 new mode 100755 diff --git a/woodsoils/textures/not in use/woodsoils.png b/woodsoils/textures/not in use/woodsoils.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground.png b/woodsoils/textures/woodsoils_ground.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground_cover.png b/woodsoils/textures/woodsoils_ground_cover.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground_cover2.png b/woodsoils/textures/woodsoils_ground_cover2.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground_cover_side.png b/woodsoils/textures/woodsoils_ground_cover_side.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground_cover_side2.png b/woodsoils/textures/woodsoils_ground_cover_side2.png old mode 100644 new mode 100755 diff --git a/woodsoils/textures/woodsoils_ground_side.png b/woodsoils/textures/woodsoils_ground_side.png old mode 100644 new mode 100755 diff --git a/youngtrees/depends.txt b/youngtrees/depends.txt old mode 100644 new mode 100755 diff --git a/youngtrees/init.lua b/youngtrees/init.lua old mode 100644 new mode 100755 index 183e86e..2099125 --- a/youngtrees/init.lua +++ b/youngtrees/init.lua @@ -1,7 +1,7 @@ -abstract_youngtrees = {} +abstract_youngtrees = {} minetest.register_node("youngtrees:bamboo", { - description = "Young Bamboo Tree", + description = "Young Bamboo Tree", drawtype="nodebox", tiles = {"bamboo.png"}, paramtype = "light", @@ -21,11 +21,11 @@ minetest.register_node("youngtrees:bamboo", { }) minetest.register_node("youngtrees:youngtree2_middle",{ - description = "Young Tree 2 (middle)", + description = "Young Tree 2 (middle)", drawtype="nodebox", tiles = {"youngtree2branch.png"}, inventory_image = "youngtree2branch.png", - wield_image = "youngtree2branch.png", + wield_image = "youngtree2branch.png", paramtype = "light", walkable = false, is_ground_content = true, @@ -60,7 +60,7 @@ minetest.register_node("youngtrees:youngtree_top", { drop = 'trunks:twig_1' }) - + minetest.register_node("youngtrees:youngtree_middle", { description = "Young Tree (middle)", drawtype = "plantlike", @@ -80,7 +80,7 @@ minetest.register_node("youngtrees:youngtree_middle", { }) - + minetest.register_node("youngtrees:youngtree_bottom", { description = "Young Tree (bottom)", drawtype = "plantlike", @@ -98,19 +98,19 @@ minetest.register_node("youngtrees:youngtree_bottom", { sounds = default.node_sound_leaves_defaults(), drop = 'trunks:twig_1' }) - - + + abstract_youngtrees.grow_youngtree = function(pos) - local height = math.random(1,3) + local height = math.random(1,3) abstract_youngtrees.grow_youngtree_node(pos,height) end abstract_youngtrees.grow_youngtree_node = function(pos, height) - - + + 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} - + if minetest.get_node(right_here).name == "air" -- instead of check_air = true, or minetest.get_node(right_here).name == "default:junglegrass" then if height == 1 then @@ -119,20 +119,20 @@ abstract_youngtrees.grow_youngtree_node = function(pos, height) if height == 2 then minetest.set_node(right_here, {name="youngtrees:youngtree_bottom"}) minetest.set_node(above_right_here, {name="youngtrees:youngtree_top"}) - end + end if height == 3 then local two_above_right_here = {x=pos.x, y=pos.y+3, z=pos.z} minetest.set_node(right_here, {name="youngtrees:youngtree_bottom"}) minetest.set_node(above_right_here, {name="youngtrees:youngtree_middle"}) minetest.set_node(two_above_right_here, {name="youngtrees:youngtree_top"}) - end + end end end biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", "stoneage:grass_with_silex", "sumpf:peat", "sumpf:sumpf" @@ -143,4 +143,4 @@ biome_lib:register_generate_plant({ plantlife_limit = -0.9, }, abstract_youngtrees.grow_youngtree -) +) diff --git a/youngtrees/textures/bamboo.png b/youngtrees/textures/bamboo.png old mode 100644 new mode 100755 diff --git a/youngtrees/textures/unused/sapling.png b/youngtrees/textures/unused/sapling.png old mode 100644 new mode 100755 index a3d5127..2e5d380 Binary files a/youngtrees/textures/unused/sapling.png and b/youngtrees/textures/unused/sapling.png differ diff --git a/youngtrees/textures/unused/sapling16x.png b/youngtrees/textures/unused/sapling16x.png old mode 100644 new mode 100755 diff --git a/youngtrees/textures/youngtree16xa.png b/youngtrees/textures/youngtree16xa.png old mode 100644 new mode 100755 diff --git a/youngtrees/textures/youngtree16xb.png b/youngtrees/textures/youngtree16xb.png old mode 100644 new mode 100755 diff --git a/youngtrees/textures/youngtree16xc.png b/youngtrees/textures/youngtree16xc.png old mode 100644 new mode 100755 diff --git a/youngtrees/textures/youngtree2branch.png b/youngtrees/textures/youngtree2branch.png old mode 100644 new mode 100755 index 89b2f23..1e2f634 Binary files a/youngtrees/textures/youngtree2branch.png and b/youngtrees/textures/youngtree2branch.png differ