From 8702aff2396dbdc9af2eaf73d7e57f9c51b36b1b Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Mon, 21 May 2018 16:34:46 +0100 Subject: [PATCH] replace 'ethereal:green_dirt' with 'default:dirt_with_grass' --- compatibility.lua | 2 +- dirt.lua | 42 +++++-------------------- lucky_block.lua | 1 - mapgen.lua | 80 +++++++++++++++++++++++------------------------ plantpack.lua | 16 +++++----- sapling.lua | 2 -- water.lua | 2 +- 7 files changed, 57 insertions(+), 88 deletions(-) diff --git a/compatibility.lua b/compatibility.lua index 5bfc819..03bb972 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -38,7 +38,7 @@ minetest.register_alias("ethereal:obsidian_brick", "default:obsidianbrick") minetest.register_alias("ethereal:crystal_topped_dirt", "ethereal:crystal_dirt") minetest.register_alias("ethereal:fiery_dirt_top", "ethereal:fiery_dirt") minetest.register_alias("ethereal:gray_dirt_top", "ethereal:gray_dirt") -minetest.register_alias("ethereal:green_dirt_top", "ethereal:green_dirt") +minetest.register_alias("ethereal:green_dirt_top", "default;dirt_with_grass") minetest.register_alias("ethereal:tree_sapling", "default:sapling") minetest.register_alias("ethereal:jungle_tree_sapling", "default:junglesapling") diff --git a/dirt.lua b/dirt.lua index 3bf29ff..36c69d3 100644 --- a/dirt.lua +++ b/dirt.lua @@ -4,26 +4,6 @@ local S = ethereal.intllib -- override default dirt (to stop caves cutting away dirt) minetest.override_item("default:dirt", {is_ground_content = ethereal.cavedirt}) ---[[ green dirt -minetest.register_node("ethereal:green_dirt", { - description = S("Green Dirt"), - tiles = { - "default_grass.png", - "default_dirt.png", - "default_dirt.png^default_grass_side.png" - }, - is_ground_content = ethereal.cavedirt, - groups = {crumbly = 3, soil = 1, ethereal_grass = 1}, - soil = { - base = "ethereal:green_dirt", - dry = "farming:soil", - wet = "farming:soil_wet" - }, - drop = "default:dirt", - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.25}, - }), -})]] minetest.register_alias("ethereal:green_dirt", "default:dirt_with_grass") -- dry dirt @@ -80,7 +60,7 @@ dirts = { "ethereal:bamboo_dirt", "ethereal:jungle_dirt", "ethereal:grove_dirt", "ethereal:prairie_dirt", "ethereal:cold_dirt", "ethereal:crystal_dirt", "ethereal:mushroom_dirt", "ethereal:fiery_dirt", "ethereal:gray_dirt", - "default:dirt_with_grass", "default:dirt_with_dry_grass", "ethereal:green_dirt", + "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:dirt_with_snow", "default:dirt_with_dry_grass", "default:dirt_with_rainforest_litter" } @@ -88,17 +68,17 @@ dirts = { -- check surrounding grass and change dirt to same colour local grass_spread = function(pos, node) - -- not enough light local above = {x = pos.x, y = pos.y + 1, z = pos.z} + -- not enough light if (minetest.get_node_light(above) or 0) < 13 then return end - -- water above grass local name = minetest.get_node(above).name local def = minetest.registered_nodes[name] + -- water above grass if name == "ignore" or not def or def.liquidtype ~= "none" then return end @@ -108,10 +88,7 @@ local grass_spread = function(pos, node) -- find all default and ethereal grasses in area around dirt local positions, grasses = minetest.find_nodes_in_area( {x = pos.x - 1, y = pos.y - 2, z = pos.z - 1}, - {x = pos.x + 1, y = pos.y + 2, z = pos.z + 1}, --- {"group:ethereal_grass", "default:dirt_with_grass", --- "default:dirt_with_dry_grass", "default:dirt_with_snow"}) - dirts) + {x = pos.x + 1, y = pos.y + 2, z = pos.z + 1}, dirts) -- count new grass nodes for n = 1, #dirts do @@ -129,11 +106,6 @@ local grass_spread = function(pos, node) return end - -- change default green grass to ethereal green grass - if curr_type == "default:dirt_with_grass" then - curr_type = "ethereal:green_dirt" - end - minetest.swap_node(pos, {name = curr_type}) end @@ -296,18 +268,18 @@ for _, ab in pairs(minetest.registered_abms) do local node2 = ab.nodenames and ab.nodenames[2] or "" local neigh = ab.neighbors and ab.neighbors[1] or "" - -- find dirt to grass abm and replace with spread function + -- find 'dirt to grass abm' and replace with spread function if label == "Grass spread" or (node1 == "default:dirt" and neigh == "default:dirt_with_grass") then --ab.interval = 2 --ab.chance = 1 - ab.nodenames = {"default:dirt_with_grass", "default:dirt"} + ab.nodenames = {"default:dirt"} ab.neighbors = {"air"} ab.action = grass_spread - -- find grass devoid of light to dirt abm and change to devoid function + -- find 'grass devoid of light to dirt' abm and change to devoid function elseif label == "Grass covered" or (node1 == "default:dirt_with_grass" and node2 == "default:dirt_with_dry_grass") then diff --git a/lucky_block.lua b/lucky_block.lua index cdbcc51..837bcd8 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -33,7 +33,6 @@ lucky_block:add_blocks({ {"dro", {"ethereal:palm_sapling"} ,5}, {"dro", {"ethereal:birch_sapling"} ,5}, {"dro", {"ethereal:redwood_sapling"} ,1}, - {"dro", {"ethereal:green_dirt"}, 10}, {"dro", {"ethereal:prairie_dirt"}, 10}, {"dro", {"ethereal:grove_dirt"}, 10}, {"dro", {"ethereal:cold_dirt"}, 10}, diff --git a/mapgen.lua b/mapgen.lua index e900b75..cded3b9 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -97,7 +97,7 @@ if ethereal.glacier == 1 then }) end -add_biome("clearing", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("clearing", nil, "default:dirt_with_grass", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 71, 45, 65, 1) -- ADDED add_biome("bamboo", nil, "ethereal:bamboo_dirt", 1, "default:dirt", 3, @@ -125,7 +125,7 @@ add_biome("frost", nil, "ethereal:crystal_dirt", 1, "default:dirt", 3, add_biome("frost_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 1, 10, 40, ethereal.frost) -add_biome("grassy", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("grassy", nil, "default:dirt_with_grass", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 91, 13, 40, ethereal.grassy) add_biome("grassy_ocean", nil, "defaut:sand", 2, "default:gravel", 1, @@ -145,7 +145,7 @@ else nil, nil, nil, nil, nil, -192, 1, 15, 30, ethereal.grayness) end -add_biome("grassytwo", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("grassytwo", nil, "default:dirt_with_grass", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 91, 15, 40, ethereal.grassytwo) add_biome("grassytwo_ocean", nil, "default:sand", 1, "default:sand", 2, @@ -157,7 +157,7 @@ add_biome("prairie", nil, "ethereal:prairie_dirt", 1, "default:dirt", 3, add_biome("prairie_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 1, 20, 40, ethereal.prairie) -add_biome("jumble", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("jumble", nil, "default:dirt_with_grass", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 71, 25, 50, ethereal.jumble) add_biome("jumble_ocean", nil, "default:sand", 1, "default:sand", 2, @@ -216,7 +216,7 @@ add_biome("fiery_ocean", nil, "default:sand", 1, "default:sand", 2, add_biome("sandclay", nil, "default:sand", 3, "default:clay", 2, nil, nil, nil, nil, nil, 1, 11, 65, 2, ethereal.sandclay) -add_biome("swamp", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("swamp", nil, "default:dirt_with_grass", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 7, 80, 90, ethereal.swamp) add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2, @@ -274,17 +274,17 @@ add_schem({"ethereal:cold_dirt"}, 0.025, {"snowy"}, 10, 40, dpath .. "pine_tree. add_schem({"default:dirt_with_snow"}, 0.025, {"alpine"}, 40, 140, path .. "pinetree.mts", ethereal.alpine) -- default apple tree -add_schem({"ethereal:green_dirt"}, 0.02, {"jumble"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) -add_schem({"ethereal:green_dirt"}, 0.03, {"grassy"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) +add_schem({"default:dirt_with_grass"}, 0.02, {"jumble"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) +add_schem({"default:dirt_with_grass"}, 0.03, {"grassy"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) -- big old tree -add_schem({"ethereal:green_dirt"}, 0.001, {"jumble"}, 1, 100, path .. "bigtree.mts", ethereal.jumble) +add_schem({"default:dirt_with_grass"}, 0.001, {"jumble"}, 1, 100, path .. "bigtree.mts", ethereal.jumble) -- aspen tree -add_schem({"ethereal:green_dirt"}, 0.02, {"grassytwo"}, 1, 50, dpath .. "aspen_tree.mts", ethereal.jumble) +add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 1, 50, dpath .. "aspen_tree.mts", ethereal.jumble) -- birch tree -add_schem({"ethereal:green_dirt"}, 0.02, {"grassytwo"}, 50, 100, ethereal.birchtree, ethereal.grassytwo) +add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 50, 100, ethereal.birchtree, ethereal.grassytwo) -- orange tree add_schem({"ethereal:prairie_dirt"}, 0.01, {"prairie"}, 1, 100, ethereal.orangetree, ethereal.prairie) @@ -331,7 +331,7 @@ add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100, ethereal.bambootr add_schem({"ethereal:bamboo_dirt"}, 0.08, {"bamboo"}, 1, 100, ethereal.bush, ethereal.bamboo) -- vine tree -add_schem({"ethereal:green_dirt"}, 0.02, {"swamp"}, 1, 100, path .. "vinetree.mts", ethereal.swamp) +add_schem({"default:dirt_with_grass"}, 0.02, {"swamp"}, 1, 100, path .. "vinetree.mts", ethereal.swamp) -- bush minetest.register_decoration({ @@ -411,10 +411,10 @@ add_node({"default:dirt_with_dry_grass"}, 0.10, {"mesa"}, 1, 100, {"default:dry_ "default:dry_grass_3", "default:dry_grass_4", "default:dry_grass_5"}, nil, nil, nil, ethereal.mesa) -- flowers & strawberry -add_node({"ethereal:green_dirt"}, 0.025, {"grassy"}, 1, 100, {"flowers:dandelion_white", +add_node({"default:dirt_with_grass"}, 0.025, {"grassy"}, 1, 100, {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, ethereal.grassy) -add_node({"ethereal:green_dirt"}, 0.025, {"grassytwo"}, 1, 100, {"flowers:dandelion_white", +add_node({"default:dirt_with_grass"}, 0.025, {"grassytwo"}, 1, 100, {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, ethereal.grassytwo) @@ -446,11 +446,11 @@ add_node({"ethereal:mushroom_dirt"}, 0.01, {"mushroom"}, 1, 100, {"flowers:mushr local list = { {"junglee", {"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, ethereal.junglee}, - {"grassy", {"ethereal:green_dirt"}, ethereal.grassy}, - {"grassytwo", {"ethereal:green_dirt"}, ethereal.grassytwo}, + {"grassy", {"default:dirt_with_grass"}, ethereal.grassy}, + {"grassytwo", {"default:dirt_with_grass"}, ethereal.grassytwo}, {"prairie", {"ethereal:prairie_dirt"}, ethereal.prairie}, {"mushroom", {"ethereal:mushroom_dirt"}, ethereal.mushroom}, - {"swamp", {"ethereal:green_dirt"}, ethereal.swamp}, + {"swamp", {"default:dirt_with_grass"}, ethereal.swamp}, } -- wild red and brown mushrooms @@ -480,15 +480,15 @@ end -- jungle grass add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.10, {"junglee"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.junglee) -add_node({"ethereal:green_dirt"}, 0.15, {"jumble"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.jumble) -add_node({"ethereal:green_dirt"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp) +add_node({"default:dirt_with_grass"}, 0.15, {"jumble"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.jumble) +add_node({"default:dirt_with_grass"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp) -- grass -add_node({"ethereal:green_dirt"}, 0.35, {"grassy"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"default:dirt_with_grass"}, 0.35, {"grassy"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grassy) -add_node({"ethereal:green_dirt"}, 0.35, {"grassytwo"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"default:dirt_with_grass"}, 0.35, {"grassytwo"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grassytwo) -add_node({"ethereal:green_dirt"}, 0.35, {"jumble"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"default:dirt_with_grass"}, 0.35, {"jumble"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.35, {"junglee"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.junglee) @@ -498,7 +498,7 @@ add_node({"ethereal:grove_dirt"}, 0.35, {"grove"}, 1, 100, {"default:grass_2", " "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grove) add_node({"ethereal:bamboo_dirt"}, 0.35, {"bamboo"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.bamboo) -add_node({"ethereal:green_dirt"}, 0.35, {"clearing", "swamp"}, 1, 100, {"default:grass_3", +add_node({"default:dirt_with_grass"}, 0.35, {"clearing", "swamp"}, 1, 100, {"default:grass_3", "default:grass_4"}, nil, nil, nil, 1) -- grass on sand @@ -506,22 +506,22 @@ add_node({"default:sand"}, 0.25, {"sandclay"}, 3, 4, {"default:grass_2", "defaul -- ferns add_node({"ethereal:grove_dirt"}, 0.2, {"grove"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.grove) -add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) +add_node({"default:dirt_with_grass"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) -- snow add_node({"ethereal:cold_dirt"}, 0.8, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) add_node({"default:dirt_with_snow"}, 0.8, {"alpine"}, 40, 140, {"default:snow"}, nil, nil, nil, ethereal.alpine) -- wild onion -add_node({"ethereal:green_dirt"}, 0.25, {"grassy"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassy) -add_node({"ethereal:green_dirt"}, 0.25, {"grassytwo"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassytwo) -add_node({"ethereal:green_dirt"}, 0.25, {"jumble"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.jumble) +add_node({"default:dirt_with_grass"}, 0.25, {"grassy"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassy) +add_node({"default:dirt_with_grass"}, 0.25, {"grassytwo"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassytwo) +add_node({"default:dirt_with_grass"}, 0.25, {"jumble"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:prairie_dirt"}, 0.25, {"prairie"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.prairie) -- papyrus -add_node({"ethereal:green_dirt"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) +add_node({"default:dirt_with_grass"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.1, {"junglee"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.junglee) -add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) +add_node({"default:dirt_with_grass"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) --= Farming Redo plants @@ -533,14 +533,14 @@ print ("[MOD] Ethereal - Farming Redo detected and in use") add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.035, {"junglee"}, 1, 100, {"farming:potato_3"}, nil, nil, nil, ethereal.junglee) -- carrot, cucumber, potato, tomato, corn, coffee, raspberry, rhubarb -add_node({"ethereal:green_dirt"}, 0.05, {"grassytwo"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"default:dirt_with_grass"}, 0.05, {"grassytwo"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.grassytwo) -add_node({"ethereal:green_dirt"}, 0.05, {"grassy"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"default:dirt_with_grass"}, 0.05, {"grassy"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4", "farming:beetroot_5"}, nil, nil, nil, ethereal.grassy) -add_node({"ethereal:green_dirt"}, 0.05, {"jumble"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"default:dirt_with_grass"}, 0.05, {"jumble"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", @@ -550,16 +550,16 @@ add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 100, {"farming:carrot_ -- melon and pumpkin add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.015, {"junglee"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.junglee) -add_node({"ethereal:green_dirt"}, 0.015, {"grassy"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy) -add_node({"ethereal:green_dirt"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo) -add_node({"ethereal:green_dirt"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble) +add_node({"default:dirt_with_grass"}, 0.015, {"grassy"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy) +add_node({"default:dirt_with_grass"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo) +add_node({"default:dirt_with_grass"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble) -- green beans -add_node({"ethereal:green_dirt"}, 0.035, {"grassytwo"}, 1, 100, {"farming:beanbush"}, nil, nil, nil, ethereal.grassytwo) +add_node({"default:dirt_with_grass"}, 0.035, {"grassytwo"}, 1, 100, {"farming:beanbush"}, nil, nil, nil, ethereal.grassytwo) -- grape bushel -add_node({"ethereal:green_dirt"}, 0.025, {"grassytwo"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassytwo) -add_node({"ethereal:green_dirt"}, 0.025, {"grassy"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassy) +add_node({"default:dirt_with_grass"}, 0.025, {"grassytwo"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassytwo) +add_node({"default:dirt_with_grass"}, 0.025, {"grassy"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassy) add_node({"ethereal:prairie_dirt"}, 0.025, {"prairie"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.prairie) minetest.register_decoration({ @@ -727,7 +727,7 @@ if minetest.get_modpath("bakedclay") then minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "ethereal:green_dirt", + "ethereal:prairie_grass", "default:dirt_with_grass", "ethereal:grove_dirt" }, sidelen = 16, @@ -747,7 +747,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "ethereal:green_dirt", + "ethereal:prairie_grass", "default:dirt_with_grass", "ethereal:grove_dirt", "ethereal:bamboo_dirt" }, sidelen = 16, @@ -785,7 +785,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", - place_on = {"ethereal:green_dirt", "default:sand"}, + place_on = {"default:dirt_with_grass", "default:sand"}, sidelen = 16, noise_params = { offset = 0, diff --git a/plantpack.lua b/plantpack.lua index 03e1096..51d7aaa 100644 --- a/plantpack.lua +++ b/plantpack.lua @@ -34,7 +34,7 @@ minetest.register_decoration({ -- Grass minetest.register_decoration({ deco_type = "simple", - place_on = {"ethereal:prairie_dirt", "ethereal:green_dirt"}, + place_on = {"ethereal:prairie_dirt", "default:dirt_with_grass"}, sidelen = 16, fill_ratio = 0.005, biomes = {"prairie", "grassy", "grassytwo"}, @@ -48,7 +48,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "ethereal:green_dirt", + "ethereal:prairie_grass", "default:dirt_with_grass", "ethereal:grove_dirt", "ethereal:bamboo_dirt" }, sidelen = 16, @@ -63,7 +63,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "ethereal:green_dirt", + "ethereal:prairie_grass", "default:dirt_with_grass", "ethereal:grove_dirt" }, sidelen = 16, @@ -79,7 +79,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "ethereal:green_dirt", + "ethereal:prairie_grass", "default:dirt_with_grass", "ethereal:grove_dirt", "ethereal:jungle_grass", "ethereal:gray_dirt", "default:dirt_with_rainforest_litter" }, @@ -96,7 +96,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", - place_on = {"ethereal:jungle_dirt", "ethereal:green_dirt", "default:dirt_with_rainforest_litter"}, + place_on = {"ethereal:jungle_dirt", "default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, sidelen = 16, fill_ratio = 0.007, biomes = {"junglee", "jumble"}, @@ -144,7 +144,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", - place_on = {"default:sand", "ethereal:green_dirt"}, + place_on = {"default:sand", "default:dirt_with_grass"}, sidelen = 16, fill_ratio = 0.015, biomes = {"sandclay", "grassy_ocean", "grassy", "grassytwo", "jumble", "swamp"}, @@ -161,7 +161,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:mushroom_dirt", "ethereal:green_dirt", + "ethereal:mushroom_dirt", "default:dirt_with_grass", "ethereal:gray_dirt", "ethereal:cold_dirt", "ethereal:dirt_with_snow", "ethereal:jungle_dirt", "ethereal:prairie_dirt", "ethereal:grove_dirt", @@ -184,7 +184,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:green_dirt", + "default:dirt_with_grass", }, sidelen = 16, fill_ratio = 0.004, diff --git a/sapling.lua b/sapling.lua index 431ebe6..6ace2f2 100644 --- a/sapling.lua +++ b/sapling.lua @@ -165,7 +165,6 @@ ethereal.grow_sapling = function (pos, node) ethereal.grow_yellow_tree(pos) elseif node.name == "ethereal:big_tree_sapling" - --and under == "ethereal:green_dirt" then and under == "default:dirt_with_grass" then ethereal.grow_big_tree(pos) @@ -203,7 +202,6 @@ ethereal.grow_sapling = function (pos, node) ethereal.grow_bamboo_tree(pos) elseif node.name == "ethereal:birch_sapling" - --and under == "ethereal:green_dirt" then and under == "default:dirt_with_grass" then ethereal.grow_birch_tree(pos) end diff --git a/water.lua b/water.lua index a698ebb..70abbc8 100644 --- a/water.lua +++ b/water.lua @@ -117,7 +117,7 @@ minetest.register_abm({ if node == "ethereal:dry_dirt" then minetest.swap_node(pos, {name = "default:dirt"}) else - minetest.swap_node(pos, {name = "ethereal:green_dirt"}) + minetest.swap_node(pos, {name = "default:dirt_with_grass"}) end end, })