Morik666
/
VoxeLibre
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Improve some code

This commit is contained in:
FossFanatic 2023-02-14 18:14:10 +00:00
parent 319beb91ce
commit f919f73c24
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mods/MAPGEN/mcl_mapgen_core/init.lua
View File

@ -426,9 +426,9 @@ minetest.register_lbm({
nodenames = affected_grass_blocks, nodenames = affected_grass_blocks,
run_at_every_load = false, run_at_every_load = false,
action = function(pos, node) action = function(pos, node)
local reg_biome = mcl_util.get_registered_biome_from_pos(pos) local grass_palette_index = mcl_util.get_palette_indexes_from_pos(pos).grass_palette_index
if reg_biome and reg_biome._mcl_grass_palette_index and node.param2 ~= reg_biome._mcl_grass_palette_index then if node.param2 ~= grass_palette_index then
node.param2 = reg_biome._mcl_grass_palette_index node.param2 = grass_palette_index
minetest.set_node(pos, node) minetest.set_node(pos, node)
end end
end, end,
@ -440,17 +440,17 @@ minetest.register_lbm({
nodenames = {"group:foliage_palette", "group:foliage_palette_wallmounted"}, nodenames = {"group:foliage_palette", "group:foliage_palette_wallmounted"},
run_at_every_load = false, run_at_every_load = false,
action = function(pos, node) action = function(pos, node)
local reg_biome = mcl_util.get_registered_biome_from_pos(pos) local foliage_palette_index = mcl_util.get_palette_indexes_from_pos(pos).foliage_palette_index
local noplconvert = {"mcl_mangrove:mangroveleaves", "mcl_core:vine"} -- These do not convert into player leaves. local noplconvert = {"mcl_mangrove:mangroveleaves", "mcl_core:vine"} -- These do not convert into player leaves.
if reg_biome and reg_biome._mcl_foliage_palette_index and node.param2 == 1 and node.name ~= noplconvert then -- Convert old player leaves into the new versions. if node.param2 == 1 and node.name ~= noplconvert then -- Convert old player leaves into the new versions.
node.param2 = reg_biome._mcl_foliage_palette_index node.param2 = foliage_palette_index
minetest.remove_node(pos) -- Required, since otherwise this conversion won't work. minetest.remove_node(pos) -- Required, since otherwise this conversion won't work.
minetest.place_node(vector.offset(pos, 0, 1, 0), node) -- Offset required, since otherwise the leaves sink one node for some reason. minetest.place_node(vector.offset(pos, 0, 1, 0), node) -- Offset required, since otherwise the leaves sink one node for some reason.
elseif reg_biome and reg_biome._mcl_foliage_palette_index and node.param2 ~= reg_biome._mcl_foliage_palette_index and node.name ~= "mcl_core:vine" then elseif node.param2 ~= foliage_palette_index and node.name ~= "mcl_core:vine" then
node.param2 = reg_biome._mcl_foliage_palette_index node.param2 = foliage_palette_index
minetest.set_node(pos, node) minetest.set_node(pos, node)
elseif node.name == "mcl_core:vine" then elseif node.param2 ~= foliage_palette_index and node.name == "mcl_core:vine" then
local biome_param2 = reg_biome._mcl_foliage_palette_index local biome_param2 = foliage_palette_index
local rotation_param2 = node.param2 local rotation_param2 = node.param2
local final_param2 = (biome_param2 * 8) + rotation_param2 local final_param2 = (biome_param2 * 8) + rotation_param2
if node.param2 ~= final_param2 and rotation_param2 < 6 then if node.param2 ~= final_param2 and rotation_param2 < 6 then
@ -466,12 +466,12 @@ minetest.register_on_generated(function(minp, maxp, blockseed) -- Set correct pa
local foliage = minetest.find_nodes_in_area(pos1, pos2, {"group:foliage_palette", "group:foliage_palette_wallmounted"}) local foliage = minetest.find_nodes_in_area(pos1, pos2, {"group:foliage_palette", "group:foliage_palette_wallmounted"})
for _, fpos in pairs(foliage) do for _, fpos in pairs(foliage) do
local fnode = minetest.get_node(fpos) local fnode = minetest.get_node(fpos)
local reg_biome = mcl_util.get_registered_biome_from_pos(fpos) local foliage_palette_index = mcl_util.get_palette_indexes_from_pos(fpos).foliage_palette_index
if reg_biome and reg_biome._mcl_foliage_palette_index and fnode.param2 ~= reg_biome._mcl_foliage_palette_index and fnode.name ~= "mcl_core:vine" then if fnode.param2 ~= foliage_palette_index and fnode.name ~= "mcl_core:vine" then
fnode.param2 = reg_biome._mcl_foliage_palette_index fnode.param2 = foliage_palette_index
minetest.set_node(fpos, fnode) minetest.set_node(fpos, fnode)
elseif fnode.name == "mcl_core:vine" then elseif fnode.param2 ~= foliage_palette_index and fnode.name == "mcl_core:vine" then
local biome_param2 = reg_biome._mcl_foliage_palette_index local biome_param2 = foliage_palette_index
local rotation_param2 = fnode.param2 local rotation_param2 = fnode.param2
local final_param2 = (biome_param2 * 8) + rotation_param2 local final_param2 = (biome_param2 * 8) + rotation_param2
if fnode.param2 ~= final_param2 and rotation_param2 < 6 then if fnode.param2 ~= final_param2 and rotation_param2 < 6 then