diff --git a/LICENSE.txt b/LICENSE.txt index df1905b..62faf89 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -837,6 +837,14 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_grass_with_blue_extra_top_2.png - everness_grass_with_yellow_extra_top_1.png +**CC-BY-SA-3.0, Pithydon** + +- everness_coral_skeleton.png + +**CC-BY-SA-3.0, Cisoun's texture pack** + +- everness_default_stone.png + ### Sounds **CC0-1.0, by ProdMultimediasHQI**, https://freesound.org/people/ProdMultimediasHQI/sounds/512501/ @@ -1244,6 +1252,12 @@ https://freesound.org/people/cabled_mess/sounds/384421/ - everness_frosted_snow_hit.3.ogg - everness_frosted_snow_hit.4.ogg +**CC-BY-4.0, by HerbertBoland**, https://freesound.org/people/AtevonHes/sounds/454783/ + +- everness_tool_breaks.1.ogg +- everness_tool_breaks.2.ogg +- everness_tool_breaks.3.ogg + ### Models **CC-BY-SA-4.0, by SaKeL** diff --git a/init.lua b/init.lua index 4beedf3..69beea1 100644 --- a/init.lua +++ b/init.lua @@ -21,11 +21,6 @@ minetest = minetest.global_exists('minetest') and minetest --[[@as Minetest]] local path = minetest.get_modpath('everness') local mod_start_time = minetest.get_us_time() --- MineClone2 support -if minetest.get_modpath('mcl_core') and minetest.global_exists('mcl_core') then - dofile(path .. '/mod_support_mcl_aliases.lua') -end - dofile(path .. '/api.lua') dofile(path .. '/nodes.lua') dofile(path .. '/nodes_farming.lua') @@ -218,12 +213,6 @@ then dofile(path .. '/mod_support_x_obsidianmese.lua') end --- MineClone2 - -if minetest.get_modpath('mcl_core') and minetest.global_exists('mcl_core') then - dofile(path .. '/mod_support_mcl.lua') -end - local mod_end_time = (minetest.get_us_time() - mod_start_time) / 1000000 print('[Mod] everness loaded.. [' .. mod_end_time .. 's]') diff --git a/nodes.lua b/nodes.lua index bc9ba9f..f5bc381 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 = { 'default_stone.png^everness_mineral_pyrite.png' }, + tiles = { 'everness_default_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 = { 'default_stone.png^everness_quartz_ore.png' }, + tiles = { 'everness_default_stone.png^everness_quartz_ore.png' }, groups = { cracky = 3 }, drop = 'everness:quartz_crystal', sounds = Everness.node_sound_stone_defaults(), @@ -1728,8 +1728,8 @@ Everness:register_node('everness:baobab_fruit_renewable', { Everness:register_node('everness:baobab_fruit_mark', { description = S('Baobab Fruit Marker'), short_description = S('Baobab Fruit Marker'), - inventory_image = 'everness_baobab_tree_fruit.png^[transformFY^default_invisible_node_overlay.png', - wield_image = 'everness_baobab_tree_fruit.png^[transformFY^default_invisible_node_overlay.png', + inventory_image = 'everness_baobab_tree_fruit.png^[transformFY^everness_invisible_node_overlay.png', + wield_image = 'everness_baobab_tree_fruit.png^[transformFY^everness_invisible_node_overlay.png', drawtype = 'airlike', paramtype = 'light', sunlight_propagates = true, @@ -3695,11 +3695,7 @@ Everness:register_node('everness:bamboo_sprout', { type = 'fixed', fixed = { -0.5, -0.5, -0.5, 0.5, -5 / 16, 0.5 }, }, - sounds = Everness.node_sound_dirt_defaults({ - dig = { name = '', gain = 0 }, - dug = { name = 'everness_grass_footstep', gain = 0.2 }, - place = { name = 'default_place_node', gain = 0.25 }, - }), + sounds = Everness.node_sound_leaves_defaults(), after_place_node = function(pos, placer, itemstack, pointed_thing) Everness:tick_bamboo_again(pos) end, @@ -3890,7 +3886,7 @@ Everness:register_node('everness:coral_corals', { drawtype = 'plantlike_rooted', waving = 1, paramtype = 'light', - tiles = { 'default_coral_skeleton.png' }, + tiles = { 'everness_coral_skeleton.png' }, special_tiles = { { name = 'everness_coral_corals.png', tileable_vertical = true } }, inventory_image = 'everness_coral_corals.png', wield_image = 'everness_coral_corals.png', @@ -3919,7 +3915,7 @@ Everness:register_node('everness:coral_jellyfish', { drawtype = 'plantlike_rooted', waving = 1, paramtype = 'light', - tiles = { 'default_coral_skeleton.png' }, + tiles = { 'everness_coral_skeleton.png' }, special_tiles = { { name = 'everness_coral_jellyfish.png', tileable_vertical = true } }, inventory_image = 'everness_coral_jellyfish.png', wield_image = 'everness_coral_jellyfish.png', @@ -3948,7 +3944,7 @@ Everness:register_node('everness:coral_frosted', { drawtype = 'plantlike_rooted', waving = 1, paramtype = 'light', - tiles = { 'default_coral_skeleton.png' }, + tiles = { 'everness_coral_skeleton.png' }, special_tiles = { { name = 'everness_frosted_coral.png', tileable_vertical = true } }, inventory_image = 'everness_frosted_coral.png', wield_image = 'everness_frosted_coral.png', @@ -3977,7 +3973,7 @@ Everness:register_node('everness:coral_starfish', { drawtype = 'plantlike_rooted', waving = 1, paramtype = 'light', - tiles = { 'default_coral_skeleton.png' }, + tiles = { 'everness_coral_skeleton.png' }, special_tiles = { { name = 'everness_starfish.png', tileable_vertical = true } }, inventory_image = 'everness_starfish.png', wield_image = 'everness_starfish.png', @@ -4754,7 +4750,7 @@ Everness:register_node('everness:pyrite_lantern', { Everness:register_node('everness:pyrite_glass', { description = S('Pyrite Glass'), drawtype = 'glasslike_framed_optional', - tiles = { 'everness_pyrite_glass.png', 'default_obsidian_glass_detail.png' }, + tiles = { 'everness_pyrite_glass.png' }, use_texture_alpha = 'clip', -- only needed for stairs API paramtype = 'light', sunlight_propagates = true, diff --git a/sounds/everness_tool_breaks.1.ogg b/sounds/everness_tool_breaks.1.ogg new file mode 100644 index 0000000..2a571ae Binary files /dev/null and b/sounds/everness_tool_breaks.1.ogg differ diff --git a/sounds/everness_tool_breaks.2.ogg b/sounds/everness_tool_breaks.2.ogg new file mode 100644 index 0000000..1789352 Binary files /dev/null and b/sounds/everness_tool_breaks.2.ogg differ diff --git a/sounds/everness_tool_breaks.3.ogg b/sounds/everness_tool_breaks.3.ogg new file mode 100644 index 0000000..a99c4b7 Binary files /dev/null and b/sounds/everness_tool_breaks.3.ogg differ diff --git a/textures/everness_coral_skeleton.png b/textures/everness_coral_skeleton.png new file mode 100644 index 0000000..d00c6fe Binary files /dev/null and b/textures/everness_coral_skeleton.png differ diff --git a/textures/everness_default_stone.png b/textures/everness_default_stone.png new file mode 100644 index 0000000..d3f0ef8 Binary files /dev/null and b/textures/everness_default_stone.png differ diff --git a/textures/everness_invisible_node_overlay.png b/textures/everness_invisible_node_overlay.png new file mode 100644 index 0000000..7fc8806 Binary files /dev/null and b/textures/everness_invisible_node_overlay.png differ diff --git a/tools.lua b/tools.lua index f098987..43ff133 100644 --- a/tools.lua +++ b/tools.lua @@ -23,7 +23,7 @@ minetest.register_tool('everness:vine_shears', { inventory_image = 'everness_vine_shears.png', wield_image = 'everness_vine_shears.png', wield_scale = { x = 2, y = 2, z = 1 }, - sound = { breaks = 'default_tool_breaks' }, + sound = { breaks = 'everness_tool_breaks' }, tool_capabilities = { full_punch_interval = 1.0, max_drop_level = 0, @@ -47,7 +47,7 @@ minetest.register_tool('everness:pick_illuminating', { }, damage_groups = { fleshy = 5 }, }, - sound = { breaks = 'default_tool_breaks' }, + sound = { breaks = 'everness_tool_breaks' }, groups = { pickaxe = 1, enchantability = 10 }, on_place = function(itemstack, placer, pointed_thing) if pointed_thing.type == 'node' then @@ -140,7 +140,7 @@ minetest.register_tool('everness:shovel_silk', { damage_groups = { fleshy = 4 }, }, sound = { - breaks = 'default_tool_breaks' + breaks = 'everness_tool_breaks' }, -- no `shovel` group so it cannot be enchanted -- groups = { shovel = 1 } @@ -185,7 +185,7 @@ minetest.register_tool('everness:shell_of_underwater_breathing', { }, damage_groups = { fleshy = 1 }, }, - sound = { breaks = 'default_tool_breaks' }, + sound = { breaks = 'everness_tool_breaks' }, on_place = function(itemstack, placer, pointed_thing) return Everness:use_shell_of_underwater_breathing(itemstack, placer, pointed_thing) end,