diff --git a/LICENSE.txt b/LICENSE.txt index 8b79e86..6b49e7b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -488,7 +488,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_baobab_tree_sapling.png - everness_baobab_tree_side.png - everness_baobab_tree_top.png -- everness_baobab_wood.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0) +- everness_baobab_wood.png - everness_bloodspore_plant_small.png - everness_bloodspore_plant.png - everness_blooming_cooksonia.png @@ -853,6 +853,9 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_mcl_doors_door_willow_upper.png - everness_mcl_doors_trapdoor_bamboo_side.png - everness_mcl_doors_trapdoor_crystal_wood_side.png +- everness_coral_forest_deep_ocean_lantern_animated.png +- everness_coral_forest_deep_ocean_lantern_bottom.png +- everness_coral_forest_deep_ocean_lantern_top.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated @@ -864,6 +867,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_grass_top_2.png - everness_grass_with_blue_extra_top_2.png - everness_grass_with_yellow_extra_top_1.png +- everness_rising_soul_particle.png ### Sounds diff --git a/mapgen_after.lua b/mapgen_after.lua index 9fea01d..1e96008 100644 --- a/mapgen_after.lua +++ b/mapgen_after.lua @@ -315,12 +315,12 @@ minetest.register_on_generated(function(minp, maxp, blockseed) 'default:stone', 'default:sand', 'default: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', + '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:cave_barrel_cactus', 'everness:venus_trap', 'everness:illumi_root', diff --git a/mapgen_bamboo_forest.lua b/mapgen_bamboo_forest.lua index 1250e9e..61bcf6a 100644 --- a/mapgen_bamboo_forest.lua +++ b/mapgen_bamboo_forest.lua @@ -166,7 +166,7 @@ local function register_grass_decoration(offset, scale, length) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = 'everness_mapgen_grass_' .. length, + decoration = 'default:grass_' .. length, }) end @@ -187,7 +187,7 @@ local function register_flower(seed, flower_name) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = flower_name, + decoration = 'flowers:' .. flower_name, }) end @@ -248,14 +248,14 @@ register_grass_decoration(0.03, 0.03, 1) -- Flowers -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') +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') -- -- On Generated diff --git a/mapgen_crystal_forest.lua b/mapgen_crystal_forest.lua index aea48ee..ecae77f 100644 --- a/mapgen_crystal_forest.lua +++ b/mapgen_crystal_forest.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_dunes.lua b/mapgen_crystal_forest_dunes.lua index fd797cc..df2bcf8 100644 --- a/mapgen_crystal_forest_dunes.lua +++ b/mapgen_crystal_forest_dunes.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_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 75c9c8f..913d08a 100644 --- a/mapgen_crystal_forest_ocean.lua +++ b/mapgen_crystal_forest_ocean.lua @@ -36,7 +36,7 @@ minetest.register_biome({ node_cave_liquid = 'default:water_source', node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_shore.lua b/mapgen_crystal_forest_shore.lua index 4e83242..2beb6e9 100644 --- a/mapgen_crystal_forest_shore.lua +++ b/mapgen_crystal_forest_shore.lua @@ -36,7 +36,7 @@ minetest.register_biome({ node_cave_liquid = 'default:water_source', node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_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 9fc1ce5..d9ec365 100644 --- a/mapgen_crystal_forest_under.lua +++ b/mapgen_crystal_forest_under.lua @@ -30,7 +30,7 @@ minetest.register_biome({ 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', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_forsaken_desert_under.lua b/mapgen_forsaken_desert_under.lua index efde7ef..51262f5 100644 --- a/mapgen_forsaken_desert_under.lua +++ b/mapgen_forsaken_desert_under.lua @@ -30,7 +30,7 @@ minetest.register_biome({ 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', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 100, diff --git a/mod.conf b/mod.conf index b961c7b..97c2de9 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, mcl_vars, mcl_mapgen_core, mcl_biomes, mcl_dungeons, mcl_structures, mcl_terrain_features, mcl_villages, tsm_railcorridors +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_mapgen_core, rp_default supported_games = minetest_game min_minetest_version = 5.4 diff --git a/mod_support_mcl_aliases.lua b/mod_support_mcl_aliases.lua index 03e3974..899fe69 100644 --- a/mod_support_mcl_aliases.lua +++ b/mod_support_mcl_aliases.lua @@ -162,6 +162,7 @@ minetest.register_alias('stairs:stair_outer_quartz_chiseled', 'mcl_stairs:stair_ minetest.register_alias('stairs:stair_quartz_chiseled', 'mcl_stairs:stair_quartz_chiseled') minetest.register_alias('stairs:stair_inner_quartz_chiseled', 'mcl_stairs:stair_quartz_chiseled_inner') minetest.register_alias('stairs:slab_quartz_chiseled', 'mcl_stairs:slab_quartz_chiseled') +minetest.register_alias('stairs:stair_coral_desert_stone_block', 'mcl_stairs:stair_coral_desert_stone_block') minetest.register_alias('everness:cursed_brick_wall', 'everness:cursedbrickwall') minetest.register_alias('walls:cobble', 'mcl_walls:cobble') diff --git a/nodes.lua b/nodes.lua index f3853cb..9ff8ed9 100644 --- a/nodes.lua +++ b/nodes.lua @@ -8567,17 +8567,18 @@ Everness:register_node('everness:floating_crystal', { Everness:register_node('everness:coral_forest_deep_ocean_lantern', { description = S('Coral Forest Deep Ocean Lantern'), tiles = { + { name = 'everness_coral_forest_deep_ocean_lantern_top.png' }, + { name = 'everness_coral_forest_deep_ocean_lantern_bottom.png' }, { name = 'everness_coral_forest_deep_ocean_lantern_animated.png', animation = { type = 'vertical_frames', aspect_w = 16, aspect_h = 16, - length = 1, + length = 2, }, }, }, - drawtype = 'glasslike', sunlight_propagates = true, is_ground_content = false, sounds = Everness.node_sound_glass_defaults(), @@ -8594,5 +8595,5 @@ Everness:register_node('everness:coral_forest_deep_ocean_lantern', { _mcl_blast_resistance = 0.3, _mcl_hardness = 0.3, paramtype = 'light', - light_source = 12, + light_source = 14, }) diff --git a/textures/everness_baobab_wood.png b/textures/everness_baobab_wood.png index a8bfa02..8e16314 100644 Binary files a/textures/everness_baobab_wood.png and b/textures/everness_baobab_wood.png differ diff --git a/textures/everness_coral_forest_deep_ocean_lantern_animated.png b/textures/everness_coral_forest_deep_ocean_lantern_animated.png index f103b30..b4781c8 100644 Binary files a/textures/everness_coral_forest_deep_ocean_lantern_animated.png and b/textures/everness_coral_forest_deep_ocean_lantern_animated.png differ diff --git a/textures/everness_coral_forest_deep_ocean_lantern_bottom.png b/textures/everness_coral_forest_deep_ocean_lantern_bottom.png new file mode 100644 index 0000000..33fb0ba Binary files /dev/null and b/textures/everness_coral_forest_deep_ocean_lantern_bottom.png differ diff --git a/textures/everness_coral_forest_deep_ocean_lantern_top.png b/textures/everness_coral_forest_deep_ocean_lantern_top.png new file mode 100644 index 0000000..2426110 Binary files /dev/null and b/textures/everness_coral_forest_deep_ocean_lantern_top.png differ diff --git a/textures/everness_sequoia_tree_side.png b/textures/everness_sequoia_tree_side.png index 060a271..a48c52f 100644 Binary files a/textures/everness_sequoia_tree_side.png and b/textures/everness_sequoia_tree_side.png differ