From 611a05f516da25b7ac0cd5aa7d07dfb116d83725 Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Fri, 31 Mar 2023 12:22:39 -0400 Subject: [PATCH] Remove hard dependency on default --- LICENSE.txt | 6 +-- functions.lua | 65 +++++++++++++++------------ init.lua | 4 ++ mapgen.lua | 8 ++-- mapgen_after.lua | 30 ++++++------- mapgen_aliases_default.lua | 59 ++++++++++++++++++++++++ mapgen_bamboo_forest.lua | 28 ++++++------ mapgen_bamboo_forest_under.lua | 16 +++---- 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 | 8 ++-- mapgen_coral_forest_under.lua | 10 ++--- mapgen_crystal_forest.lua | 6 +-- mapgen_crystal_forest_deep_ocean.lua | 22 ++++----- mapgen_crystal_forest_dunes.lua | 6 +-- mapgen_crystal_forest_ocean.lua | 10 ++--- mapgen_crystal_forest_shore.lua | 8 ++-- mapgen_crystal_forest_under.lua | 14 +++--- mapgen_cursed_lands.lua | 2 +- mapgen_cursed_lands_deep_ocean.lua | 22 ++++----- mapgen_cursed_lands_dunes.lua | 2 +- mapgen_cursed_lands_ocean.lua | 6 +-- 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 | 10 ++--- 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 | 12 ++--- mapgen_frosted_icesheet_under.lua | 10 ++--- nodes.lua | 47 ++++++++++++------- textures/everness_coral_skeleton.png | Bin 212 -> 269 bytes textures/everness_default_stone.png | Bin 232 -> 0 bytes textures/everness_gui_hb_bg.png | Bin 98 -> 0 bytes textures/everness_sequoia_wood.png | Bin 180 -> 324 bytes textures/everness_stone.png | Bin 0 -> 524 bytes 42 files changed, 306 insertions(+), 221 deletions(-) create mode 100644 mapgen_aliases_default.lua delete mode 100644 textures/everness_default_stone.png delete mode 100644 textures/everness_gui_hb_bg.png create mode 100644 textures/everness_stone.png diff --git a/LICENSE.txt b/LICENSE.txt index 9072029..56132c0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -835,7 +835,8 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_chest_ui_bg.png -- Derived from texture by XSSheep (CC BY 4.0) - everness_chest_ui_bg_hb_slot.png -- Derived from texture by XSSheep (CC BY 4.0) - everness_chest_ui_bg_slot.png -- Derived from texture by XSSheep (CC BY 4.0) -- everness_gui_hb_bg.png +- everness_stone.png +- everness_coral_skeleton.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated @@ -852,9 +853,6 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_coral_skeleton.png -**CC-BY-SA-3.0, Cisoun's texture pack** - -- everness_default_stone.png ### Sounds diff --git a/functions.lua b/functions.lua index 66f2762..916d416 100644 --- a/functions.lua +++ b/functions.lua @@ -265,23 +265,29 @@ Everness:register_leafdecay({ local moss_correspondences = { ['everness:coral_desert_cobble'] = 'everness:coral_desert_mossy_cobble', - ['stairs:slab_coral_desert_cobble'] = 'stairs:slab_coral_desert_mossy_cobble', - ['stairs:stair_coral_desert_cobble'] = 'stairs:stair_coral_desert_mossy_cobble', - ['stairs:stair_inner_coral_desert_cobble'] = 'stairs:stair_inner_coral_desert_mossy_cobble', - ['stairs:stair_outer_coral_desert_cobble'] = 'stairs:stair_outer_coral_desert_mossy_cobble', - ['everness:coral_desert_cobble_wall'] = 'everness:coral_desert_mossy_cobble_wall', } +local moss_nodenames_correspondences = { + 'everness:coral_desert_cobble', +} + +if minetest.get_modpath('default') then + moss_correspondences['stairs:slab_coral_desert_cobble'] = 'stairs:slab_coral_desert_mossy_cobble' + moss_correspondences['stairs:stair_coral_desert_cobble'] = 'stairs:stair_coral_desert_mossy_cobble' + moss_correspondences['stairs:stair_inner_coral_desert_cobble'] = 'stairs:stair_inner_coral_desert_mossy_cobble' + moss_correspondences['stairs:stair_outer_coral_desert_cobble'] = 'stairs:stair_outer_coral_desert_mossy_cobble' + moss_correspondences['everness:coral_desert_cobble_wall'] = 'everness:coral_desert_mossy_cobble_wall' + + table.insert(moss_nodenames_correspondences, 'stairs:slab_coral_desert_cobble') + table.insert(moss_nodenames_correspondences, 'stairs:stair_coral_desert_cobble') + table.insert(moss_nodenames_correspondences, 'stairs:stair_inner_coral_desert_cobble') + table.insert(moss_nodenames_correspondences, 'stairs:stair_outer_coral_desert_cobble') + table.insert(moss_nodenames_correspondences, 'everness:coral_desert_cobble_wall') +end + minetest.register_abm({ label = 'Everness Moss growth', - nodenames = { - 'everness:coral_desert_cobble', - 'stairs:slab_coral_desert_cobble', - 'stairs:stair_coral_desert_cobble', - 'stairs:stair_inner_coral_desert_cobble', - 'stairs:stair_outer_coral_desert_cobble', - 'everness:coral_desert_cobble_wall', - }, + nodenames = moss_nodenames_correspondences, neighbors = { 'group:water' }, interval = 16, chance = 200, @@ -303,6 +309,10 @@ local magma_correspondences = { ['everness:volcanic_rock'] = 'everness:volcanic_rock_with_magma', } +local magma_nodenames_correspondences = { + 'everness:volcanic_rock' +} + if minetest.get_modpath('default') then magma_correspondences['default:cobble'] = 'everness:magmacobble' magma_correspondences['stairs:slab_cobble'] = 'stairs:slab_magmacobble' @@ -315,24 +325,23 @@ if minetest.get_modpath('default') then magma_correspondences['stairs:stair_inner_volcanic_rock'] = 'stairs:stair_inner_volcanic_rock_with_magma' magma_correspondences['stairs:stair_outer_volcanic_rock'] = 'stairs:stair_outer_volcanic_rock_with_magma' magma_correspondences['everness:volcanic_rock_wall'] = 'everness:volcanic_rock_with_magma_wall' + + table.insert(magma_nodenames_correspondences, 'default:cobble') + table.insert(magma_nodenames_correspondences, 'stairs:slab_cobble') + table.insert(magma_nodenames_correspondences, 'stairs:stair_cobble') + table.insert(magma_nodenames_correspondences, 'stairs:stair_inner_cobble') + table.insert(magma_nodenames_correspondences, 'stairs:stair_outer_cobble') + table.insert(magma_nodenames_correspondences, 'walls:cobble') + table.insert(magma_nodenames_correspondences, 'stairs:slab_volcanic_rock') + table.insert(magma_nodenames_correspondences, 'stairs:stair_volcanic_rock') + table.insert(magma_nodenames_correspondences, 'stairs:stair_inner_volcanic_rock') + table.insert(magma_nodenames_correspondences, 'stairs:stair_outer_volcanic_rock') + table.insert(magma_nodenames_correspondences, 'everness:volcanic_rock_wall') end minetest.register_abm({ - label = 'Magma growth', - nodenames = { - 'default:cobble', - 'stairs:slab_cobble', - 'stairs:stair_cobble', - 'stairs:stair_inner_cobble', - 'stairs:stair_outer_cobble', - 'walls:cobble', - 'everness:volcanic_rock', - 'stairs:slab_volcanic_rock', - 'stairs:stair_volcanic_rock', - 'stairs:stair_inner_volcanic_rock', - 'stairs:stair_outer_volcanic_rock', - 'everness:volcanic_rock_wall', - }, + label = 'Everness Magma growth', + nodenames = magma_nodenames_correspondences, neighbors = { 'group:lava' }, interval = 16, chance = 200, diff --git a/init.lua b/init.lua index 1f179f9..2d50e9f 100644 --- a/init.lua +++ b/init.lua @@ -30,6 +30,10 @@ dofile(path .. '/trees.lua') dofile(path .. '/vines.lua') dofile(path .. '/chests.lua') +if minetest.get_modpath('default') then + dofile(path .. '/mapgen_aliases_default.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 303fc60..98965bd 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -27,7 +27,7 @@ minetest.register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', - wherein = 'default:stone', + wherein = 'everness_mapgen_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 = 'default:stone', + wherein = 'everness_mapgen_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 = 'default:stone', + wherein = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_stone' }, clust_scarcity = 10 * 10 * 10, clust_num_ores = 6, clust_size = 5, diff --git a/mapgen_after.lua b/mapgen_after.lua index 97767ab..6ef02cb 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('default:dirt_with_rainforest_litter') +local c_dirt_with_rainforest_litter = minetest.get_content_id('everness_mapgen_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('default:dirt_with_snow') -local c_dirt_with_coniferous_litter = minetest.get_content_id('default:dirt_with_coniferous_litter') +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_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), { - 'default:dirt_with_snow', - 'default:dirt_with_coniferous_litter', - 'default:snow' + 'everness_mapgen_dirt_with_snow', + 'everness_mapgen_dirt_with_coniferous_litter', + 'everness_mapgen_snow' }) if #positions < 137 then @@ -312,15 +312,15 @@ minetest.register_on_generated(function(minp, maxp, blockseed) 'everness:forsaken_desert_chiseled_stone', 'everness:forsaken_desert_brick', 'everness:forsaken_desert_engraved_stone', - 'default:stone', - 'default:sand', - 'default:gravel', - 'default:stone_with_coal', - 'default:stone_with_iron', - 'default:stone_with_tin', - 'default:stone_with_gold', - 'default:stone_with_mese', - 'default:stone_with_diamond', + 'everness_mapgen_stone', + 'everness_mapgen_sand', + 'everness_mapgen_gravel', + 'everness_mapgen_stone_with_coal', + 'everness_mapgen_stone_with_iron', + 'everness_mapgen_stone_with_tin', + 'everness_mapgen_stone_with_gold', + 'everness_mapgen_stone_with_mese', + 'everness_mapgen_stone_with_diamond', 'everness:cave_barrel_cactus', 'everness:venus_trap', 'everness:illumi_root', diff --git a/mapgen_aliases_default.lua b/mapgen_aliases_default.lua new file mode 100644 index 0000000..b7847d7 --- /dev/null +++ b/mapgen_aliases_default.lua @@ -0,0 +1,59 @@ +--[[ + 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_bamboo_forest.lua b/mapgen_bamboo_forest.lua index e2a6880..0c216dc 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 = 'default:sand', + node_riverbed = 'everness_mapgen_sand', depth_riverbed = 2, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_dungeon = 'everness:bamboo_wood', + node_dungeon_alt = 'everness:bamboo_mosaic_wood', + node_dungeon_stair = 'everness_mapgen_stair_bamboo_wood', y_max = y_max, y_min = y_min, heat_point = 80, @@ -150,7 +150,7 @@ local function register_grass_decoration(offset, scale, length) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = 'default:grass_' .. length, + decoration = 'everness_mapgen_grass_' .. length, }) end @@ -171,7 +171,7 @@ local function register_flower(seed, flower_name) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = 'flowers:' .. flower_name, + decoration = flower_name, }) end @@ -232,14 +232,14 @@ register_grass_decoration(0.03, 0.03, 1) -- Flowers -register_flower(436, 'rose') -register_flower(19822, 'tulip') -register_flower(1220999, 'dandelion_yellow') -register_flower(800081, 'chrysanthemum_green') -register_flower(36662, 'geranium') -register_flower(1133, 'viola') -register_flower(73133, 'dandelion_white') -register_flower(42, 'tulip_black') +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') -- -- On Generated diff --git a/mapgen_bamboo_forest_under.lua b/mapgen_bamboo_forest_under.lua index 05fcc37..9ab1d5c 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 = { 'default:water_source', 'default:lava_source' }, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_dungeon = 'everness:bamboo_wood', + node_dungeon_alt = 'everness:bamboo_mosaic_wood', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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', - 'default:clay' + 'everness_mapgen_clay' }, }) minetest.register_decoration({ name = 'everness:bamboo_forest_under_ceiling', deco_type = 'simple', - place_on = { 'default:stone' }, + place_on = { 'everness_mapgen_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', - 'default:clay' + 'everness_mapgen_clay' }, sidelen = 16, noise_params = { diff --git a/mapgen_baobab_savanna.lua b/mapgen_baobab_savanna.lua index 684d135..dfe17ae 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 = 'default:dry_dirt_with_dry_grass', + node_top = 'everness_mapgen_dry_dirt_with_dry_grass', depth_top = 1, - node_filler = 'default:dry_dirt', + node_filler = 'everness_mapgen_dry_dirt', depth_filler = 1, - node_riverbed = 'default:sand', + node_riverbed = 'everness_mapgen_sand', depth_riverbed = 2, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:dry_dirt_with_dry_grass' }, + place_on = { 'everness_mapgen_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 = 'default:dry_dirt', + decoration = 'everness_mapgen_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 = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, - spawn_by = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, + 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' }, 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 = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, - spawn_by = { 'default:dry_dirt_with_dry_grass', 'default:dry_dirt' }, + 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' }, num_spawn_by = 8, sidelen = 16, noise_params = { @@ -128,7 +128,7 @@ if acacia_log_schem then minetest.register_decoration({ name = 'everness:baobab_savanna_acacia_log', deco_type = 'schematic', - place_on = { 'default:dry_dirt_with_dry_grass' }, + place_on = { 'everness_mapgen_dry_dirt_with_dry_grass' }, place_offset_y = 1, sidelen = 16, noise_params = { @@ -145,7 +145,7 @@ if acacia_log_schem then schematic = acacia_log_schem, flags = 'place_center_x', rotation = 'random', - spawn_by = 'default:dry_dirt_with_dry_grass', + spawn_by = 'everness_mapgen_dry_dirt_with_dry_grass', num_spawn_by = 8, }) end diff --git a/mapgen_coral_forest.lua b/mapgen_coral_forest.lua index 9b353f8..3eccd35 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 = 'stairs:stair_coral_desert_stone_block', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_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 d95f281..652a876 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:coral_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:coral_deep_ocean_sandstone_brick', - node_dungeon_stair = 'stairs:stair_coral_deep_ocean_sandstone_block', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_water_source', num_spawn_by = 8, }) @@ -311,7 +311,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('default:water_source') +local c_water_source = minetest.get_content_id('everness_mapgen_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), - { 'default:water_source' } + { 'everness_mapgen_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 f9e76f5..e22600e 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 = 'stairs:stair_coral_sandstone', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_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 97cbf09..9550363 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:coral_desert_cobble', node_dungeon_alt = 'everness:coral_desert_mossy_cobble', - node_dungeon_stair = 'stairs:stair_coral_desert_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_stone' }, clust_scarcity = 16 * 16 * 16, clust_size = 5, y_max = y_max, @@ -97,6 +97,6 @@ minetest.register_decoration({ decoration = { 'everness:coral_corals', 'everness:coral_jellyfish', - 'default:coral_skeleton' + 'everness:coral_skeleton' }, }) diff --git a/mapgen_coral_forest_under.lua b/mapgen_coral_forest_under.lua index 0c3e284..635bda9 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 = { 'default:water_source', 'default:lava_source' }, + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, node_dungeon = 'everness:coral_desert_cobble', node_dungeon_alt = 'everness:coral_desert_mossy_cobble', - node_dungeon_stair = 'stairs:stair_coral_desert_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 ecae77f..dd92dc1 100644 --- a/mapgen_crystal_forest.lua +++ b/mapgen_crystal_forest.lua @@ -33,9 +33,9 @@ minetest.register_biome({ depth_filler = 1, node_riverbed = 'everness:crystal_dirt', depth_riverbed = 2, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_deep_ocean.lua b/mapgen_crystal_forest_deep_ocean.lua index 0d60369..885cd2b 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:crystal_forest_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:crystal_forest_deep_ocean_sandstone_brick', - node_dungeon_stair = 'stairs:stair_crystal_forest_deep_ocean_sandstone_block', + node_dungeon_stair = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_water_source', num_spawn_by = 8, }) @@ -181,7 +181,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('default:water_source') +local c_water_source = minetest.get_content_id('everness_mapgen_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)), - { 'default:water_source' } + { 'everness_mapgen_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 df2bcf8..8a2849c 100644 --- a/mapgen_crystal_forest_dunes.lua +++ b/mapgen_crystal_forest_dunes.lua @@ -33,9 +33,9 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', vertical_blend = 1, y_max = y_max, y_min = y_min, diff --git a/mapgen_crystal_forest_ocean.lua b/mapgen_crystal_forest_ocean.lua index c8a9d6c..49723e2 100644 --- a/mapgen_crystal_forest_ocean.lua +++ b/mapgen_crystal_forest_ocean.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_cave_liquid = 'default:water_source', - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_cave_liquid = 'everness_mapgen_water_source', + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, @@ -70,6 +70,6 @@ minetest.register_decoration({ decoration = { 'everness:crystal_coral_dark', 'everness:crystal_coral_light', - 'default:coral_skeleton' + 'everness:coral_skeleton' }, }) diff --git a/mapgen_crystal_forest_shore.lua b/mapgen_crystal_forest_shore.lua index 2beb6e9..da93395 100644 --- a/mapgen_crystal_forest_shore.lua +++ b/mapgen_crystal_forest_shore.lua @@ -33,10 +33,10 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:crystal_sand', depth_riverbed = 2, - node_cave_liquid = 'default:water_source', - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_cave_liquid = 'everness_mapgen_water_source', + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_under.lua b/mapgen_crystal_forest_under.lua index d9ec365..ace7cd7 100644 --- a/mapgen_crystal_forest_under.lua +++ b/mapgen_crystal_forest_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_under.y_min minetest.register_biome({ name = 'everness_crystal_forest_under', - node_cave_liquid = { 'default:water_source', 'default:lava_source' }, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:crystal_forest_under_floors', deco_type = 'simple', - place_on = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_stone' }, sidelen = 16, noise_params = { offset = 0, diff --git a/mapgen_cursed_lands.lua b/mapgen_cursed_lands.lua index cc39c36..8a858e3 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 = 'stairs:stair_cursed_brick', + node_dungeon_stair = 'everness_mapgen_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 858e8d6..ccc0897 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:cursed_lands_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:cursed_lands_deep_ocean_sandstone_brick', - node_dungeon_stair = 'stairs:stair_cursed_lands_deep_ocean_sandstone_block', + node_dungeon_stair = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_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 = 'default:water_source', + spawn_by = 'everness_mapgen_water_source', num_spawn_by = 8, }) @@ -181,7 +181,7 @@ minetest.register_decoration({ -- On Generated -- -local c_water_source = minetest.get_content_id('default:water_source') +local c_water_source = minetest.get_content_id('everness_mapgen_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), - { 'default:water_source' } + { 'everness_mapgen_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 a207820..748d6e9 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 = 'stairs:stair_cursed_sandstone_brick', + node_dungeon_stair = 'everness_mapgen_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 bc9b7f6..658f883 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:cursed_lands_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:cursed_lands_deep_ocean_sandstone_brick', - node_dungeon_stair = 'stairs:stair_cursed_lands_deep_ocean_sandstone_block', + node_dungeon_stair = 'everness_mapgen_stair_cursed_lands_deep_ocean_sandstone_block', y_max = y_max, y_min = y_min, heat_point = 45, @@ -96,7 +96,7 @@ minetest.register_decoration({ flags = 'force_placement', decoration = { 'everness:sand_with_spine_kelp', - 'default:coral_skeleton' + 'everness:coral_skeleton' }, param2 = 48, param2_max = 96, diff --git a/mapgen_cursed_lands_swamp.lua b/mapgen_cursed_lands_swamp.lua index d720ce1..11d260e 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 = 'stairs:stair_cursed_sandstone_brick', + node_dungeon_stair = 'everness_mapgen_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 e453efe..dfd0856 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 = { 'default:water_source', 'default:lava_source' }, + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, node_dungeon = 'everness:cursed_brick', node_dungeon_alt = 'everness:cursed_brick_with_growth', - node_dungeon_stair = 'stairs:stair_cursed_brick', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 19055fa..8e86a60 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 = 'stairs:stair_forsaken_desert_brick', + node_dungeon_stair = 'everness_mapgen_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 d8ddc68..65898e3 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 = 'stairs:stair_forsaken_desert_brick', + node_dungeon_stair = 'everness_mapgen_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 51262f5..772633c 100644 --- a/mapgen_forsaken_desert_under.lua +++ b/mapgen_forsaken_desert_under.lua @@ -27,10 +27,10 @@ local y_min = Everness.settings.biomes.everness_forsaken_desert_under.y_min minetest.register_biome({ name = 'everness_forsaken_desert_under', - node_cave_liquid = { 'default:water_source', 'default:lava_source' }, - node_dungeon = 'default:cobble', - node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'stairs:stair_cobble', + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, + node_dungeon = 'everness_mapgen_cobble', + node_dungeon_alt = 'everness_mapgen_mossycobble', + node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', y_max = y_max, y_min = y_min, heat_point = 100, @@ -44,7 +44,7 @@ minetest.register_biome({ minetest.register_decoration({ name = 'everness:forsaken_desert_under_floors', deco_type = 'simple', - place_on = { 'default:stone' }, + place_on = { 'everness_mapgen_stone' }, sidelen = 16, place_offset_y = -1, fill_ratio = 10, diff --git a/mapgen_forsaken_tundra.lua b/mapgen_forsaken_tundra.lua index 2b19039..471b4ef 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 = 'stairs:stair_forsaken_tundra_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'everness_mapgen_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 9a91e8b..28573d2 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 = 'stairs:stair_forsaken_tundra_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'everness_mapgen_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 e45ad86..7191fa2 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 = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'everness_mapgen_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 d675811..2031c9d 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 = { 'default:water_source', 'default:lava_source' }, + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', - node_dungeon_stair = 'stairs:stair_forsaken_tundra_cobble', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone', 'everness:forsaken_tundra_stone' }, + wherein = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone', 'everness:mold_stone_with_moss' }, + place_on = { 'everness_mapgen_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 = { 'default:stone', 'everness:moss_block' }, + place_on = { 'everness_mapgen_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 9cd8904..bdc8c57 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 = 'default:gravel', + node_riverbed = 'everness_mapgen_gravel', depth_riverbed = 2, node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'stairs:stair_ice', + node_dungeon_stair = 'everness_mapgen_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 e8e538b..133131a 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 = 'default:sand', + node_top = 'everness_mapgen_sand', depth_top = 1, - node_filler = 'default:sand', + node_filler = 'everness_mapgen_sand', depth_filler = 3, node_water_top = 'everness:frosted_ice', depth_water_top = 2, - node_cave_liquid = 'default:water_source', + node_cave_liquid = 'everness_mapgen_water_source', node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'stairs:stair_ice', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:sand' }, + place_on = { 'everness_mapgen_sand' }, place_offset_y = -1, sidelen = 4, noise_params = { @@ -70,6 +70,6 @@ minetest.register_decoration({ decoration = { 'everness:coral_starfish', 'everness:coral_frosted', - 'default:coral_skeleton' + 'everness:coral_skeleton' }, }) diff --git a/mapgen_frosted_icesheet_under.lua b/mapgen_frosted_icesheet_under.lua index bfd253d..cf36400 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 = { 'default:water_source', 'default:lava_source' }, + node_cave_liquid = { 'everness_mapgen_water_source', 'everness_mapgen_lava_source' }, node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', - node_dungeon_stair = 'stairs:stair_ice', + node_dungeon_stair = 'everness_mapgen_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 = { 'default:stone' }, + wherein = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_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 = { 'default:stone' }, + place_on = { 'everness_mapgen_stone' }, sidelen = 16, fill_ratio = 0.4, biomes = { 'everness_frosted_icesheet_under' }, diff --git a/nodes.lua b/nodes.lua index 1ecd41e..72ee6e6 100644 --- a/nodes.lua +++ b/nodes.lua @@ -26,7 +26,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) Everness:register_node('everness:stone_with_pyrite', { description = S('Pyrite Ore'), - tiles = { 'everness_default_stone.png^everness_mineral_pyrite.png' }, + tiles = { 'everness_stone.png^everness_mineral_pyrite.png' }, groups = { cracky = 2 }, drop = 'everness:pyrite_lump', sounds = Everness.node_sound_stone_defaults(), @@ -130,7 +130,7 @@ Everness:register_node('everness:pyriteblock_polished', { Everness:register_node('everness:quartz_ore', { description = S('Quartz Ore'), - tiles = { 'everness_default_stone.png^everness_quartz_ore.png' }, + tiles = { 'everness_stone.png^everness_quartz_ore.png' }, groups = { cracky = 3 }, drop = 'everness:quartz_crystal', sounds = Everness.node_sound_stone_defaults(), @@ -1201,8 +1201,12 @@ Everness:register_node('everness:frosted_snowblock', { sounds = Everness.node_sound_frosted_snow_defaults(), on_construct = function(pos) pos.y = pos.y - 1 - if minetest.get_node(pos).name == 'default:dirt_with_grass' then - minetest.set_node(pos, { name = 'default:dirt_with_snow' }) + + 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'] + + if minetest.get_node(pos).name == alias_dirt_with_grass then + minetest.set_node(pos, { name = alias_dirt_with_snow }) end end, }) @@ -1296,8 +1300,12 @@ Everness:register_node('everness:snowcobble', { on_construct = function(pos) pos.y = pos.y - 1 - if minetest.get_node(pos).name == 'default:dirt_with_grass' then - minetest.set_node(pos, { name = 'default:dirt_with_snow' }) + + 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'] + + if minetest.get_node(pos).name == alias_dirt_with_grass then + minetest.set_node(pos, { name = alias_dirt_with_snow }) end end, }) @@ -3839,7 +3847,7 @@ local function coral_on_place(itemstack, placer, pointed_thing, params) end local ignore_water = params.ignore_water or false - local node_under_name = params.node_under_name or 'default:coral_skeleton' + local node_under_name = params.node_under_name or 'everness:coral_skeleton' local player_name = placer:get_player_name() local pos_under = pointed_thing.under local pos_above = pointed_thing.above @@ -3852,7 +3860,7 @@ local function coral_on_place(itemstack, placer, pointed_thing, params) end if node_under.name ~= node_under_name - or (minetest.get_node(pos_above).name ~= 'default:water_source' and not ignore_water) + or (minetest.get_item_group(minetest.get_node(pos_above).name, 'water') == 0 and not ignore_water) then return itemstack end @@ -3896,7 +3904,7 @@ Everness:register_node('everness:coral_corals', { { -4 / 16, 0.5, -4 / 16, 4 / 16, 1.5, 4 / 16 }, }, }, - node_dig_prediction = 'default:coral_skeleton', + node_dig_prediction = 'everness:coral_skeleton', node_placement_prediction = '', sounds = Everness.node_sound_stone_defaults({ dig = { name = 'everness_plant_hit', gain = 0.2 }, @@ -3904,7 +3912,7 @@ Everness:register_node('everness:coral_corals', { }), on_place = coral_on_place, after_destruct = function(pos, oldnode) - minetest.set_node(pos, { name = 'default:coral_skeleton' }) + minetest.set_node(pos, { name = 'everness:coral_skeleton' }) end, }) @@ -3925,7 +3933,7 @@ Everness:register_node('everness:coral_jellyfish', { { -4 / 16, 0.5, -4 / 16, 4 / 16, 1.5, 4 / 16 }, }, }, - node_dig_prediction = 'default:coral_skeleton', + node_dig_prediction = 'everness:coral_skeleton', node_placement_prediction = '', sounds = Everness.node_sound_stone_defaults({ dig = { name = 'everness_plant_hit', gain = 0.2 }, @@ -3933,7 +3941,7 @@ Everness:register_node('everness:coral_jellyfish', { }), on_place = coral_on_place, after_destruct = function(pos, oldnode) - minetest.set_node(pos, { name = 'default:coral_skeleton' }) + minetest.set_node(pos, { name = 'everness:coral_skeleton' }) end, }) @@ -3954,7 +3962,7 @@ Everness:register_node('everness:coral_frosted', { { -4 / 16, 0.5, -4 / 16, 4 / 16, 1.5, 4 / 16 }, }, }, - node_dig_prediction = 'default:coral_skeleton', + node_dig_prediction = 'everness:coral_skeleton', node_placement_prediction = '', sounds = Everness.node_sound_stone_defaults({ dig = { name = 'everness_plant_hit', gain = 0.2 }, @@ -3962,7 +3970,7 @@ Everness:register_node('everness:coral_frosted', { }), on_place = coral_on_place, after_destruct = function(pos, oldnode) - minetest.set_node(pos, { name = 'default:coral_skeleton' }) + minetest.set_node(pos, { name = 'everness:coral_skeleton' }) end, }) @@ -3983,7 +3991,7 @@ Everness:register_node('everness:coral_starfish', { { -4 / 16, 0.5, -4 / 16, 4 / 16, 1.5, 4 / 16 }, }, }, - node_dig_prediction = 'default:coral_skeleton', + node_dig_prediction = 'everness:coral_skeleton', node_placement_prediction = '', sounds = Everness.node_sound_stone_defaults({ dig = { name = 'everness_plant_hit', gain = 0.2 }, @@ -3991,7 +3999,7 @@ Everness:register_node('everness:coral_starfish', { }), on_place = coral_on_place, after_destruct = function(pos, oldnode) - minetest.set_node(pos, { name = 'default:coral_skeleton' }) + minetest.set_node(pos, { name = 'everness:coral_skeleton' }) end, }) @@ -4510,6 +4518,13 @@ Everness:register_node('everness:crystal_forest_deep_ocean_coral_3', { sounds = Everness.node_sound_stone_defaults(), }) +Everness:register_node('everness:coral_skeleton', { + description = S('Coral Skeleton'), + tiles = { 'everness_coral_skeleton.png' }, + groups = { cracky = 3 }, + sounds = Everness.node_sound_stone_defaults(), +}) + -- -- Meshes -- diff --git a/textures/everness_coral_skeleton.png b/textures/everness_coral_skeleton.png index d00c6fed94270d95d1e95001c079702f32984bbb..9a541400b9e7d53901ac5b4993498a33ea21e7c4 100644 GIT binary patch delta 241 zcmVQyCN&HyGH=004ipX87m@@Q2<6f zX>eGGNO1sMb5T~o;bBPtgF>WJb7PRQ0Ck|C1QL;Ph5(sdW@-?!A&@)(vd1}Og*PBK z002UuO2`0#0RU`e1fp}@I-&q)F<>eqY(hc+c$gVjR5w^v07-;Jfe--0?EoZ`RyJ`_ raghLp7dDuw?)%5My^zh-cnLL^R004JM zL_t&t9R^#DSttMi diff --git a/textures/everness_gui_hb_bg.png b/textures/everness_gui_hb_bg.png deleted file mode 100644 index 99248e1768bb3e599db1496743d0d881f715c8c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^h9Jzy3?w~+F2@5Y<^Z1%S0KH-%JvqJVk`;r3)X%U prKkqv@Orv9hDb;zORzRG0i`+^7$4|}O$16Xc)I$ztaD0e0svDU6Ey$; diff --git a/textures/everness_sequoia_wood.png b/textures/everness_sequoia_wood.png index e45cf912e23a770b1466fe5605283eab159846f8..d7ce26dbc216dc263d11d6da315d956ed546f0af 100644 GIT binary patch delta 297 zcmV+^0oMMs0mK53B!7WWOjJdBtpWeb@cJO}bR0k7e-J*Iw$;kO|Yh ve{C4-OFw>fSRyz%-1=GV5Ifnr3Wl)%n-wv0XKBEf00000NkvXXu0mjfeU6A6 delta 152 zcmV;J0B8Ti0<-~;B!3c6OjJdtZEkx(M3!D*rfO=2QdN*mP}kB!(f|MeT}ebiRCwA& zk3kXuAqc~|MgRZhg&>*>GYGNB_Byywbt1yk6a@6dPCnSs16~dR3cRhc)plgGo`aH( zj`8-V5{AVbI9aP)E`l{0ugt5BU_IE0000l5QaJ0xU{>wdyk)gzkXzs3PFnBK-5Lv)s<=KjLgfrjC`-kGv@M$ou;m?9!+H~ zx~86{;qUuvou_3Ss4R|#zMHCg8v4&=v~+{+rYsoSsuXD)8Au$DL+6;r z&^Gi@Q{RnUE0%eLItc?t&$iBeU8nI_m%#NDP5sz6nz&3imurGzx<#l>BLy0QdX#NeOOKZ_iKHL7uj^C8)CIp$GdIM`+jXCaK3XTkE2{zI?7@ ze-lvGB|!~kX=ti$sGehE%yJ!;f)JB5hB3=ioFxBc07g^WTx_mof(Qvf0!$WB;Irn8 zrA*`8E;=q$MMl1F&(BR&lzAqy8(vmqP!WJ(s*YvGflrQ55(AT=BUz%ZQ7atRB)jiz z<4h)aOdXF%h`c7_Hcw4m!u9=elA$0edHH# zD64|6@pT?FK?RR|CMFcQ!N!hEk8A`m6oFtJD&|-sF}x8DpVBsT`HLM-7X)*Yhx!NZa2z{=8e}*C O0000