From a55293d893c1e260c35d0e36ede36735494a48ff Mon Sep 17 00:00:00 2001 From: kno10 Date: Wed, 4 Dec 2024 19:52:44 +0100 Subject: [PATCH] Some optimizations for mapgen (#4566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some savings due to, e.g., `area:iter`, and some unnecessary code removal / code simplifications Some additional logging for getting more precise timings. Not very spectacular, but also not invasive. The slow parts seem to be data transfer to/from the voxelmanip, lighting/water updates and the ore generation in nether, so not much in lua code. Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4566 Reviewed-by: Mikita Wiśniewski Co-authored-by: kno10 Co-committed-by: kno10 --- mods/MAPGEN/mcl_mapgen_core/api.lua | 118 +++++++++---------- mods/MAPGEN/mcl_mapgen_core/init.lua | 168 +++++++++++---------------- 2 files changed, 127 insertions(+), 159 deletions(-) diff --git a/mods/MAPGEN/mcl_mapgen_core/api.lua b/mods/MAPGEN/mcl_mapgen_core/api.lua index 978fb7cda..a4dc8f2cf 100644 --- a/mods/MAPGEN/mcl_mapgen_core/api.lua +++ b/mods/MAPGEN/mcl_mapgen_core/api.lua @@ -1,77 +1,44 @@ local registered_generators = {} local lvm, nodes, param2 = 0, 0, 0 -local lvm_buffer = {} +local lvm_buffer, lvm_buffer2 = {}, {} -local logging = minetest.settings:get_bool("mcl_logging_mapgen",false) +local logging = minetest.settings:get_bool("mcl_logging_mapgen", false) +local log_timing = minetest.settings:get_bool("mcl_logging_mapgen_timing", false) -- detailed, for performance debugging -local function roundN(n, d) - if type(n) ~= "number" then return n end - local m = 10^d - return math.floor(n * m + 0.5) / m -end - -local function run_generators (p1, p2, blockseed) - if nodes > 0 then - for _, rec in ipairs(registered_generators) do - if rec.nf then - rec.nf(p1, p2, blockseed) +local function run_generators(minp, maxp, blockseed) + if nodes == 0 then return end + for _, rec in ipairs(registered_generators) do + if rec.nf then + local gt1 = os.clock() + rec.nf(vector.copy(minp), vector.copy(maxp), blockseed) -- defensive copies against some generator changing the vectors + if log_timing then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", rec.id, minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000)) end end end end -local function update_data (vm, data, data2) - -- Write stuff - vm:set_data(data) - if param2 > 0 then - vm:set_param2_data(data2) - end -end - -local function post_generator_processing(vm, minp, maxp, deco_used, deco_table, ore_used, ore_table) - if deco_table then - minetest.generate_decorations(vm,vector.new(minp.x,deco_table.min,minp.z),vector.new(maxp.x,deco_table.max,maxp.z)) - elseif deco_used then - minetest.generate_decorations(vm) - end - if ore_table then - minetest.generate_ores(vm,vector.new(minp.x,ore_table.min,minp.z),vector.new(maxp.x,ore_table.max,maxp.z)) - elseif ore_used then - minetest.generate_ores(vm) - end -end - -local function post_generator_processing_2(vm, p1, p2, shadow) - vm:calc_lighting(p1, p2, shadow) - vm:write_to_map() - vm:update_liquids() -end - minetest.register_on_generated(function(minp, maxp, blockseed) local t1 = os.clock() - local p1, p2 = {x=minp.x, y=minp.y, z=minp.z}, {x=maxp.x, y=maxp.y, z=maxp.z} if lvm > 0 then - local lvm_used, shadow, deco_used, deco_table, ore_used, ore_table = false, false, false, false, false, false - local lb2 = {} -- param2 local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") - local e1, e2 = {x=emin.x, y=emin.y, z=emin.z}, {x=emax.x, y=emax.y, z=emax.z} - local data2 + local area = VoxelArea(emin, emax) local data = vm:get_data(lvm_buffer) - if param2 > 0 then - data2 = vm:get_param2_data(lb2) + local data2 = param2 > 0 and vm:get_param2_data(lvm_buffer2) + if log_timing then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "get_data", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - t1)*1000)) end - local area = VoxelArea:new({MinEdge=e1, MaxEdge=e2}) + local lvm_used, shadow, deco_used, deco_table, ore_used, ore_table = false, false, false, false, false, false for _, rec in ipairs(registered_generators) do if rec.vf then + local gt1 = os.clock() + local p1, p2 = vector.copy(minp), vector.copy(maxp) -- defensive copies against some generator changing the vectors + local e1, e2 = vector.copy(emin), vector.copy(emax) -- defensive copies against some generator changing the vectors local lvm_used0, shadow0, deco, ore = rec.vf(vm, data, data2, e1, e2, area, p1, p2, blockseed) - if lvm_used0 then - lvm_used = true - end - if shadow0 then - shadow = true - end + lvm_used = lvm_used or lvm_used0 + shadow = shadow or shadow0 if deco and type(deco) == "table" then deco_table = deco elseif deco then @@ -82,26 +49,55 @@ minetest.register_on_generated(function(minp, maxp, blockseed) elseif deco then ore_used = true end + if log_timing then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", rec.id, minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000)) + end end end if lvm_used then - update_data (vm, data, data2) - post_generator_processing(vm, minp, maxp, deco_used, deco_table, ore_used, ore_table) - post_generator_processing_2(vm, p1, p2, shadow) + local gt1 = os.clock() + vm:set_data(data) + if param2 > 0 then vm:set_param2_data(data2) end + if log_timing then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "set_data", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000)) + end + local gt2 = os.clock() + if deco_table then + minetest.generate_decorations(vm,vector.new(minp.x,deco_table.min,minp.z),vector.new(maxp.x,deco_table.max,maxp.z)) + elseif deco_used then + minetest.generate_decorations(vm) + end + if log_timing and (deco_table or deco_used) then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "decorations", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt2)*1000)) + end + local gt3 = os.clock() + if ore_table then + minetest.generate_ores(vm,vector.new(minp.x,ore_table.min,minp.z),vector.new(maxp.x,ore_table.max,maxp.z)) + elseif ore_used then + minetest.generate_ores(vm) + end + if log_timing and (ore_table or ore_used) then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "ores", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt3)*1000)) + end + local gt4 = os.clock() + vm:calc_lighting(minp, maxp, shadow) + vm:update_liquids() + vm:write_to_map(false) + if log_timing then + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "light/write/liquids", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt4)*1000)) + end end end - run_generators (p1, p2, blockseed) + run_generators(minp, maxp, blockseed) mcl_vars.add_chunk(minp) if logging then - minetest.log("action", "[mcl_mapgen_core] Generating chunk " .. minetest.pos_to_string(minp) .. " ... " .. minetest.pos_to_string(maxp).."..."..tostring(roundN(((os.clock() - t1)*1000),2)).."ms") + minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "Generating chunk", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - t1)*1000)) end end) - - function minetest.register_on_generated(node_function) mcl_mapgen_core.register_generator("mod_"..minetest.get_current_modname().."_"..tostring(#registered_generators+1), nil, node_function) end diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua index 7f6413fb8..b560e7e0b 100644 --- a/mods/MAPGEN/mcl_mapgen_core/init.lua +++ b/mods/MAPGEN/mcl_mapgen_core/init.lua @@ -1,10 +1,6 @@ mcl_mapgen_core = {} local registered_generators = {} -local lvm, nodes, param2 = 0, 0, 0 -local lvm_used = false -local lvm_buffer = {} - local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) @@ -210,39 +206,42 @@ end -- If function(pos_to_check, content_id_at_this_pos), will set node only if returns true. -- min, max: Minimum and maximum Y levels of the layers to set -- minp, maxp: minp, maxp of the on_generated --- lvm_used: Set to true if any node in this on_generated has been set before. -- --- returns true if any node was set and lvm_used otherwise -local function set_layers(data, area, content_id, check, min, max, minp, maxp, lvm_used, pr) - if (maxp.y >= min and minp.y <= max) then - for y = math.max(min, minp.y), math.min(max, maxp.y) do - for x = minp.x, maxp.x do - for z = minp.z, maxp.z do - local p_pos = area:index(x, y, z) - if check then - if type(check) == "function" and check({x=x,y=y,z=z}, data[p_pos], pr) then - data[p_pos] = content_id - lvm_used = true - elseif check == data[p_pos] then - data[p_pos] = content_id - lvm_used = true - end - else - data[p_pos] = content_id - lvm_used = true - end - end +-- returns true if any node was set +local function set_layers(data, area, content_id, check, min, max, minp, maxp, pr) + if maxp.y < min or minp.y > max then return false end + local lvm_used = false + if check == nil then + for p_pos in area:iter(minp.x, math.max(min, minp.y), minp.z, maxp.x, math.min(max, maxp.y), maxp.z) do + data[p_pos] = content_id + lvm_used = true + end + elseif check and type(check) == "function" then + -- slow path, needs vector coordinates (bedrock uses y only) + for p_pos in area:iter(minp.x, math.max(min, minp.y), minp.z, maxp.x, math.min(max, maxp.y), maxp.z) do + if check(area:position(p_pos), data[p_pos], pr) then + data[p_pos] = content_id + lvm_used = true + end + end + else + for p_pos in area:iter(minp.x, math.max(min, minp.y), minp.z, maxp.x, math.min(max, maxp.y), maxp.z) do + if check == data[p_pos] then + data[p_pos] = content_id + lvm_used = true end end end return lvm_used end -local function set_grass_palette(minp,maxp,data2,area,biomemap,nodes) +local function set_grass_palette(minp,maxp,data2,area,nodes) -- Flat area at y=0 to read biome 3 times faster than 5.3.0.get_biome_data(pos).biome: 43us vs 125us per iteration: + local biomemap = minetest.get_mapgen_object("biomemap") if not biomemap then return end - local aream = VoxelArea:new({MinEdge={x=minp.x, y=0, z=minp.z}, MaxEdge={x=maxp.x, y=0, z=maxp.z}}) + local aream = VoxelArea(vector.new(minp.x, 0, minp.z), vector.new(maxp.x, 0, maxp.z)) local nodes = minetest.find_nodes_in_area(minp, maxp, nodes) + local lvm_used = false for n=1, #nodes do local n = nodes[n] local p_pos = area:index(n.x, n.y, n.z) @@ -259,11 +258,13 @@ local function set_grass_palette(minp,maxp,data2,area,biomemap,nodes) return lvm_used end -local function set_foliage_palette(minp,maxp,data2,area,biomemap,nodes) +local function set_foliage_palette(minp,maxp,data2,area,nodes) -- Flat area at y=0 to read biome 3 times faster than 5.3.0.get_biome_data(pos).biome: 43us vs 125us per iteration: + local biomemap = minetest.get_mapgen_object("biomemap") if not biomemap then return end - local aream = VoxelArea:new({MinEdge={x=minp.x, y=0, z=minp.z}, MaxEdge={x=maxp.x, y=0, z=maxp.z}}) + local aream = VoxelArea(vector.new(minp.x, 0, minp.z), vector.new(maxp.x, 0, maxp.z)) local nodes = minetest.find_nodes_in_area(minp, maxp, nodes) + local lvm_used = false for n=1, #nodes do local n = nodes[n] local p_pos = area:index(n.x, n.y, n.z) @@ -283,11 +284,13 @@ local function set_foliage_palette(minp,maxp,data2,area,biomemap,nodes) return lvm_used end -local function set_water_palette(minp,maxp,data2,area,biomemap,nodes) +local function set_water_palette(minp,maxp,data2,area,nodes) -- Flat area at y=0 to read biome 3 times faster than 5.3.0.get_biome_data(pos).biome: 43us vs 125us per iteration: + local biomemap = minetest.get_mapgen_object("biomemap") if not biomemap then return end - local aream = VoxelArea:new({MinEdge={x=minp.x, y=0, z=minp.z}, MaxEdge={x=maxp.x, y=0, z=maxp.z}}) + local aream = VoxelArea(vector.new(minp.x, 0, minp.z), vector.new(maxp.x, 0, maxp.z)) local nodes = minetest.find_nodes_in_area(minp, maxp, nodes) + local lvm_used = false for n=1, #nodes do local n = nodes[n] local p_pos = area:index(n.x, n.y, n.z) @@ -305,12 +308,11 @@ local function set_water_palette(minp,maxp,data2,area,biomemap,nodes) end local function set_seagrass_param2(minp,maxp,data2,area,nodes) - local aream = VoxelArea:new({MinEdge={x=minp.x, y=0, z=minp.z}, MaxEdge={x=maxp.x, y=0, z=maxp.z}}) local nodes = minetest.find_nodes_in_area(minp, maxp, nodes) + local lvm_used = false for n=1, #nodes do local n = nodes[n] - local p_pos = area:index(n.x, n.y, n.z) - data2[p_pos] = 3 + data2[area:index(n.x, n.y, n.z)] = 3 lvm_used = true end return lvm_used @@ -318,49 +320,47 @@ end -- Below the bedrock, generate air/void local function world_structure(vm, data, data2, emin, emax, area, minp, maxp, blockseed) - local biomemap --ymin, ymax - local lvm_used = false local pr = PseudoRandom(blockseed) + local lvm_used = false -- The Void below the Nether: - lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mapgen_edge_min , mcl_vars.mg_nether_min -1, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mapgen_edge_min , mcl_vars.mg_nether_min -1, minp, maxp, pr) or lvm_used -- [[ THE NETHER: mcl_vars.mg_nether_min mcl_vars.mg_nether_max ]] -- The Air on the Nether roof, https://git.minetest.land/VoxeLibre/VoxeLibre/issues/1186 - lvm_used = set_layers(data, area, c_air , nil, mcl_vars.mg_nether_max +1, mcl_vars.mg_nether_max + 128 , minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_air , nil, mcl_vars.mg_nether_max +1, mcl_vars.mg_nether_max + 128 , minp, maxp, pr) or lvm_used -- The Void above the Nether below the End: - lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_nether_max + 128 +1, mcl_vars.mg_end_min -1, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_nether_max + 128 +1, mcl_vars.mg_end_min -1, minp, maxp, pr) or lvm_used -- [[ THE END: mcl_vars.mg_end_min mcl_vars.mg_end_max ]] -- The Void above the End below the Realm barrier: - lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_end_max +1, mcl_vars.mg_realm_barrier_overworld_end_min-1, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_end_max +1, mcl_vars.mg_realm_barrier_overworld_end_min-1, minp, maxp, pr) or lvm_used -- Realm barrier between the Overworld void and the End - lvm_used = set_layers(data, area, c_realm_barrier, nil, mcl_vars.mg_realm_barrier_overworld_end_min , mcl_vars.mg_realm_barrier_overworld_end_max , minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_realm_barrier, nil, mcl_vars.mg_realm_barrier_overworld_end_min , mcl_vars.mg_realm_barrier_overworld_end_max , minp, maxp, pr) or lvm_used -- The Void above Realm barrier below the Overworld: - lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_realm_barrier_overworld_end_max+1, mcl_vars.mg_overworld_min -1, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_void , nil, mcl_vars.mg_realm_barrier_overworld_end_max+1, mcl_vars.mg_overworld_min -1, minp, maxp, pr) or lvm_used if mg_name ~= "singlenode" then -- Bedrock - lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_overworld_min, mcl_vars.mg_bedrock_overworld_max, minp, maxp, lvm_used, pr) - lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_nether_bottom_min, mcl_vars.mg_bedrock_nether_bottom_max, minp, maxp, lvm_used, pr) - lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_nether_top_min, mcl_vars.mg_bedrock_nether_top_max, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_overworld_min, mcl_vars.mg_bedrock_overworld_max, minp, maxp, pr) or lvm_used + lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_nether_bottom_min, mcl_vars.mg_bedrock_nether_bottom_max, minp, maxp, pr) or lvm_used + lvm_used = set_layers(data, area, c_bedrock, bedrock_check, mcl_vars.mg_bedrock_nether_top_min, mcl_vars.mg_bedrock_nether_top_max, minp, maxp, pr) or lvm_used -- Flat Nether if mg_name == "flat" then - lvm_used = set_layers(data, area, c_air, nil, mcl_vars.mg_flat_nether_floor, mcl_vars.mg_flat_nether_ceiling, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_air, nil, mcl_vars.mg_flat_nether_floor, mcl_vars.mg_flat_nether_ceiling, minp, maxp, pr) or lvm_used end -- Big lava seas by replacing air below a certain height if mcl_vars.mg_lava then - lvm_used = set_layers(data, area, c_lava, c_air, mcl_vars.mg_overworld_min, mcl_vars.mg_lava_overworld_max, minp, maxp, lvm_used, pr) - lvm_used = set_layers(data, area, c_nether_lava, c_air, mcl_vars.mg_nether_min, mcl_vars.mg_lava_nether_max, minp, maxp, lvm_used, pr) + lvm_used = set_layers(data, area, c_lava, c_air, mcl_vars.mg_overworld_min, mcl_vars.mg_lava_overworld_max, minp, maxp, pr) or lvm_used + lvm_used = set_layers(data, area, c_nether_lava, c_air, mcl_vars.mg_nether_min, mcl_vars.mg_lava_nether_max, minp, maxp, pr) or lvm_used end end - local deco = false - local ores = false + local deco, ores = false, false if minp.y > mcl_vars.mg_nether_deco_max - 64 and maxp.y < mcl_vars.mg_nether_max + 128 then deco = {min=mcl_vars.mg_nether_deco_max,max=mcl_vars.mg_nether_max} end @@ -372,57 +372,35 @@ local function world_structure(vm, data, data2, emin, emax, area, minp, maxp, bl end local function block_fixes_grass(vm, data, data2, emin, emax, area, minp, maxp, blockseed) - local biomemap = minetest.get_mapgen_object("biomemap") - local lvm_used = false - local pr = PseudoRandom(blockseed) - if minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min then - -- Set param2 (=color) of nodes which use the grass colour palette. - lvm_used = set_grass_palette(minp,maxp,data2,area,biomemap,{"group:grass_palette"}) - end - return lvm_used + -- Set param2 (=color) of nodes which use the grass colour palette. + return minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min and + set_grass_palette(minp,maxp,data2,area,{"group:grass_palette"}) end local function block_fixes_foliage(vm, data, data2, emin, emax, area, minp, maxp, blockseed) - local biomemap = minetest.get_mapgen_object("biomemap") - local lvm_used = false - local pr = PseudoRandom(blockseed) - if minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min then - -- Set param2 (=color) of nodes which use the foliage colour palette. - lvm_used = set_foliage_palette(minp,maxp,data2,area,biomemap,{"group:foliage_palette", "group:foliage_palette_wallmounted"}) - end - return lvm_used + -- Set param2 (=color) of nodes which use the foliage colour palette. + return minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min and + set_foliage_palette(minp,maxp,data2,area,{"group:foliage_palette", "group:foliage_palette_wallmounted"}) end local function block_fixes_water(vm, data, data2, emin, emax, area, minp, maxp, blockseed) - local biomemap = minetest.get_mapgen_object("biomemap") - local lvm_used = false - local pr = PseudoRandom(blockseed) - if minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min then - -- Set param2 (=color) of nodes which use the water colour palette. - lvm_used = set_water_palette(minp,maxp,data2,area,biomemap,{"group:water_palette"}) - end - return lvm_used + -- Set param2 (=color) of nodes which use the water colour palette. + return minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min and + set_water_palette(minp,maxp,data2,area,{"group:water_palette"}) end local function block_fixes_seagrass(vm, data, data2, emin, emax, area, minp, maxp, blockseed) - local lvm_used = false - local pr = PseudoRandom(blockseed) - if minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min then - -- Set param2 of seagrass to 3. - lvm_used = set_seagrass_param2(minp, maxp, data2, area, {"group:seagrass"}) - end - return lvm_used + -- Set param2 of seagrass to 3. + return minp.y <= mcl_vars.mg_overworld_max and maxp.y >= mcl_vars.mg_overworld_min and + set_seagrass_param2(minp, maxp, data2, area, {"group:seagrass"}) end -- End block fixes: local function end_basic(vm, data, data2, emin, emax, area, minp, maxp, blockseed) if maxp.y < mcl_vars.mg_end_min or minp.y > mcl_vars.mg_end_max then return end - local biomemap --ymin, ymax local lvm_used = false - local pr = PseudoRandom(blockseed) - local nodes if mg_name ~= "v6" then - nodes = minetest.find_nodes_in_area(emin, emax, {"mcl_core:water_source"}) + local nodes = minetest.find_nodes_in_area(emin, emax, {"mcl_core:water_source"}) if #nodes > 0 then lvm_used = true for _,n in pairs(nodes) do @@ -430,14 +408,13 @@ local function end_basic(vm, data, data2, emin, emax, area, minp, maxp, blocksee end end end - return true, false + vm:set_lighting({day=15,night=0}) + lvm_used = true -- light is broken otherwise + return lvm_used, false end - mcl_mapgen_core.register_generator("world_structure", world_structure, nil, 1, true) -mcl_mapgen_core.register_generator("end_fixes", end_basic, function(minp,maxp) - if maxp.y < mcl_vars.mg_end_min or minp.y > mcl_vars.mg_end_max then return end -end, 9999, true) +mcl_mapgen_core.register_generator("end_fixes", end_basic, nil, 9999, true) if mg_name ~= "v6" and mg_name ~= "singlenode" then mcl_mapgen_core.register_generator("block_fixes_grass", block_fixes_grass, nil, 9999, true) @@ -546,7 +523,8 @@ minetest.register_lbm({ -- We go outside x and y for where trees are placed next to a biome that has already been generated. -- We go above maxp.y because trees can often get placed close to the top of a generated area and folliage may not -- be coloured correctly. -local function fix_folliage_missed (minp, maxp) +local function fix_foliage_missed(minp, maxp) + if maxp.y < 0 then return end local pos1, pos2 = vector.offset(minp, -6, 0, -6), vector.offset(maxp, 6, 14, 6) local foliage = minetest.find_nodes_in_area(pos1, pos2, {"group:foliage_palette", "group:foliage_palette_wallmounted"}) for _, fpos in pairs(foliage) do @@ -566,10 +544,4 @@ local function fix_folliage_missed (minp, maxp) end end end - -minetest.register_on_generated(function(minp, maxp, blockseed) -- Set correct palette indexes of missed foliage. - if maxp.y < 0 then - return - end - fix_folliage_missed (minp, maxp) -end) +mcl_mapgen_core.register_generator("fix_foliage_missed", nil, fix_foliage_missed)