From cfb741356b184a107b4bacd4518ba28f6f6cd781 Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Sun, 2 Apr 2023 21:44:58 -0400 Subject: [PATCH] Add MCL support --- .luacheckrc | 1 + .luarc.json | 3 +- init.lua | 6 --- mapgen.lua | 8 ++-- mapgen_after.lua | 18 ++++----- mapgen_aliases_default.lua | 59 ---------------------------- mapgen_aliases_mcl.lua | 59 ---------------------------- mapgen_bamboo_forest.lua | 20 +++++----- mapgen_bamboo_forest_under.lua | 12 +++--- mapgen_baobab_savanna.lua | 28 ++++++------- mapgen_coral_forest.lua | 4 +- mapgen_coral_forest_deep_ocean.lua | 34 ++++++++-------- mapgen_coral_forest_dunes.lua | 4 +- mapgen_coral_forest_ocean.lua | 6 +-- mapgen_coral_forest_under.lua | 10 ++--- mapgen_crystal_forest.lua | 4 +- mapgen_crystal_forest_deep_ocean.lua | 22 +++++------ mapgen_crystal_forest_dunes.lua | 4 +- mapgen_crystal_forest_ocean.lua | 6 +-- mapgen_crystal_forest_shore.lua | 6 +-- mapgen_crystal_forest_under.lua | 12 +++--- mapgen_cursed_lands.lua | 2 +- mapgen_cursed_lands_deep_ocean.lua | 22 +++++------ mapgen_cursed_lands_dunes.lua | 2 +- mapgen_cursed_lands_ocean.lua | 4 +- mapgen_cursed_lands_swamp.lua | 2 +- mapgen_cursed_lands_under.lua | 8 ++-- mapgen_forsaken_desert.lua | 2 +- mapgen_forsaken_desert_ocean.lua | 2 +- mapgen_forsaken_desert_under.lua | 8 ++-- mapgen_forsaken_tundra.lua | 4 +- mapgen_forsaken_tundra_beach.lua | 4 +- mapgen_forsaken_tundra_ocean.lua | 6 +-- mapgen_forsaken_tundra_under.lua | 14 +++---- mapgen_frosted_icesheet.lua | 4 +- mapgen_frosted_icesheet_ocean.lua | 10 ++--- mapgen_frosted_icesheet_under.lua | 10 ++--- minetest.example.mcl.conf | 24 +++++------ mod.conf | 2 +- nodes.lua | 36 ++--------------- 40 files changed, 171 insertions(+), 321 deletions(-) delete mode 100644 mapgen_aliases_default.lua delete mode 100644 mapgen_aliases_mcl.lua diff --git a/.luacheckrc b/.luacheckrc index e479442..b210396 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -88,4 +88,5 @@ read_globals = { "mcl_core", "mcl_util", "mcl_doors", + "mcl_vars", } diff --git a/.luarc.json b/.luarc.json index ad0c354..fa23f99 100644 --- a/.luarc.json +++ b/.luarc.json @@ -117,7 +117,8 @@ "mcl_stairs", "mcl_core", "mcl_util", - "mcl_doors" + "mcl_doors", + "mcl_vars" ] } } diff --git a/init.lua b/init.lua index 9507697..e18a83a 100644 --- a/init.lua +++ b/init.lua @@ -35,12 +35,6 @@ dofile(path .. '/trees.lua') dofile(path .. '/vines.lua') dofile(path .. '/chests.lua') -if minetest.get_modpath('default') then - dofile(path .. '/mapgen_aliases_default.lua') -elseif minetest.get_modpath('mcl_core') then - dofile(path .. '/mapgen_aliases_mcl.lua') -end - dofile(path .. '/mapgen.lua') if Everness.settings.biomes.everness_bamboo_forest_under.enabled then diff --git a/mapgen.lua b/mapgen.lua index 98965bd..303fc60 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -27,7 +27,7 @@ minetest.register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', - wherein = 'everness_mapgen_stone', + wherein = 'default:stone', clust_scarcity = 13 * 13 * 13, clust_num_ores = 5, clust_size = 3, @@ -38,7 +38,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', - wherein = 'everness_mapgen_stone', + wherein = 'default:stone', clust_scarcity = 15 * 15 * 15, clust_num_ores = 3, clust_size = 2, @@ -49,7 +49,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', - wherein = 'everness_mapgen_stone', + wherein = 'default:stone', clust_scarcity = 13 * 13 * 13, clust_num_ores = 5, clust_size = 3, @@ -62,7 +62,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = 'scatter', ore = 'everness:quartz_ore', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 10 * 10 * 10, clust_num_ores = 6, clust_size = 5, diff --git a/mapgen_after.lua b/mapgen_after.lua index fb73267..9fea01d 100644 --- a/mapgen_after.lua +++ b/mapgen_after.lua @@ -19,13 +19,13 @@ -- Get the content IDs for the nodes used. local c_air = minetest.get_content_id('air') local c_dirt_with_grass_1 = minetest.get_content_id('everness:dirt_with_grass_1') -local c_dirt_with_rainforest_litter = minetest.get_content_id('everness_mapgen_dirt_with_rainforest_litter') +local c_dirt_with_rainforest_litter = minetest.get_content_id('default:dirt_with_rainforest_litter') local c_dirt_with_cursed_grass = minetest.get_content_id('everness:dirt_with_cursed_grass') local c_dirt_with_crystal_grass = minetest.get_content_id('everness:dirt_with_crystal_grass') local c_crystal_sand = minetest.get_content_id('everness:crystal_sand') local c_dry_ocean_dirt = minetest.get_content_id('everness:dry_ocean_dirt') -local c_dirt_with_snow = minetest.get_content_id('everness_mapgen_dirt_with_snow') -local c_dirt_with_coniferous_litter = minetest.get_content_id('everness_mapgen_dirt_with_coniferous_litter') +local c_dirt_with_snow = minetest.get_content_id('default:dirt_with_snow') +local c_dirt_with_coniferous_litter = minetest.get_content_id('default:dirt_with_coniferous_litter') local c_forsaken_desert_sand = minetest.get_content_id('everness:forsaken_desert_sand') local c_forsaken_desert_chiseled_stone = minetest.get_content_id('everness:forsaken_desert_chiseled_stone') local c_forsaken_desert_brick = minetest.get_content_id('everness:forsaken_desert_brick') @@ -214,9 +214,9 @@ minetest.register_on_generated(function(minp, maxp, blockseed) vector.new(s_pos.x - 6, s_pos.y - 1, s_pos.z - 6), vector.new(s_pos.x + 6, s_pos.y + 1, s_pos.z + 6), { - 'everness_mapgen_dirt_with_snow', - 'everness_mapgen_dirt_with_coniferous_litter', - 'everness_mapgen_snow' + 'default:dirt_with_snow', + 'default:dirt_with_coniferous_litter', + 'default:snow' }) if #positions < 137 then @@ -312,9 +312,9 @@ minetest.register_on_generated(function(minp, maxp, blockseed) 'everness:forsaken_desert_chiseled_stone', 'everness:forsaken_desert_brick', 'everness:forsaken_desert_engraved_stone', - 'everness_mapgen_stone', - 'everness_mapgen_sand', - 'everness_mapgen_gravel', + 'default:stone', + 'default:sand', + 'default:gravel', 'everness_mapgen_stone_with_coal', 'everness_mapgen_stone_with_iron', 'everness_mapgen_stone_with_tin', diff --git a/mapgen_aliases_default.lua b/mapgen_aliases_default.lua deleted file mode 100644 index b7847d7..0000000 --- a/mapgen_aliases_default.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ - Everness. Never ending discovery in Everness mapgen. - Copyright (C) 2023 SaKeL - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to juraj.vajda@gmail.com ---]] - -minetest.register_alias('everness_mapgen_stone', 'default:stone') -minetest.register_alias('everness_mapgen_water_source', 'default:water_source') -minetest.register_alias('everness_mapgen_lava_source', 'default:lava_source') -minetest.register_alias('everness_mapgen_sand', 'default:sand') -minetest.register_alias('everness_mapgen_stair_bamboo_wood', 'stairs:stair_bamboo_wood') -minetest.register_alias('everness_mapgen_dry_dirt_with_dry_grass', 'default:dry_dirt_with_dry_grass') -minetest.register_alias('everness_mapgen_dry_dirt', 'default:dry_dirt') -minetest.register_alias('everness_mapgen_cobble', 'default:cobble') -minetest.register_alias('everness_mapgen_mossycobble', 'default:mossycobble') -minetest.register_alias('everness_mapgen_stair_cobble', 'stairs:stair_cobble') -minetest.register_alias('everness_mapgen_stair_coral_deep_ocean_sandstone_block', 'stairs:stair_coral_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_coral_sandstone', 'stairs:stair_coral_sandstone') -minetest.register_alias('everness_mapgen_stair_coral_desert_cobble', 'stairs:stair_coral_desert_cobble') -minetest.register_alias('everness_mapgen_stair_coral_desert_stone_block', 'stairs:stair_coral_desert_stone_block') -minetest.register_alias('everness_mapgen_stair_crystal_forest_deep_ocean_sandstone_block', 'stairs:stair_crystal_forest_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_cursed_lands_deep_ocean_sandstone_block', 'stairs:stair_cursed_lands_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_cursed_sandstone_brick', 'stairs:stair_cursed_sandstone_brick') -minetest.register_alias('everness_mapgen_stair_cursed_brick', 'stairs:stair_cursed_brick') -minetest.register_alias('everness_mapgen_stair_forsaken_desert_brick', 'stairs:stair_forsaken_desert_brick') -minetest.register_alias('everness_mapgen_stair_forsaken_tundra_cobble', 'stairs:stair_forsaken_tundra_cobble') -minetest.register_alias('everness_mapgen_stair_ice', 'stairs:stair_ice') -minetest.register_alias('everness_mapgen_dirt_with_rainforest_litter', 'default:dirt_with_rainforest_litter') -minetest.register_alias('everness_mapgen_dirt_with_snow', 'default:dirt_with_snow') -minetest.register_alias('everness_mapgen_dirt_with_grass', 'default:dirt_with_grass') -minetest.register_alias('everness_mapgen_dirt_with_coniferous_litter', 'default:dirt_with_coniferous_litter') -minetest.register_alias('everness_mapgen_snow', 'default:snow') -minetest.register_alias('everness_mapgen_gravel', 'default:gravel') -minetest.register_alias('everness_mapgen_clay', 'default:clay') -minetest.register_alias('everness_mapgen_grass_1', 'default:grass_1') -minetest.register_alias('everness_mapgen_grass_2', 'default:grass_2') -minetest.register_alias('everness_mapgen_grass_3', 'default:grass_3') -minetest.register_alias('everness_mapgen_grass_4', 'default:grass_4') -minetest.register_alias('everness_mapgen_grass_5', 'default:grass_5') -minetest.register_alias('everness_mapgen_flowers_rose', 'flowers:rose') -minetest.register_alias('everness_mapgen_flowers_tulip', 'flowers:tulip') -minetest.register_alias('everness_mapgen_flowers_dandelion_yellow', 'flowers:dandelion_yellow') -minetest.register_alias('everness_mapgen_flowers_chrysanthemum_green', 'flowers:chrysanthemum_green') -minetest.register_alias('everness_mapgen_flowers_geranium', 'flowers:geranium') -minetest.register_alias('everness_mapgen_flowers_viola', 'flowers:viola') -minetest.register_alias('everness_mapgen_flowers_dandelion_white', 'flowers:dandelion_white') -minetest.register_alias('everness_mapgen_flowers_tulip_black', 'flowers:tulip_black') diff --git a/mapgen_aliases_mcl.lua b/mapgen_aliases_mcl.lua deleted file mode 100644 index ba56494..0000000 --- a/mapgen_aliases_mcl.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ - Everness. Never ending discovery in Everness mapgen. - Copyright (C) 2023 SaKeL - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to juraj.vajda@gmail.com ---]] - -minetest.register_alias('everness_mapgen_stone', 'mcl_core:stone') -minetest.register_alias('everness_mapgen_water_source', 'mcl_core:water_source') -minetest.register_alias('everness_mapgen_lava_source', 'mcl_core:lava_source') -minetest.register_alias('everness_mapgen_sand', 'mcl_core:sand') -minetest.register_alias('everness_mapgen_stair_bamboo_wood', 'mcl_stairs:stair_bamboo_wood') -minetest.register_alias('everness_mapgen_dry_dirt_with_dry_grass', 'mcl_core:dirt_with_grass') -minetest.register_alias('everness_mapgen_dry_dirt', 'mcl_core:coarse_dirt') -minetest.register_alias('everness_mapgen_cobble', 'mcl_core:cobble') -minetest.register_alias('everness_mapgen_mossycobble', 'mcl_core:mossycobble') -minetest.register_alias('everness_mapgen_stair_cobble', 'mcl_stairs:stair_cobble') -minetest.register_alias('everness_mapgen_stair_coral_deep_ocean_sandstone_block', 'mcl_stairs:stair_coral_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_coral_sandstone', 'mcl_stairs:stair_coral_sandstone') -minetest.register_alias('everness_mapgen_stair_coral_desert_cobble', 'mcl_stairs:stair_coral_desert_cobble') -minetest.register_alias('everness_mapgen_stair_coral_desert_stone_block', 'mcl_stairs:stair_coral_desert_stone_block') -minetest.register_alias('everness_mapgen_stair_crystal_forest_deep_ocean_sandstone_block', 'mcl_stairs:stair_crystal_forest_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_cursed_lands_deep_ocean_sandstone_block', 'mcl_stairs:stair_cursed_lands_deep_ocean_sandstone_block') -minetest.register_alias('everness_mapgen_stair_cursed_sandstone_brick', 'mcl_stairs:stair_cursed_sandstone_brick') -minetest.register_alias('everness_mapgen_stair_cursed_brick', 'mcl_stairs:stair_cursed_brick') -minetest.register_alias('everness_mapgen_stair_forsaken_desert_brick', 'mcl_stairs:stair_forsaken_desert_brick') -minetest.register_alias('everness_mapgen_stair_forsaken_tundra_cobble', 'mcl_stairs:stair_forsaken_tundra_cobble') -minetest.register_alias('everness_mapgen_stair_ice', 'mcl_stairs:stair_ice') -minetest.register_alias('everness_mapgen_dirt_with_rainforest_litter', 'mcl_core:dirt_with_grass') -minetest.register_alias('everness_mapgen_dirt_with_snow', 'mcl_core:dirt_with_grass_snow') -minetest.register_alias('everness_mapgen_dirt_with_grass', 'default:dirt_with_grass') -minetest.register_alias('everness_mapgen_dirt_with_coniferous_litter', 'mcl_core:podzol') -minetest.register_alias('everness_mapgen_snow', 'mcl_core:snow') -minetest.register_alias('everness_mapgen_gravel', 'mcl_core:gravel') -minetest.register_alias('everness_mapgen_clay', 'mcl_colorblocks:hardened_clay') -minetest.register_alias('everness_mapgen_grass_1', 'mcl_flowers:tallgrass') -minetest.register_alias('everness_mapgen_grass_2', 'mcl_flowers:tallgrass') -minetest.register_alias('everness_mapgen_grass_3', 'mcl_flowers:tallgrass') -minetest.register_alias('everness_mapgen_grass_4', 'mcl_flowers:tallgrass') -minetest.register_alias('everness_mapgen_grass_5', 'mcl_flowers:tallgrass') -minetest.register_alias('everness_mapgen_flowers_rose', 'mcl_flowers:wither_rose') -minetest.register_alias('everness_mapgen_flowers_tulip', 'mcl_flowers:tulip_orange') -minetest.register_alias('everness_mapgen_flowers_dandelion_yellow', 'mcl_flowers:dandelion') -minetest.register_alias('everness_mapgen_flowers_chrysanthemum_green', 'mcl_flowers:tulip_white') -minetest.register_alias('everness_mapgen_flowers_geranium', 'mcl_flowers:allium') -minetest.register_alias('everness_mapgen_flowers_viola', 'mcl_flowers:azure_bluet') -minetest.register_alias('everness_mapgen_flowers_dandelion_white', 'mcl_flowers:tulip_pink') -minetest.register_alias('everness_mapgen_flowers_tulip_black', 'mcl_flowers:tulip_white') diff --git a/mapgen_bamboo_forest.lua b/mapgen_bamboo_forest.lua index 34b94bb..1250e9e 100644 --- a/mapgen_bamboo_forest.lua +++ b/mapgen_bamboo_forest.lua @@ -31,11 +31,11 @@ minetest.register_biome({ depth_top = 1, node_filler = 'everness:dirt_1', depth_filler = 1, - node_riverbed = 'everness_mapgen_sand', + node_riverbed = 'default:sand', depth_riverbed = 2, node_dungeon = 'everness:bamboo_wood', node_dungeon_alt = 'everness:bamboo_mosaic_wood', - node_dungeon_stair = 'everness_mapgen_stair_bamboo_wood', + node_dungeon_stair = 'stairs:stair_bamboo_wood', y_max = y_max, y_min = y_min, heat_point = 80, @@ -248,14 +248,14 @@ register_grass_decoration(0.03, 0.03, 1) -- Flowers -register_flower(436, 'everness_mapgen_flowers_rose') -register_flower(19822, 'everness_mapgen_flowers_tulip') -register_flower(1220999, 'everness_mapgen_flowers_dandelion_yellow') -register_flower(800081, 'everness_mapgen_flowers_chrysanthemum_green') -register_flower(36662, 'everness_mapgen_flowers_geranium') -register_flower(1133, 'everness_mapgen_flowers_viola') -register_flower(73133, 'everness_mapgen_flowers_dandelion_white') -register_flower(42, 'everness_mapgen_flowers_tulip_black') +register_flower(436, 'flowers:rose') +register_flower(19822, 'flowers:tulip') +register_flower(1220999, 'flowers:dandelion_yellow') +register_flower(800081, 'flowers:chrysanthemum_green') +register_flower(36662, 'flowers:geranium') +register_flower(1133, 'flowers:viola') +register_flower(73133, 'flowers:dandelion_white') +register_flower(42, 'flowers:tulip_black') -- -- On Generated diff --git a/mapgen_bamboo_forest_under.lua b/mapgen_bamboo_forest_under.lua index 9ab1d5c..935875f 100644 --- a/mapgen_bamboo_forest_under.lua +++ b/mapgen_bamboo_forest_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_bamboo_forest_under.y_min minetest.register_biome({ name = 'everness_bamboo_forest_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'everness:bamboo_wood', node_dungeon_alt = 'everness:bamboo_mosaic_wood', - node_dungeon_stair = 'everness_mapgen_stair_bamboo_wood', + node_dungeon_stair = 'stairs:stair_bamboo_wood', y_max = y_max, y_min = y_min, heat_point = 80, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:bamboo_forest_under_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 10, biomes = { 'everness_bamboo_forest_under' }, @@ -54,14 +54,14 @@ minetest.register_decoration({ flags = 'all_floors,force_placement', decoration = { 'everness:moss_block', - 'everness_mapgen_clay' + 'default:clay' }, }) minetest.register_decoration({ name = 'everness:bamboo_forest_under_ceiling', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_bamboo_forest_under' }, @@ -156,7 +156,7 @@ minetest.register_decoration({ deco_type = 'simple', place_on = { 'everness:moss_block', - 'everness_mapgen_clay' + 'default:clay' }, sidelen = 16, noise_params = { diff --git a/mapgen_baobab_savanna.lua b/mapgen_baobab_savanna.lua index 922d181..229b38a 100644 --- a/mapgen_baobab_savanna.lua +++ b/mapgen_baobab_savanna.lua @@ -27,15 +27,15 @@ local y_min = Everness.settings.biomes.everness_baobab_savanna.y_min minetest.register_biome({ name = 'everness_baobab_savanna', - node_top = 'everness_mapgen_dry_dirt_with_dry_grass', + node_top = 'default:dry_dirt_with_dry_grass', depth_top = 1, - node_filler = 'everness_mapgen_dry_dirt', + node_filler = 'default:dry_dirt', depth_filler = 1, - node_riverbed = 'everness_mapgen_sand', + node_riverbed = 'default:sand', depth_riverbed = 2, - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobble', + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 80, @@ -54,7 +54,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:baobab_savanna_dry_dirt_with_dry_grass', deco_type = 'simple', - place_on = { 'everness_mapgen_dry_dirt_with_dry_grass' }, + place_on = { 'default:dry_dirt_with_dry_grass' }, sidelen = 4, noise_params = { offset = -1.5, @@ -67,7 +67,7 @@ minetest.register_decoration({ biomes = { 'everness_baobab_savanna' }, y_max = y_max, y_min = y_min, - decoration = 'everness_mapgen_dry_dirt', + decoration = 'default:dry_dirt', place_offset_y = -1, flags = 'force_placement', }) @@ -75,8 +75,8 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:baobab_savanna_baobab_tree_1', deco_type = 'schematic', - place_on = { 'everness_mapgen_dry_dirt_with_dry_grass', 'everness_mapgen_dry_dirt' }, - spawn_by = { 'everness_mapgen_dry_dirt_with_dry_grass', 'everness_mapgen_dry_dirt' }, + place_on = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, + spawn_by = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, num_spawn_by = 8, sidelen = 16, noise_params = { @@ -98,8 +98,8 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:baobab_savanna_baobab_tree_2', deco_type = 'schematic', - place_on = { 'everness_mapgen_dry_dirt_with_dry_grass', 'everness_mapgen_dry_dirt' }, - spawn_by = { 'everness_mapgen_dry_dirt_with_dry_grass', 'everness_mapgen_dry_dirt' }, + place_on = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, + spawn_by = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, num_spawn_by = 8, sidelen = 16, noise_params = { @@ -143,7 +143,7 @@ if acacia_log_schem then minetest.register_decoration({ name = 'everness:baobab_savanna_acacia_log', deco_type = 'schematic', - place_on = { 'everness_mapgen_dry_dirt_with_dry_grass' }, + place_on = { 'default:dry_dirt_with_dry_grass' }, place_offset_y = 1, sidelen = 16, noise_params = { @@ -160,7 +160,7 @@ if acacia_log_schem then schematic = acacia_log_schem, flags = 'place_center_x', rotation = 'random', - spawn_by = 'everness_mapgen_dry_dirt_with_dry_grass', + spawn_by = 'default:dry_dirt_with_dry_grass', num_spawn_by = 8, }) end diff --git a/mapgen_coral_forest.lua b/mapgen_coral_forest.lua index 3eccd35..9b353f8 100644 --- a/mapgen_coral_forest.lua +++ b/mapgen_coral_forest.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:coral_desert_stone_block', node_dungeon_alt = 'everness:coral_desert_stone_brick', - node_dungeon_stair = 'everness_mapgen_stair_coral_desert_stone_block', + node_dungeon_stair = 'stairs:stair_coral_desert_stone_block', y_max = y_max, y_min = y_min, heat_point = 60, @@ -54,7 +54,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_coral_forest_deep_ocean.lua b/mapgen_coral_forest_deep_ocean.lua index 652a876..d95f281 100644 --- a/mapgen_coral_forest_deep_ocean.lua +++ b/mapgen_coral_forest_deep_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:coral_forest_deep_ocean_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:coral_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:coral_deep_ocean_sandstone_brick', - node_dungeon_stair = 'everness_mapgen_stair_coral_deep_ocean_sandstone_block', + node_dungeon_stair = 'stairs:stair_coral_deep_ocean_sandstone_block', y_max = y_max, y_min = y_min, heat_point = 60, @@ -51,7 +51,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, @@ -78,7 +78,7 @@ minetest.register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_pink', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, noise_params = { @@ -100,7 +100,7 @@ minetest.register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_cyan', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, noise_params = { @@ -122,7 +122,7 @@ minetest.register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_green', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, noise_params = { @@ -144,7 +144,7 @@ minetest.register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_red', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, noise_params = { @@ -166,7 +166,7 @@ minetest.register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_pink', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -181,7 +181,7 @@ minetest.register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_cyan', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -196,7 +196,7 @@ minetest.register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_green', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -211,7 +211,7 @@ minetest.register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_red', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -234,7 +234,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:coral_deep_ocean_mud' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -257,7 +257,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:coral_forest_deep_ocean_coral_plant_1' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -280,7 +280,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:coral_forest_deep_ocean_coral_plant_2' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -303,7 +303,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:coral_forest_deep_ocean_coral_plant_3' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -311,7 +311,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('everness_mapgen_water_source') +local c_water_source = minetest.get_content_id('default:water_source') local c_coral_forest_deep_ocean_sand = minetest.get_content_id('everness:coral_forest_deep_ocean_sand') -- Localize data buffer table outside the loop, to be re-used for all @@ -380,7 +380,7 @@ minetest.register_on_generated(function(minp, maxp, blockseed) local water_source_positions = minetest.find_nodes_in_area( vector.new(s_pos.x - 5, s_pos.y, s_pos.z - 6), vector.new(s_pos.x + 5, s_pos.y + 17, s_pos.z + 6), - { 'everness_mapgen_water_source' } + { 'default:water_source' } ) if #water_source_positions > (house_volume - house_volume / 3) then diff --git a/mapgen_coral_forest_dunes.lua b/mapgen_coral_forest_dunes.lua index e22600e..f9e76f5 100644 --- a/mapgen_coral_forest_dunes.lua +++ b/mapgen_coral_forest_dunes.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:coral_sandstone', node_dungeon_alt = 'everness:coral_sandstone_brick', - node_dungeon_stair = 'everness_mapgen_stair_coral_sandstone', + node_dungeon_stair = 'stairs:stair_coral_sandstone', vertical_blend = 1, y_max = y_max, y_min = y_min, @@ -55,7 +55,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_coral_forest_ocean.lua b/mapgen_coral_forest_ocean.lua index 9550363..bb1b058 100644 --- a/mapgen_coral_forest_ocean.lua +++ b/mapgen_coral_forest_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:coral_white_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:coral_desert_cobble', node_dungeon_alt = 'everness:coral_desert_mossy_cobble', - node_dungeon_stair = 'everness_mapgen_stair_coral_desert_cobble', + node_dungeon_stair = 'stairs:stair_coral_desert_cobble', y_max = y_max, y_min = y_min, heat_point = 60, @@ -51,7 +51,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_coral_forest_under.lua b/mapgen_coral_forest_under.lua index 635bda9..0c3e284 100644 --- a/mapgen_coral_forest_under.lua +++ b/mapgen_coral_forest_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_coral_forest_under.y_min minetest.register_biome({ name = 'everness_coral_forest_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'everness:coral_desert_cobble', node_dungeon_alt = 'everness:coral_desert_mossy_cobble', - node_dungeon_stair = 'everness_mapgen_stair_coral_desert_cobble', + node_dungeon_stair = 'stairs:stair_coral_desert_cobble', y_max = y_max, y_min = y_min, heat_point = 60, @@ -49,7 +49,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, @@ -75,7 +75,7 @@ minetest.register_ore({ minetest.register_decoration({ name = 'everness:coral_forest_under_desert_stone_with_moss_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, place_offset_y = -1, sidelen = 16, fill_ratio = 10, @@ -91,7 +91,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:coral_forest_under_mold_stone_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_coral_forest_under' }, diff --git a/mapgen_crystal_forest.lua b/mapgen_crystal_forest.lua index dd92dc1..aea48ee 100644 --- a/mapgen_crystal_forest.lua +++ b/mapgen_crystal_forest.lua @@ -33,8 +33,8 @@ minetest.register_biome({ depth_filler = 1, node_riverbed = 'everness:crystal_dirt', depth_riverbed = 2, - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, diff --git a/mapgen_crystal_forest_deep_ocean.lua b/mapgen_crystal_forest_deep_ocean.lua index 885cd2b..0d60369 100644 --- a/mapgen_crystal_forest_deep_ocean.lua +++ b/mapgen_crystal_forest_deep_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_forest_deep_ocean_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:crystal_forest_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:crystal_forest_deep_ocean_sandstone_brick', - node_dungeon_stair = 'everness_mapgen_stair_crystal_forest_deep_ocean_sandstone_block', + node_dungeon_stair = 'stairs:stair_crystal_forest_deep_ocean_sandstone_block', y_max = y_max, y_min = y_min, heat_point = 35, @@ -51,7 +51,7 @@ minetest.register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_1', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.003, @@ -66,7 +66,7 @@ minetest.register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_2', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.003, @@ -81,7 +81,7 @@ minetest.register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_3', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.003, @@ -104,7 +104,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:crystal_forest_deep_ocean_sand_with_crack' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -127,7 +127,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:crystal_forest_deep_ocean_coral_plant_1' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -150,7 +150,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:crystal_forest_deep_ocean_coral_plant_2' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -173,7 +173,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:crystal_forest_deep_ocean_coral_plant_3' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -181,7 +181,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('everness_mapgen_water_source') +local c_water_source = minetest.get_content_id('default:water_source') local c_crystal_forest_deep_ocean_sand = minetest.get_content_id('everness:crystal_forest_deep_ocean_sand') -- Localize data buffer table outside the loop, to be re-used for all @@ -249,7 +249,7 @@ minetest.register_on_generated(function(minp, maxp, blockseed) local water_source_positions = minetest.find_nodes_in_area( vector.new(s_pos.x - (ruins_size.x / 2), s_pos.y, s_pos.z - (ruins_size.z / 2)), vector.new(s_pos.x + (ruins_size.x / 2), s_pos.y + ruins_size.y, s_pos.z + (ruins_size.z / 2)), - { 'everness_mapgen_water_source' } + { 'default:water_source' } ) if #water_source_positions > (ruins_volume - ruins_volume / 3) then diff --git a/mapgen_crystal_forest_dunes.lua b/mapgen_crystal_forest_dunes.lua index 8a2849c..fd797cc 100644 --- a/mapgen_crystal_forest_dunes.lua +++ b/mapgen_crystal_forest_dunes.lua @@ -33,8 +33,8 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', vertical_blend = 1, y_max = y_max, diff --git a/mapgen_crystal_forest_ocean.lua b/mapgen_crystal_forest_ocean.lua index 49723e2..75c9c8f 100644 --- a/mapgen_crystal_forest_ocean.lua +++ b/mapgen_crystal_forest_ocean.lua @@ -33,9 +33,9 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_cave_liquid = 'default:water_source', + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, diff --git a/mapgen_crystal_forest_shore.lua b/mapgen_crystal_forest_shore.lua index da93395..4e83242 100644 --- a/mapgen_crystal_forest_shore.lua +++ b/mapgen_crystal_forest_shore.lua @@ -33,9 +33,9 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_cave_liquid = 'default:water_source', + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, diff --git a/mapgen_crystal_forest_under.lua b/mapgen_crystal_forest_under.lua index ace7cd7..9fc1ce5 100644 --- a/mapgen_crystal_forest_under.lua +++ b/mapgen_crystal_forest_under.lua @@ -27,9 +27,9 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_under.y_min minetest.register_biome({ name = 'everness_crystal_forest_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:crystal_forest_under_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, place_offset_y = -1, fill_ratio = 10, @@ -61,7 +61,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:crystal_forest_under_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_crystal_forest_under' }, @@ -204,7 +204,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:crystal_forest_under_crystal_cyan_ceiling', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, noise_params = { offset = 0, diff --git a/mapgen_cursed_lands.lua b/mapgen_cursed_lands.lua index 8a858e3..cc39c36 100644 --- a/mapgen_cursed_lands.lua +++ b/mapgen_cursed_lands.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:cursed_brick', node_dungeon_alt = 'everness:cursed_brick_with_growth', - node_dungeon_stair = 'everness_mapgen_stair_cursed_brick', + node_dungeon_stair = 'stairs:stair_cursed_brick', y_max = y_max, y_min = y_min, heat_point = 45, diff --git a/mapgen_cursed_lands_deep_ocean.lua b/mapgen_cursed_lands_deep_ocean.lua index ccc0897..858e8d6 100644 --- a/mapgen_cursed_lands_deep_ocean.lua +++ b/mapgen_cursed_lands_deep_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:cursed_lands_deep_ocean_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:cursed_lands_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:cursed_lands_deep_ocean_sandstone_brick', - node_dungeon_stair = 'everness_mapgen_stair_cursed_lands_deep_ocean_sandstone_block', + node_dungeon_stair = 'stairs:stair_cursed_lands_deep_ocean_sandstone_block', y_max = y_max, y_min = y_min, heat_point = 45, @@ -51,7 +51,7 @@ minetest.register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_alcyonacea', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -66,7 +66,7 @@ minetest.register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_ostracod', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -81,7 +81,7 @@ minetest.register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_octocurse', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, sidelen = 16, fill_ratio = 0.002, @@ -104,7 +104,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:cursed_lands_deep_ocean_sand_with_crack' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -127,7 +127,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:cursed_lands_deep_ocean_coral_plant_anemone' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -150,7 +150,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:cursed_lands_deep_ocean_coral_plant_darkilluma' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -173,7 +173,7 @@ minetest.register_decoration({ y_min = y_min, flags = 'force_placement', decoration = { 'everness:cursed_lands_deep_ocean_coral_plant_demon' }, - spawn_by = 'everness_mapgen_water_source', + spawn_by = 'default:water_source', num_spawn_by = 8, }) @@ -181,7 +181,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('everness_mapgen_water_source') +local c_water_source = minetest.get_content_id('default:water_source') local c_cursed_lands_deep_ocean_sand = minetest.get_content_id('everness:cursed_lands_deep_ocean_sand') -- Localize data buffer table outside the loop, to be re-used for all @@ -250,7 +250,7 @@ minetest.register_on_generated(function(minp, maxp, blockseed) local water_source_positions = minetest.find_nodes_in_area( vector.new(s_pos.x - 5, s_pos.y, s_pos.z - 5), vector.new(s_pos.x + 5, s_pos.y + 11, s_pos.z + 5), - { 'everness_mapgen_water_source' } + { 'default:water_source' } ) if #water_source_positions > skull_volume / 3 then diff --git a/mapgen_cursed_lands_dunes.lua b/mapgen_cursed_lands_dunes.lua index 748d6e9..a207820 100644 --- a/mapgen_cursed_lands_dunes.lua +++ b/mapgen_cursed_lands_dunes.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:cursed_sandstone_brick', node_dungeon_alt = 'everness:cursed_sandstone_block', - node_dungeon_stair = 'everness_mapgen_stair_cursed_sandstone_brick', + node_dungeon_stair = 'stairs:stair_cursed_sandstone_brick', vertical_blend = 1, y_max = y_max, y_min = y_min, diff --git a/mapgen_cursed_lands_ocean.lua b/mapgen_cursed_lands_ocean.lua index 658f883..2a85f6a 100644 --- a/mapgen_cursed_lands_ocean.lua +++ b/mapgen_cursed_lands_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:cursed_stone', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:cursed_lands_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:cursed_lands_deep_ocean_sandstone_brick', - node_dungeon_stair = 'everness_mapgen_stair_cursed_lands_deep_ocean_sandstone_block', + node_dungeon_stair = 'stairs:stair_cursed_lands_deep_ocean_sandstone_block', y_max = y_max, y_min = y_min, heat_point = 45, diff --git a/mapgen_cursed_lands_swamp.lua b/mapgen_cursed_lands_swamp.lua index 11d260e..d720ce1 100644 --- a/mapgen_cursed_lands_swamp.lua +++ b/mapgen_cursed_lands_swamp.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:cursed_sandstone_brick', node_dungeon_alt = 'everness:cursed_sandstone_block', - node_dungeon_stair = 'everness_mapgen_stair_cursed_sandstone_brick', + node_dungeon_stair = 'stairs:stair_cursed_sandstone_brick', y_max = y_max, y_min = y_min, heat_point = 45, diff --git a/mapgen_cursed_lands_under.lua b/mapgen_cursed_lands_under.lua index dfd0856..e453efe 100644 --- a/mapgen_cursed_lands_under.lua +++ b/mapgen_cursed_lands_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_under.y_min minetest.register_biome({ name = 'everness_cursed_lands_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'everness:cursed_brick', node_dungeon_alt = 'everness:cursed_brick_with_growth', - node_dungeon_stair = 'everness_mapgen_stair_cursed_brick', + node_dungeon_stair = 'stairs:stair_cursed_brick', y_max = y_max, y_min = y_min, heat_point = 45, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:cursed_lands_under_soul_sandstone_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, place_offset_y = -1, sidelen = 16, fill_ratio = 10, @@ -60,7 +60,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:cursed_lands_under_mold_stone_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_cursed_lands_under' }, diff --git a/mapgen_forsaken_desert.lua b/mapgen_forsaken_desert.lua index 8e86a60..19055fa 100644 --- a/mapgen_forsaken_desert.lua +++ b/mapgen_forsaken_desert.lua @@ -36,7 +36,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:forsaken_desert_brick', node_dungeon_alt = 'everness:forsaken_desert_brick_red', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_desert_brick', + node_dungeon_stair = 'stairs:stair_forsaken_desert_brick', y_max = y_max, y_min = y_min, heat_point = 100, diff --git a/mapgen_forsaken_desert_ocean.lua b/mapgen_forsaken_desert_ocean.lua index 65898e3..d8ddc68 100644 --- a/mapgen_forsaken_desert_ocean.lua +++ b/mapgen_forsaken_desert_ocean.lua @@ -39,7 +39,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:forsaken_desert_brick', node_dungeon_alt = 'everness:forsaken_desert_brick_red', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_desert_brick', + node_dungeon_stair = 'stairs:stair_forsaken_desert_brick', y_max = y_max, y_min = y_min, heat_point = 100, diff --git a/mapgen_forsaken_desert_under.lua b/mapgen_forsaken_desert_under.lua index 772633c..efde7ef 100644 --- a/mapgen_forsaken_desert_under.lua +++ b/mapgen_forsaken_desert_under.lua @@ -27,9 +27,9 @@ local y_min = Everness.settings.biomes.everness_forsaken_desert_under.y_min minetest.register_biome({ name = 'everness_forsaken_desert_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, - node_dungeon = 'everness_mapgen_cobble', - node_dungeon_alt = 'everness_mapgen_mossycobble', + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, + node_dungeon = 'default:cobble', + node_dungeon_alt = 'default:mossycobble', node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:forsaken_desert_under_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, place_offset_y = -1, fill_ratio = 10, diff --git a/mapgen_forsaken_tundra.lua b/mapgen_forsaken_tundra.lua index 471b4ef..2b19039 100644 --- a/mapgen_forsaken_tundra.lua +++ b/mapgen_forsaken_tundra.lua @@ -36,7 +36,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_tundra_cobble', + node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', y_max = y_max, y_min = y_min, heat_point = 10, @@ -53,7 +53,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', - wherein = { 'everness_mapgen_stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_forsaken_tundra_beach.lua b/mapgen_forsaken_tundra_beach.lua index 28573d2..9a91e8b 100644 --- a/mapgen_forsaken_tundra_beach.lua +++ b/mapgen_forsaken_tundra_beach.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_tundra_cobble', + node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', vertical_blend = 1, y_max = y_max, y_min = y_min, @@ -53,7 +53,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', - wherein = { 'everness_mapgen_stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_forsaken_tundra_ocean.lua b/mapgen_forsaken_tundra_ocean.lua index 7191fa2..e45ad86 100644 --- a/mapgen_forsaken_tundra_ocean.lua +++ b/mapgen_forsaken_tundra_ocean.lua @@ -34,10 +34,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:forsaken_tundra_beach_sand', depth_riverbed = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_tundra_cobble', + node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', vertical_blend = 1, y_max = y_max, y_min = y_min, @@ -55,7 +55,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', - wherein = { 'everness_mapgen_stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, diff --git a/mapgen_forsaken_tundra_under.lua b/mapgen_forsaken_tundra_under.lua index 2031c9d..d675811 100644 --- a/mapgen_forsaken_tundra_under.lua +++ b/mapgen_forsaken_tundra_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_forsaken_tundra_under.y_min minetest.register_biome({ name = 'everness_forsaken_tundra_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'everness_mapgen_stair_forsaken_tundra_cobble', + node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', y_max = y_max, y_min = y_min, heat_point = 10, @@ -47,7 +47,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', - wherein = { 'everness_mapgen_stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, @@ -71,7 +71,7 @@ minetest.register_ore({ minetest.register_decoration({ name = 'everness:forsaken_tundra_under_mold_stone_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, place_offset_y = -1, fill_ratio = 10, @@ -87,7 +87,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:forsaken_tundra_under_mold_stone_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_forsaken_tundra_under' }, @@ -102,7 +102,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:forsaken_tundra_under_obsidian_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone', 'everness:mold_stone_with_moss' }, + place_on = { 'default:stone', 'everness:mold_stone_with_moss' }, sidelen = 16, place_offset_y = -1, fill_ratio = 0.02, @@ -120,7 +120,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:forsaken_tundra_under_obsidian_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone', 'everness:moss_block' }, + place_on = { 'default:stone', 'everness:moss_block' }, sidelen = 16, place_offset_y = -1, fill_ratio = 0.02, diff --git a/mapgen_frosted_icesheet.lua b/mapgen_frosted_icesheet.lua index bdc8c57..9cd8904 100644 --- a/mapgen_frosted_icesheet.lua +++ b/mapgen_frosted_icesheet.lua @@ -36,11 +36,11 @@ minetest.register_biome({ node_water_top = 'everness:frosted_ice', depth_water_top = 2, node_river_water = 'everness:frosted_ice', - node_riverbed = 'everness_mapgen_gravel', + node_riverbed = 'default:gravel', depth_riverbed = 2, node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'everness_mapgen_stair_ice', + node_dungeon_stair = 'stairs:stair_ice', y_max = y_max, y_min = y_min, heat_point = 0, diff --git a/mapgen_frosted_icesheet_ocean.lua b/mapgen_frosted_icesheet_ocean.lua index 133131a..7271b7f 100644 --- a/mapgen_frosted_icesheet_ocean.lua +++ b/mapgen_frosted_icesheet_ocean.lua @@ -27,16 +27,16 @@ local y_min = Everness.settings.biomes.everness_frosted_icesheet_ocean.y_min minetest.register_biome({ name = 'everness_frosted_icesheet_ocean', - node_top = 'everness_mapgen_sand', + node_top = 'default:sand', depth_top = 1, - node_filler = 'everness_mapgen_sand', + node_filler = 'default:sand', depth_filler = 3, node_water_top = 'everness:frosted_ice', depth_water_top = 2, - node_cave_liquid = 'everness_mapgen_water_source', + node_cave_liquid = 'default:water_source', node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'everness_mapgen_stair_ice', + node_dungeon_stair = 'stairs:stair_ice', y_max = y_max, y_min = y_min, heat_point = 0, @@ -52,7 +52,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:frosted_icesheet_ocean_corals', deco_type = 'simple', - place_on = { 'everness_mapgen_sand' }, + place_on = { 'default:sand' }, place_offset_y = -1, sidelen = 4, noise_params = { diff --git a/mapgen_frosted_icesheet_under.lua b/mapgen_frosted_icesheet_under.lua index cf36400..bfd253d 100644 --- a/mapgen_frosted_icesheet_under.lua +++ b/mapgen_frosted_icesheet_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_frosted_icesheet_under.y_min minetest.register_biome({ name = 'everness_frosted_icesheet_under', - node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'everness_mapgen_stair_ice', + node_dungeon_stair = 'stairs:stair_ice', y_max = y_max, y_min = y_min, heat_point = 0, @@ -47,7 +47,7 @@ minetest.register_biome({ minetest.register_ore({ ore_type = 'blob', ore = 'everness:bone', - wherein = { 'everness_mapgen_stone' }, + wherein = { 'default:stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, @@ -71,7 +71,7 @@ minetest.register_ore({ minetest.register_decoration({ name = 'everness:frosted_icesheet_under_floors', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, place_offset_y = -1, sidelen = 16, fill_ratio = 10, @@ -91,7 +91,7 @@ minetest.register_decoration({ minetest.register_decoration({ name = 'everness:frosted_icesheet_under_ceilings', deco_type = 'simple', - place_on = { 'everness_mapgen_stone' }, + place_on = { 'default:stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_frosted_icesheet_under' }, diff --git a/minetest.example.mcl.conf b/minetest.example.mcl.conf index 5985464..68bb035 100644 --- a/minetest.example.mcl.conf +++ b/minetest.example.mcl.conf @@ -1,5 +1,5 @@ everness_coral_forest = true -everness_coral_forest_y_max = 80 +everness_coral_forest_y_max = 194 everness_coral_forest_y_min = 6 everness_coral_forest_dunes = true everness_coral_forest_dunes_y_max = 5 @@ -9,21 +9,21 @@ everness_coral_forest_ocean_y_max = 3 everness_coral_forest_ocean_y_min = -10 everness_coral_forest_deep_ocean = true everness_coral_forest_deep_ocean_y_max = -11 -everness_coral_forest_deep_ocean_y_min = -31 +everness_coral_forest_deep_ocean_y_min = -62 everness_coral_forest_under = true everness_coral_forest_under_y_max = -28939 everness_coral_forest_under_y_min = -29067 everness_frosted_icesheet = true -everness_frosted_icesheet_y_max = 80 +everness_frosted_icesheet_y_max = 194 everness_frosted_icesheet_y_min = -8 everness_frosted_icesheet_ocean = true everness_frosted_icesheet_ocean_y_max = -9 -everness_frosted_icesheet_ocean_y_min = -31 +everness_frosted_icesheet_ocean_y_min = -62 everness_frosted_icesheet_under = true everness_frosted_icesheet_under_y_max = -28939 everness_frosted_icesheet_under_y_min = -29067 everness_cursed_lands = true -everness_cursed_lands_y_max = 80 +everness_cursed_lands_y_max = 194 everness_cursed_lands_y_min = 6 everness_cursed_lands_dunes = true everness_cursed_lands_dunes_y_max = 5 @@ -36,12 +36,12 @@ everness_cursed_lands_ocean_y_max = -2 everness_cursed_lands_ocean_y_min = -10 everness_cursed_lands_deep_ocean = true everness_cursed_lands_deep_ocean_y_max = -11 -everness_cursed_lands_deep_ocean_y_min = -31 +everness_cursed_lands_deep_ocean_y_min = -62 everness_cursed_lands_under = true everness_cursed_lands_under_y_max = -28939 everness_cursed_lands_under_y_min = -29067 everness_crystal_forest = true -everness_crystal_forest_y_max = 80 +everness_crystal_forest_y_max = 194 everness_crystal_forest_y_min = 6 everness_crystal_forest_dunes = true everness_crystal_forest_dunes_y_max = 5 @@ -54,18 +54,18 @@ everness_crystal_forest_ocean_y_max = 2 everness_crystal_forest_ocean_y_min = -10 everness_crystal_forest_deep_ocean = true everness_crystal_forest_deep_ocean_y_max = -11 -everness_crystal_forest_deep_ocean_y_min = -31 +everness_crystal_forest_deep_ocean_y_min = -62 everness_crystal_forest_under = true everness_crystal_forest_under_y_max = -28939 everness_crystal_forest_under_y_min = -29067 everness_bamboo_forest = true -everness_bamboo_forest_y_max = 80 +everness_bamboo_forest_y_max = 194 everness_bamboo_forest_y_min = 1 everness_bamboo_forest_under = true everness_bamboo_forest_under_y_max = -28939 everness_bamboo_forest_under_y_min = -29067 everness_forsaken_desert = true -everness_forsaken_desert_y_max = 80 +everness_forsaken_desert_y_max = 194 everness_forsaken_desert_y_min = 4 everness_forsaken_desert_ocean = true everness_forsaken_desert_ocean_y_max = 3 @@ -74,10 +74,10 @@ everness_forsaken_desert_under = true everness_forsaken_desert_under_y_max = -28939 everness_forsaken_desert_under_y_min = -29067 everness_baobab_savanna = true -everness_baobab_savanna_y_max = 80 +everness_baobab_savanna_y_max = 194 everness_baobab_savanna_y_min = 1 everness_forsaken_tundra = true -everness_forsaken_tundra_y_max = 80 +everness_forsaken_tundra_y_max = 194 everness_forsaken_tundra_y_min = 2 everness_forsaken_tundra_beach = true everness_forsaken_tundra_beach_y_max = 1 diff --git a/mod.conf b/mod.conf index d05baa7..b961c7b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,6 +1,6 @@ name = everness description = Never ending discovery in Everness mapgen. depends = -optional_depends = default, xpanes, doors, stairs, walls, x_obsidianmese, x_tumbleweed, x_farming, x_clay, mcl_core, mcl_fences, mcl_walls, mcl_stairs, mcl_util, mcl_autogroup, mcl_doors +optional_depends = default, xpanes, doors, stairs, walls, x_obsidianmese, x_tumbleweed, x_farming, x_clay, mcl_core, mcl_fences, mcl_walls, mcl_stairs, mcl_util, mcl_autogroup, mcl_doors, mcl_vars, mcl_mapgen_core, mcl_biomes, mcl_dungeons, mcl_structures, mcl_terrain_features, mcl_villages, tsm_railcorridors supported_games = minetest_game min_minetest_version = 5.4 diff --git a/nodes.lua b/nodes.lua index 6b1c052..f3853cb 100644 --- a/nodes.lua +++ b/nodes.lua @@ -460,7 +460,6 @@ Everness:register_node('everness:coral_bones', { pickaxey = 1, building_block = 1, coral = 2, - coral_block = 2 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -2504,8 +2503,8 @@ Everness:register_node('everness:frosted_snowblock', { on_construct = function(pos) pos.y = pos.y - 1 - local alias_dirt_with_grass = minetest.registered_aliases['everness_mapgen_dirt_with_grass'] - local alias_dirt_with_snow = minetest.registered_aliases['everness_mapgen_dirt_with_snow'] + local alias_dirt_with_grass = minetest.registered_aliases['default:dirt_with_grass'] + local alias_dirt_with_snow = minetest.registered_aliases['default:dirt_with_snow'] if minetest.get_node(pos).name == alias_dirt_with_grass then minetest.set_node(pos, { name = alias_dirt_with_snow }) @@ -2720,8 +2719,8 @@ Everness:register_node('everness:snowcobble', { on_construct = function(pos) pos.y = pos.y - 1 - local alias_dirt_with_grass = minetest.registered_aliases['everness_mapgen_dirt_with_grass'] - local alias_dirt_with_snow = minetest.registered_aliases['everness_mapgen_dirt_with_snow'] + local alias_dirt_with_grass = minetest.registered_aliases['default:dirt_with_grass'] + local alias_dirt_with_snow = minetest.registered_aliases['default:dirt_with_snow'] if minetest.get_node(pos).name == alias_dirt_with_grass then minetest.set_node(pos, { name = alias_dirt_with_snow }) @@ -7018,7 +7017,6 @@ Everness:register_node('everness:coral_corals', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7058,7 +7056,6 @@ Everness:register_node('everness:coral_jellyfish', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7098,7 +7095,6 @@ Everness:register_node('everness:coral_frosted', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7138,7 +7134,6 @@ Everness:register_node('everness:coral_starfish', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7179,7 +7174,6 @@ Everness:register_node('everness:sand_with_spine_kelp', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7261,7 +7255,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_plant_1', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7312,7 +7305,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_plant_2', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7363,7 +7355,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_plant_3', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7414,7 +7405,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_plant_anemone', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7465,7 +7455,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_plant_darkilluma' dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7516,7 +7505,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_plant_demon', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7567,7 +7555,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_plant_1', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7618,7 +7605,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_plant_2', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7669,7 +7655,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_plant_3', { dig_immediate = 3, deco_block = 1, coral = 1, - coral_plant = 1, }, _mcl_hardness = 0, _mcl_blast_resistance = 0, @@ -7713,7 +7698,6 @@ Everness:register_node('everness:crystal_coral_dark', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7731,7 +7715,6 @@ Everness:register_node('everness:crystal_coral_light', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7751,7 +7734,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_1', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7771,7 +7753,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_2', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7791,7 +7772,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_3', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7811,7 +7791,6 @@ Everness:register_node('everness:coral_forest_deep_ocean_coral_4', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7831,7 +7810,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_alcyonacea', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7851,7 +7829,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_ostracod', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7871,7 +7848,6 @@ Everness:register_node('everness:cursed_lands_deep_ocean_coral_octocurse', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7891,7 +7867,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_1', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7911,7 +7886,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_2', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7931,7 +7905,6 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_3', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6, @@ -7949,7 +7922,6 @@ Everness:register_node('everness:coral_skeleton', { pickaxey = 1, building_block = 1, coral = 1, - coral_block = 1 }, _mcl_hardness = 1.5, _mcl_blast_resistance = 6,