From 9994cf513f4a27a263fed8fe21b2ae590908a1b2 Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Thu, 25 Jan 2024 15:31:55 -0500 Subject: [PATCH] Add Everness Encyclopedia --- .luacheckrc | 5 +- LICENSE.txt | 1 + api.lua | 575 ++++++++++++++++++++++++++- buckets.lua | 4 +- chests.lua | 2 +- craftitems.lua | 12 +- functions.lua | 61 +-- init.lua | 4 + loot_chests.lua | 4 +- mapgen.lua | 15 +- mapgen_bamboo_forest.lua | 20 +- mapgen_bamboo_forest_under.lua | 18 +- mapgen_baobab_savanna.lua | 14 +- mapgen_coral_forest.lua | 22 +- mapgen_coral_forest_deep_ocean.lua | 30 +- mapgen_coral_forest_dunes.lua | 16 +- mapgen_coral_forest_ocean.lua | 14 +- mapgen_coral_forest_under.lua | 20 +- mapgen_crystal_forest.lua | 20 +- mapgen_crystal_forest_deep_ocean.lua | 18 +- mapgen_crystal_forest_dunes.lua | 12 +- mapgen_crystal_forest_ocean.lua | 12 +- mapgen_crystal_forest_shore.lua | 12 +- mapgen_crystal_forest_under.lua | 20 +- mapgen_cursed_lands.lua | 28 +- mapgen_cursed_lands_deep_ocean.lua | 18 +- mapgen_cursed_lands_dunes.lua | 14 +- mapgen_cursed_lands_ocean.lua | 18 +- mapgen_cursed_lands_swamp.lua | 16 +- mapgen_cursed_lands_under.lua | 22 +- mapgen_forsaken_desert.lua | 18 +- mapgen_forsaken_desert_ocean.lua | 4 +- mapgen_forsaken_desert_under.lua | 20 +- mapgen_forsaken_tundra.lua | 22 +- mapgen_forsaken_tundra_beach.lua | 8 +- mapgen_forsaken_tundra_ocean.lua | 8 +- mapgen_forsaken_tundra_under.lua | 24 +- mapgen_frosted_icesheet.lua | 10 +- mapgen_frosted_icesheet_ocean.lua | 6 +- mapgen_frosted_icesheet_under.lua | 26 +- mapgen_mineral_waters.lua | 16 +- mapgen_mineral_waters_under.lua | 6 +- nodes.lua | 17 +- privileges.lua | 85 ++++ textures/everness_logo.png | Bin 0 -> 453 bytes tools.lua | 10 +- vines.lua | 6 +- 47 files changed, 1002 insertions(+), 331 deletions(-) create mode 100644 privileges.lua create mode 100644 textures/everness_logo.png diff --git a/.luacheckrc b/.luacheckrc index 0d7c5df..ed96a25 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -23,7 +23,10 @@ globals = { fields = { "handle_node_drops" } - } + }, + 'sfinv', + "unified_inventory", + "i3" } read_globals = { diff --git a/LICENSE.txt b/LICENSE.txt index 7df9745..df9a0af 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -981,6 +981,7 @@ GNU Lesser General Public License v2.1 or later - everness_ceramic_pot_flowers_sherd.png - everness_ceramic_sherds_ore.png - everness_pick_archeological.png +- everness_logo.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated diff --git a/api.lua b/api.lua index beb6782..3561eec 100644 --- a/api.lua +++ b/api.lua @@ -18,8 +18,6 @@ local S = minetest.get_translator(minetest.get_current_modname()) --- Base class ---@class Everness ----@field bamboo {['growth_stages']: table, ['top_leaves_schem']: table} ----@field loot_chest {['default']: table[]} Everness = { bamboo = { -- based on height @@ -229,7 +227,15 @@ Everness = { hammer_cid_data = {}, colors = { brown = '#DEB887', - } + }, + registered_nodes = {}, + registered_tools = {}, + registered_abms = {}, + registered_lbms = {}, + registered_craftitems = {}, + registered_biomes = {}, + registered_decorations = {}, + registered_ores = {} } function Everness.grow_cactus(self, pos, node, params) @@ -904,13 +910,12 @@ function Everness.register_leafdecay(self, def) end end -function Everness.register_node(self, name, def, props) +function Everness.register_node(self, name, def) local _def = table.copy(def) local _name = name _def.mod_origin = 'everness' - -- X Farming composter description if minetest.get_modpath('x_farming') and minetest.global_exists('x_farming') then -- X Farming @@ -919,9 +924,70 @@ function Everness.register_node(self, name, def, props) end end + self.registered_nodes[_name] = _def minetest.register_node(_name, _def) end +function Everness.register_tool(self, name, def) + local _def = table.copy(def) + local _name = name + + _def.mod_origin = 'everness' + + self.registered_tools[_name] = _def + minetest.register_tool(_name, _def) +end + +function Everness.register_abm(self, def) + local _def = table.copy(def) + local _name = _def.label + + self.registered_abms[_name] = _def + minetest.register_abm(_def) +end + +function Everness.register_lbm(self, def) + local _def = table.copy(def) + local _name = _def.name + + self.registered_lbms[_name] = _def + minetest.register_lbm(_def) +end + +function Everness.register_craftitem(self, name, def) + local _def = table.copy(def) + local _name = name + + _def.mod_origin = 'everness' + + self.registered_craftitems[_name] = _def + minetest.register_craftitem(_name, _def) +end + +function Everness.register_biome(self, def) + local _def = table.copy(def) + local _name = _def.name + + self.registered_biomes[_name] = _def + minetest.register_biome(_def) +end + +function Everness.register_decoration(self, def) + local _def = table.copy(def) + local _name = _def.name + + self.registered_decorations[_name] = _def + minetest.register_decoration(_def) +end + +function Everness.register_ore(self, def) + local _def = table.copy(def) + local _name = _def.ore + + self.registered_ores[_name] = _def + minetest.register_ore(_def) +end + -- -- Log API / helpers - copy from MTG -- @@ -1498,3 +1564,502 @@ function Everness.get_pot_formspec(pos, label, model_texture) return formspec end + +-- +-- Encyclopedia +-- + +local ency_data = { + nodes = {}, + tools = {}, + abms = {}, + lbms = {}, + craftitems = {}, + biomes = {}, + decorations = {}, + ores = {}, +} + +-- +-- Encyclopedia Helpers +-- + +local function tchelper(first, rest) + return first:upper()..rest:lower() +end + +local function capitalize(str) + -- Add extra characters to the pattern if you need to. _ and ' are + -- found in the middle of identifiers and English words. + -- We must also put %w_' into [%w_'] to make it handle normal stuff + -- and extra stuff the same. + -- This also turns hex numbers into, eg. 0Xa7d4 + return str:gsub("(%a)([%w_']*)", tchelper) +end + +local function tech_name_to_pretty_name(tech_name) + local short_name = tech_name:split(':')[2] + short_name = short_name:gsub('_', ' ') + short_name = capitalize(short_name) + + return short_name +end + +local function get_model_texture_from_tile_definition(tile_def) + -- Assumptions its a string + local texture = '' + + for i, v in ipairs(tile_def) do + local temp = tile_def[i] + + if type(temp) == 'table' then + if temp.name then + temp = temp.name + else + temp = temp[i] + end + end + + texture = texture .. (i == 1 and '' or ',') .. temp + end + + return texture +end + +local function get_unordered_list(tbl, pos, formspec, lvl) + local _formspec = formspec or {} + local _lvl = lvl or 1 + + for k, v in pairs(tbl) do + if type(v) == 'table' then + -- Label + pos.y = pos.y + 0.25 + _formspec[#_formspec + 1] = ('label[%f,%f;%s]'):format(pos.x + 0.25 * _lvl, pos.y, k .. ':') + get_unordered_list(v, pos, _formspec, _lvl + 1) + else + if minetest.registered_items[v] then + pos.y = pos.y + 0.25 + -- Label + _formspec[#_formspec + 1] = ('label[%f,%f;%s]'):format(pos.x + 0.25 * _lvl, pos.y, k .. ':') + pos.y = pos.y + 0.25 + -- Item image + _formspec[#_formspec + 1] = ('item_image[%f,%f;1,1;%s]'):format(pos.x + 0.25 * _lvl, pos.y, v) + -- Tooltip for description + _formspec[#_formspec + 1] = ('tooltip[%f,%f;1,1;%s]'):format(pos.x + 0.25 * _lvl, pos.y, minetest.formspec_escape(v)) + pos.y = pos.y + 1 + else + pos.y = pos.y + 0.25 + -- List "bullet" + _formspec[#_formspec + 1] = ('label[%f,%f;%s]'):format(pos.x + 0.25 * _lvl, pos.y, k .. ': ' .. v) + end + end + end + + _formspec = table.concat(_formspec, '') + + return _formspec +end + +-- +-- Encyclopedia API +-- + +function Everness.encyclopedia_init(self) + -- Nodes + for name, def in pairs(self.registered_nodes) do + if def.groups + and (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) + then + table.insert(ency_data.nodes, name) + end + end + + -- Tools + for name, def in pairs(self.registered_tools) do + if def.groups + and (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) + then + table.insert(ency_data.tools, name) + end + end + + -- ABMs + for name, def in pairs(self.registered_abms) do + table.insert(ency_data.abms, name) + end + + -- LBMs + for name, def in pairs(self.registered_lbms) do + table.insert(ency_data.lbms, name) + end + + -- Craftitems + for name, def in pairs(self.registered_craftitems) do + if def.groups + and (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) + then + table.insert(ency_data.craftitems, name) + end + end + + -- Biomes + for name, def in pairs(self.registered_biomes) do + table.insert(ency_data.biomes, name) + end + + -- Decorations + for name, def in pairs(self.registered_decorations) do + table.insert(ency_data.decorations, name) + end + + -- Ores + for name, def in pairs(self.registered_ores) do + table.insert(ency_data.ores, name) + end + + -- Sort alphabetically + table.sort(ency_data.nodes, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.tools, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.abms, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.lbms, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.craftitems, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.biomes, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.decorations, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + table.sort(ency_data.ores, function(a ,b) + return tech_name_to_pretty_name(a) < tech_name_to_pretty_name(b) + end) + + if minetest.get_modpath('unified_inventory') then + self:encyclopedia_ui_register_page() + elseif minetest.get_modpath('i3') then + self:encyclopedia_i3_register_page() + elseif minetest.get_modpath('sfinv') and sfinv.enabled then + self:encyclopedia_sfinv_register_page() + end +end + +function Everness.encyclopedia_get_formspec(self, context) + local pos_primary = vector.new() + local pos_secondary = vector.new() + local pos_secondary_container = vector.new() + local primary_selected_idx = context.everness_ency_primary_selected_idx or 1 + local dropdown_idx = context.everness_ency_dropdown_idx or 1 + + context.everness_ency_primary_selected_idx = primary_selected_idx + context.everness_ency_dropdown_idx = dropdown_idx + + -- Get dropdown items + local ency_dropdown_items = {} + + for k, v in pairs(ency_data) do + table.insert(ency_dropdown_items, k) + end + + table.sort(ency_dropdown_items) + + -- Dropdown string value (main category) + local dropdown_value = ency_dropdown_items[dropdown_idx] + -- Data to show in secondary container (corresponding to selected index in primary item list) + local primary_list_data = ency_data[dropdown_value] + -- Get primary list items (list on the left) + local primary_list_items = {} + + for k, v in ipairs(primary_list_data) do + table.insert(primary_list_items, tech_name_to_pretty_name(v)) + end + + -- Primary list selected item value (item technical name, e.g. 'everness:palm_tree_wood') + local primary_list_selected_value = primary_list_data[primary_selected_idx] + local def = self['registered_' .. dropdown_value][primary_list_selected_value] + + pos_primary.x = pos_primary.x + 0.25 + pos_primary.y = pos_primary.y + 0.5 + + local formspec = { + -- Title + 'real_coordinates[true]', + ('label[%f,%f;%s]'):format(pos_primary.x, pos_primary.y, minetest.formspec_escape(S('Everness Encyclopedia'))), + } + + -- Dropdown (main categories) + pos_primary.y = pos_primary.y + 0.4 + formspec[#formspec + 1] = ('dropdown[%f,%f;4,0.4;everness_ency_dropdown;%s;%d;true]'):format(pos_primary.x, pos_primary.y, table.concat(ency_dropdown_items, ','), dropdown_idx) + -- Primary list + pos_primary.y = pos_primary.y + 0.6 + formspec[#formspec + 1] = ('textlist[%f,%f;4,9;everness_ency_main_list;%s;%d;false]'):format(pos_primary.x, pos_primary.y, table.concat(primary_list_items, ','), primary_selected_idx) + -- Secondary (details on the right) + pos_secondary.x = pos_secondary.x + 4.5 + pos_secondary.y = pos_secondary.y + 1.4 + formspec[#formspec + 1] = ('scroll_container[%f,%f;5.5,9;everness_ency_detail_view_scrollbar;vertical;0.1]'):format(pos_secondary.x, pos_secondary.y) + -- Secondary title + pos_secondary_container.y = pos_secondary_container.y + 0.25 + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, primary_list_selected_value) + -- Margin + pos_secondary_container.y = pos_secondary_container.y + 0.5 + + if minetest['registered_' .. dropdown_value][primary_list_selected_value] + and dropdown_value ~= 'biomes' + and dropdown_value ~= 'decorations' + and dropdown_value ~= 'ores' + then + if def.mesh then + -- Item model + formspec[#formspec + 1] = ('model[%f,%f;2,2;%s;%s;%s;-30,0;true;true;]'):format(pos_secondary_container.x, pos_secondary_container.y, primary_list_selected_value, def.mesh, get_model_texture_from_tile_definition(def.tiles)) + else + -- Item image + formspec[#formspec + 1] = ('item_image[%f,%f;2,2;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, primary_list_selected_value) + end + + if def.description then + -- Tooltip for description + formspec[#formspec + 1] = ('tooltip[%f,%f;2,2;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, minetest.formspec_escape(def.description)) + end + + pos_secondary_container.y = pos_secondary_container.y + 2 + elseif def and def.description then + -- Label description + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, minetest.formspec_escape(def.description)) + end + + if def and def.label then + pos_secondary_container.y = pos_secondary_container.y + 0.25 + -- Label description + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, minetest.formspec_escape(def.label)) + end + + -- Groups + if def and def.groups and next(def.groups) then + pos_secondary_container.y = pos_secondary_container.y + 0.5 + -- Title + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, 'Groups:') + -- Unordered list + formspec[#formspec + 1] = get_unordered_list((def.groups or {}), pos_secondary_container) + end + + -- Tool capabilities + if def and def.tool_capabilities and next(def.tool_capabilities) then + pos_secondary_container.y = pos_secondary_container.y + 0.5 + -- Title + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, 'Tool Capabilities:') + -- Unordered list + formspec[#formspec + 1] = get_unordered_list((def.tool_capabilities or {}), pos_secondary_container) + end + + -- ABM/LBM nodenames + if def and def.nodenames then + pos_secondary_container.y = pos_secondary_container.y + 0.5 + -- Title + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, 'Apply "action" function to these nodes:') + -- Unordered list + formspec[#formspec + 1] = get_unordered_list((def.nodenames or {}), pos_secondary_container) + end + + -- ABM neighbors + if def and def.neighbors and next(def.neighbors) then + pos_secondary_container.y = pos_secondary_container.y + 0.5 + -- Title + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, 'Only apply "action" to nodes that have one of, or any combination of, these neighbors:') + -- Unordered list + formspec[#formspec + 1] = get_unordered_list((def.neighbors or {}), pos_secondary_container) + end + + if def and def.run_at_every_load then + pos_secondary_container.y = pos_secondary_container.y + 0.5 + formspec[#formspec + 1] = ('label[%f,%f;%s]'):format(pos_secondary_container.x, pos_secondary_container.y, 'Run at every load: ' .. (def.run_at_every_load and 'yes' or 'no')) + end + + -- Biomes + if def and dropdown_value == 'biomes' then + -- Unordered list + formspec[#formspec + 1] = get_unordered_list(def, pos_secondary_container) + end + + -- Decorations + if def and dropdown_value == 'decorations' then + -- Unordered list + formspec[#formspec + 1] = get_unordered_list(def, pos_secondary_container) + end + + -- Ores + if def and dropdown_value == 'ores' then + -- Unordered list + formspec[#formspec + 1] = get_unordered_list(def, pos_secondary_container) + end + + -- Close secondary container + formspec[#formspec + 1] = 'scroll_container_end[]' + -- Add scrollbar to secondary container + formspec[#formspec + 1] = ('scrollbaroptions[min=0;max=%d;smallstep=10;largestep=100;thumbsize=10;arrows=default]'):format(math.ceil(pos_secondary_container.y * 10)) + formspec[#formspec + 1] = ('scrollbar[%f,%f;0.15,9;vertical;everness_ency_detail_view_scrollbar;]'):format(pos_secondary.x + 5.5 + 0.15, pos_secondary.y) + + return formspec +end + +function Everness.encyclopedia_i3_register_page(self) + i3.new_tab('everness_encyclopedia', { + description = 'Everness', + image = 'everness_logo.png', + slots = false, + formspec = function(player, data, fs) + local context = data or {} + local formspec = self:encyclopedia_get_formspec(context) + formspec = table.concat(formspec, '') + fs(formspec) + end, + fields = function(player, data, fields) + if fields.everness_ency_main_list then + local main_list_event = minetest.explode_textlist_event(fields.everness_ency_main_list) + + -- Set context data + if main_list_event.type == 'CHG' then + data.everness_ency_primary_selected_idx = main_list_event.index + end + elseif fields.everness_ency_dropdown then + local prev_everness_ency_dropdown_idx = data.everness_ency_dropdown_idx + local new_everness_ency_dropdown_idx = tonumber(fields.everness_ency_dropdown) + data.everness_ency_dropdown_idx = new_everness_ency_dropdown_idx + + -- Change to 1st primary list item index only when changing dropdown + if prev_everness_ency_dropdown_idx ~= new_everness_ency_dropdown_idx then + data.everness_ency_primary_selected_idx = 1 + end + end + end, + access = function(player, data) + return minetest.check_player_privs(player:get_player_name(), 'everness_encyclopedia') + end, + }) +end + +function Everness.encyclopedia_ui_register_page(self) + unified_inventory.register_page('everness:encyclopedia', { + get_formspec = function(player) + local context = unified_inventory.everness_context[player:get_player_name()] + local formspec = self:encyclopedia_get_formspec(context) + + return { + formspec = table.concat(formspec, ''), + draw_inventory = false, + draw_item_list = false + } + end + }) + + minetest.register_on_joinplayer(function(player) + local pname = player:get_player_name() + + unified_inventory.everness_context = {} + unified_inventory.everness_context[pname] = { + everness_ency_dropdown_idx = 1, + everness_ency_primary_selected_idx = 1, + } + end) + + minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= '' then + return + end + + local pname = player:get_player_name() + + if fields.everness_ency_main_list then + local main_list_event = minetest.explode_textlist_event(fields.everness_ency_main_list) + + -- Set context data + if main_list_event.type == 'CHG' then + unified_inventory.everness_context[pname].everness_ency_primary_selected_idx = main_list_event.index + unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[pname]) + end + elseif fields.everness_ency_dropdown then + local prev_everness_ency_dropdown_idx = unified_inventory.everness_context[pname].everness_ency_dropdown_idx + local new_everness_ency_dropdown_idx = tonumber(fields.everness_ency_dropdown) + unified_inventory.everness_context[pname].everness_ency_dropdown_idx = new_everness_ency_dropdown_idx + + -- Change to 1st primary list item index only when changing dropdown + if prev_everness_ency_dropdown_idx ~= new_everness_ency_dropdown_idx then + unified_inventory.everness_context[pname].everness_ency_primary_selected_idx = 1 + end + + unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[pname]) + end + end) + + unified_inventory.register_button('everness:encyclopedia', { + type = 'image', + image = 'everness_logo.png', + tooltip = 'Everness Encyclopedia', + condition = function(player) + return minetest.check_player_privs(player:get_player_name(), 'everness_encyclopedia') + end, + action = function(player) + local pname = player:get_player_name() + + if not minetest.check_player_privs(pname, 'everness_encyclopedia') then + minetest.chat_send_player(pname, S('You need "everness_encyclopedia" privilige to access this button.')) + unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[pname]) + return + end + + unified_inventory.current_page[pname] = 'everness:encyclopedia' + unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[pname]) + end, + }) +end + +function Everness.encyclopedia_sfinv_register_page(self) + sfinv.register_page('everness:encyclopedia', { + title = 'Everness', + is_in_nav = function(_self, player, context) + return minetest.check_player_privs(player:get_player_name(), 'everness_encyclopedia') + end, + get = function(_self, player, context) + local formspec = self:encyclopedia_get_formspec(context) + return sfinv.make_formspec(player, context, table.concat(formspec, '')) + end, + on_player_receive_fields = function (_self, player, context, fields) + if fields.everness_ency_main_list then + local main_list_event = minetest.explode_textlist_event(fields.everness_ency_main_list) + + -- Set context data + if main_list_event.type == 'CHG' then + context.everness_ency_primary_selected_idx = main_list_event.index + sfinv.set_player_inventory_formspec(player) + end + end + + if fields.everness_ency_dropdown then + local prev_everness_ency_dropdown_idx = context.everness_ency_dropdown_idx + local new_everness_ency_dropdown_idx = tonumber(fields.everness_ency_dropdown) + context.everness_ency_dropdown_idx = new_everness_ency_dropdown_idx + + -- Change to 1st primary list item index only when changing dropdown + if prev_everness_ency_dropdown_idx ~= new_everness_ency_dropdown_idx then + context.everness_ency_primary_selected_idx = 1 + end + + sfinv.set_player_inventory_formspec(player) + end + end + }) +end diff --git a/buckets.lua b/buckets.lua index f86863a..a594f96 100644 --- a/buckets.lua +++ b/buckets.lua @@ -71,7 +71,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name bucket.liquids[flowing] = bucket.liquids[source] if itemname ~= nil then - minetest.register_craftitem(itemname, { + Everness:register_craftitem(itemname, { description = name, inventory_image = inventory_image, stack_max = 1, @@ -131,7 +131,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name end end -minetest.register_craftitem('everness:bucket_empty', { +Everness:register_craftitem('everness:bucket_empty', { description = S('Empty Bucket'), inventory_image = 'everness_bucket_empty.png', groups = { tool = 1 }, diff --git a/chests.lua b/chests.lua index 7c6b28d..4b7d387 100644 --- a/chests.lua +++ b/chests.lua @@ -325,7 +325,7 @@ function Everness.chest.register_chest(prefixed_name, d) Everness:register_node(prefixed_name .. '_open', def_opened) -- close opened chests on load - minetest.register_lbm({ + Everness:register_lbm({ label = 'Everness close opened chests on load', name = 'everness:close_' .. prefixed_name:gsub(':', '_') .. '_open', nodenames = { prefixed_name .. '_open' }, diff --git a/craftitems.lua b/craftitems.lua index 0f4d467..e933fb5 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -21,33 +21,33 @@ local S = minetest.get_translator(minetest.get_current_modname()) -- -- Quartz Crystal -minetest.register_craftitem('everness:quartz_crystal', { +Everness:register_craftitem('everness:quartz_crystal', { description = S('Quartz Crystal'), inventory_image = 'everness_quartz.png', }) -minetest.register_craftitem('everness:bamboo_item', { +Everness:register_craftitem('everness:bamboo_item', { description = S('Bamboo'), inventory_image = 'everness_bamboo_item.png', }) -minetest.register_craftitem('everness:baobab_fruit_roasted', { +Everness:register_craftitem('everness:baobab_fruit_roasted', { description = S('Baobab Roasted Fruit') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 4'), inventory_image = 'everness_baobab_tree_fruit_roasted.png', on_use = minetest.item_eat(4), }) -minetest.register_craftitem('everness:pyrite_ingot', { +Everness:register_craftitem('everness:pyrite_ingot', { description = S('Pyrite Ingot'), inventory_image = 'everness_pyrite_ingot.png' }) -minetest.register_craftitem('everness:pyrite_lump', { +Everness:register_craftitem('everness:pyrite_lump', { description = S('Pyrite Lump'), inventory_image = 'everness_pyrite_lump.png' }) -minetest.register_craftitem('everness:coconut_fruit', { +Everness:register_craftitem('everness:coconut_fruit', { description = S('Coconut') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 4'), inventory_image = 'everness_coconut_item.png', wield_scale = { x = 2, y = 2, z = 1 }, diff --git a/functions.lua b/functions.lua index 54a23b1..0c93de0 100644 --- a/functions.lua +++ b/functions.lua @@ -39,8 +39,9 @@ local grass_covered_mapping_under = { -- Spread grass on dirt -minetest.register_abm({ - label = 'Everness Grass spread', +Everness:register_abm({ + label = 'everness:grass_spread', + description = 'Spreads grass on neighboring blocks.', nodenames = { 'everness:coral_dirt', 'everness:cursed_dirt', @@ -112,8 +113,9 @@ minetest.register_abm({ -- Spread mold/moss on stone/dirt - under -minetest.register_abm({ - label = 'Everness Grass spread under', +Everness:register_abm({ + label = 'everness:grass_spread_under', + description = 'Spreads grass on neighboring blocks in caves (under).', nodenames = { 'everness:coral_desert_stone', 'everness:soul_sandstone', @@ -177,8 +179,9 @@ minetest.register_abm({ -- Grass and dry grass removed in darkness -- -minetest.register_abm({ - label = 'Everness Grass covered', +Everness:register_abm({ + label = 'everness:grass_covered', + description = 'Grass and dry grass removed in darkness.', nodenames = { 'group:everness_spreading_dirt_type', 'group:everness_spreading_dirt_type_under', @@ -295,8 +298,9 @@ if minetest.get_modpath('default') then table.insert(moss_nodenames_correspondences, 'everness:coral_desert_cobble_wall') end -minetest.register_abm({ - label = 'Everness Moss growth', +Everness:register_abm({ + label = 'everness:moss_growth', + description = 'Grows moss on blocks near water.', nodenames = moss_nodenames_correspondences, neighbors = { 'group:water' }, interval = 16, @@ -349,8 +353,9 @@ if minetest.get_modpath('default') then table.insert(magma_nodenames_correspondences, 'everness:volcanic_rock_wall') end -minetest.register_abm({ - label = 'Everness Magma growth', +Everness:register_abm({ + label = 'everness:magma_growth', + description = 'Grows magma on blocks near lava.', nodenames = magma_nodenames_correspondences, neighbors = { 'group:lava' }, interval = 16, @@ -369,8 +374,9 @@ minetest.register_abm({ -- Falling leaves -- -minetest.register_abm({ +Everness:register_abm({ label = 'everness:falling_leaves', + description = 'Makes leaves falling particles.', nodenames = { 'group:falling_leaves' }, neighbors = { 'air' }, interval = 16, @@ -443,8 +449,9 @@ minetest.register_abm({ -- Falling leaves - vines -- -minetest.register_abm({ +Everness:register_abm({ label = 'everness:falling_vines', + description = 'Makes vines falling particles.', nodenames = { 'group:falling_vines' }, neighbors = { 'air' }, interval = 16, @@ -519,8 +526,9 @@ minetest.register_abm({ end }) -minetest.register_abm({ - label = 'Grow orange cactus', +Everness:register_abm({ + label = 'everness:grow_orange_cactus', + description = 'Grows orange cactus.', nodenames = { 'everness:cactus_orange', 'everness:cactus_blue' @@ -537,8 +545,9 @@ minetest.register_abm({ -- Bio Bubbles -- -minetest.register_abm({ +Everness:register_abm({ label = 'everness:bio_bubbles', + description = 'Bubble particles under water.', nodenames = { 'group:bio_bubbles' }, neighbors = { 'group:water' }, interval = 16, @@ -623,8 +632,9 @@ minetest.register_abm({ -- Rising Souls -- -minetest.register_abm({ +Everness:register_abm({ label = 'everness:rising_souls', + description = 'Rising souls particles under water.', nodenames = { 'group:rising_souls' }, neighbors = { 'group:water' }, interval = 16, @@ -715,8 +725,9 @@ minetest.register_abm({ -- Rising Crystals -- -minetest.register_abm({ +Everness:register_abm({ label = 'everness:rising_crystals', + description = 'Crystal particles under water.', nodenames = { 'group:rising_crystals' }, neighbors = { 'group:water' }, interval = 16, @@ -799,8 +810,9 @@ minetest.register_abm({ }) -- Mineral Waters Water Geyser -minetest.register_abm({ +Everness:register_abm({ label = 'everness:water_geyser', + description = 'Water geyser water splash.', nodenames = { 'everness:water_geyser' }, interval = 16, chance = 16, @@ -901,10 +913,10 @@ minetest.register_abm({ }) -- Generate bamboo tops after mineral waters biome generates decorations -minetest.register_lbm({ +Everness:register_lbm({ -- Descriptive label for profiling purposes (optional). -- Definitions with identical labels will be listed as one. - label = 'everness_mineral_waters_bamboo_large', + label = 'Generate bamboo tops after mineral waters biome generates decorations', -- Identifier of the LBM, should follow the modname: convention name = 'everness:mineral_waters_bamboo_large', @@ -982,10 +994,10 @@ minetest.register_lbm({ }) -- Activate timers on lotus flowers -minetest.register_lbm({ +Everness:register_lbm({ -- Descriptive label for profiling purposes (optional). -- Definitions with identical labels will be listed as one. - label = 'everness_lotus_flower_timers', + label = 'Activate timers on lotus flowers', -- Identifier of the LBM, should follow the modname: convention name = 'everness:everness_lotus_flower_timers', @@ -1017,8 +1029,9 @@ minetest.register_lbm({ }) -- Spread lotus flowers and leafs around them -minetest.register_abm({ - label = 'Lotus Flowers and Leafs spread', +Everness:register_abm({ + label = 'everness:lotus_flowers_and_leaves_spread', + description = 'Spreads lotus flowers and leaves.', nodenames = { 'everness:lotus_flower_white', 'everness:lotus_flower_purple', diff --git a/init.lua b/init.lua index 29c9500..2d67630 100644 --- a/init.lua +++ b/init.lua @@ -214,6 +214,10 @@ if Everness.settings.features.everness_feature_sneak_pickup then dofile(path .. '/sneak_pickup.lua') end +dofile(path .. '/privileges.lua') + +Everness:encyclopedia_init() + -- -- Mod Support -- diff --git a/loot_chests.lua b/loot_chests.lua index e919be7..3ef07a3 100644 --- a/loot_chests.lua +++ b/loot_chests.lua @@ -14,8 +14,8 @@ --]] -minetest.register_lbm({ - label = 'Everness Loot Chests', +Everness:register_lbm({ + label = 'Replace markers with loot chests', name = 'everness:loot_chests_marker_replace', nodenames = { 'everness:japanese_shrine_lootchest_marker', diff --git a/mapgen.lua b/mapgen.lua index 917968e..fb43d1f 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -22,7 +22,7 @@ -- Pyrite -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', wherein = 'default:stone', @@ -33,7 +33,7 @@ minetest.register_ore({ y_min = 1025, }) -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', wherein = 'default:stone', @@ -44,7 +44,7 @@ minetest.register_ore({ y_min = -511, }) -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:stone_with_pyrite', wherein = 'default:stone', @@ -57,7 +57,7 @@ minetest.register_ore({ -- Quartz -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:quartz_ore', wherein = { 'default:stone' }, @@ -97,8 +97,7 @@ local all_biomes_mese_tree_place_on = { 'everness:frosted_ice_translucent', 'everness:frosted_snowblock', 'everness:sulfur_stone', - 'everness:volcanic_sulfur', - 'everness:mineral_waters' + 'everness:volcanic_sulfur' } if minetest.get_modpath('default') then @@ -120,7 +119,7 @@ if minetest.get_modpath('default') then }) end -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:all_biomes_mese_tree', deco_type = 'schematic', place_on = all_biomes_mese_tree_place_on, @@ -140,7 +139,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:all_biomes_mese_tree_2', deco_type = 'schematic', place_on = all_biomes_mese_tree_place_on, diff --git a/mapgen_bamboo_forest.lua b/mapgen_bamboo_forest.lua index fc85ba5..9360898 100644 --- a/mapgen_bamboo_forest.lua +++ b/mapgen_bamboo_forest.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_bamboo_forest.y_min -- Bamboo Forest -minetest.register_biome({ - name = 'everness_bamboo_forest', +Everness:register_biome({ + name = 'everness:bamboo_forest', node_top = 'everness:dirt_with_grass_1', depth_top = 1, node_filler = 'everness:dirt_1', @@ -44,7 +44,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_small_bamboo', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -58,7 +58,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_large_bamboo', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -99,7 +99,7 @@ elseif minetest.get_modpath('mcl_core') then end if jungle_tree_schem then - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_jungle_tree', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -122,7 +122,7 @@ if jungle_tree_schem then end if jungle_log_schem then - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_jungle_log', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -150,7 +150,7 @@ end -- Bush if minetest.get_modpath('default') then - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_bush', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -172,7 +172,7 @@ if minetest.get_modpath('default') then -- Blueberry bush - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_blueberry_bush', deco_type = 'schematic', place_on = { 'everness:dirt_with_grass_1' }, @@ -196,7 +196,7 @@ end -- Flowers local function register_flower_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_flowers_' .. length, deco_type = 'simple', place_on = { 'everness:dirt_with_grass_1' }, @@ -222,7 +222,7 @@ register_flower_decoration(0, 0.06, 2) register_flower_decoration(0.015, 0.045, 1) local function register_flower_magenta_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:bamboo_forest_flowers_magenta' .. length, deco_type = 'simple', place_on = { 'everness:dirt_with_grass_1' }, diff --git a/mapgen_bamboo_forest_under.lua b/mapgen_bamboo_forest_under.lua index 2a72a59..c081089 100644 --- a/mapgen_bamboo_forest_under.lua +++ b/mapgen_bamboo_forest_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_bamboo_forest_under.y_min -- Bamboo Forest Under -minetest.register_biome({ - name = 'everness_bamboo_forest_under', +Everness:register_biome({ + name = 'everness:bamboo_forest_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:bamboo_wood', node_dungeon_alt = 'everness:bamboo_mosaic_wood', @@ -39,7 +39,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -56,7 +56,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_ceiling', deco_type = 'simple', place_on = { 'default:stone' }, @@ -69,7 +69,7 @@ minetest.register_decoration({ decoration = { 'everness:moss_block' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_forsythia_bush', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -89,7 +89,7 @@ minetest.register_decoration({ decoration = { 'everness:forsythia_bush' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_vines', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -107,7 +107,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_plants', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -128,7 +128,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_plants_2', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -149,7 +149,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:bamboo_forest_under_blue_vine_lantern', deco_type = 'simple', place_on = { diff --git a/mapgen_baobab_savanna.lua b/mapgen_baobab_savanna.lua index a8c778c..bc1f122 100644 --- a/mapgen_baobab_savanna.lua +++ b/mapgen_baobab_savanna.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_baobab_savanna.y_min -- Baobab Savanna -minetest.register_biome({ - name = 'everness_baobab_savanna', +Everness:register_biome({ + name = 'everness:baobab_savanna', node_top = 'everness:dry_dirt_with_dry_grass', depth_top = 1, node_filler = 'everness:dry_dirt', @@ -49,7 +49,7 @@ minetest.register_biome({ -- Noise is similar to long dry grass noise, but scale inverted, to appear -- where long dry grass is least dense and shortest. -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:baobab_savanna_dry_dirt_with_dry_grass', deco_type = 'simple', place_on = { 'everness:dry_dirt_with_dry_grass' }, @@ -70,7 +70,7 @@ minetest.register_decoration({ flags = 'force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:baobab_savanna_baobab_tree_1', deco_type = 'schematic', place_on = { 'everness:dry_dirt_with_dry_grass', 'everness:dry_dirt' }, @@ -93,7 +93,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:baobab_savanna_baobab_tree_2', deco_type = 'schematic', place_on = { 'everness:dry_dirt_with_dry_grass', 'everness:dry_dirt' }, @@ -116,7 +116,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:baobab_savanna_baobab_log', deco_type = 'schematic', place_on = { 'everness:dry_dirt_with_dry_grass' }, @@ -143,7 +143,7 @@ minetest.register_decoration({ -- Dry grasses local function register_dry_grass_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:dry_grass_' .. length, deco_type = 'simple', place_on = { 'everness:dry_dirt_with_dry_grass' }, diff --git a/mapgen_coral_forest.lua b/mapgen_coral_forest.lua index 16838c3..4bae32c 100644 --- a/mapgen_coral_forest.lua +++ b/mapgen_coral_forest.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_coral_forest.y_min -- Coral Forest -minetest.register_biome({ - name = 'everness_coral_forest', +Everness:register_biome({ + name = 'everness:coral_forest', node_top = 'everness:dirt_with_coral_grass', depth_top = 1, node_filler = 'everness:coral_dirt', @@ -50,7 +50,7 @@ minetest.register_biome({ -- Coral sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_sand', wherein = { 'everness:coral_desert_stone' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_dirt', wherein = { 'everness:coral_desert_stone' }, @@ -96,7 +96,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:coral_desert_stone_with_coal', wherein = 'everness:coral_desert_stone', @@ -117,7 +117,7 @@ minetest.register_ore({ local chunksize = tonumber(minetest.get_mapgen_setting('chunksize')) if chunksize >= 5 then - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:coral_forest_coral_tree', deco_type = 'schematic', place_on = { 'everness:dirt_with_coral_grass' }, @@ -142,7 +142,7 @@ if chunksize >= 5 then }) end -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_coral_bones_tree', deco_type = 'schematic', place_on = { 'everness:dirt_with_coral_grass' }, @@ -164,7 +164,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_coral_burdock', deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass' }, @@ -185,7 +185,7 @@ minetest.register_decoration({ param2 = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_coral_bush', deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass', 'everness:coral_sand', 'everness:coral_white_sand' }, @@ -204,7 +204,7 @@ minetest.register_decoration({ decoration = 'everness:coral_bush' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_coral_shrub', deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass', 'everness:coral_sand', 'everness:coral_white_sand' }, @@ -224,7 +224,7 @@ minetest.register_decoration({ }) local function register_coral_grass_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:coral_forest_coral_grass_' .. length, deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass' }, diff --git a/mapgen_coral_forest_deep_ocean.lua b/mapgen_coral_forest_deep_ocean.lua index 127036c..4647112 100644 --- a/mapgen_coral_forest_deep_ocean.lua +++ b/mapgen_coral_forest_deep_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_coral_forest_deep_ocean.y_min -- Coral Forest Ocean -minetest.register_biome({ - name = 'everness_coral_forest_deep_ocean', +Everness:register_biome({ + name = 'everness:coral_forest_deep_ocean', node_top = 'everness:coral_forest_deep_ocean_sand', depth_top = 1, node_filler = 'everness:coral_forest_deep_ocean_sand', @@ -46,7 +46,7 @@ minetest.register_biome({ -- Coral Desert Stone -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', wherein = { 'default:stone' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Coral reef -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_pink', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -94,7 +94,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_cyan', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -116,7 +116,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_green', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -138,7 +138,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_coral_reef_red', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -160,7 +160,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_pink', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -175,7 +175,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_cyan', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -190,7 +190,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_green', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -205,7 +205,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:everness_coral_forest_deep_ocean_red', deco_type = 'schematic', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -220,7 +220,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_mud', deco_type = 'simple', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -236,7 +236,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_plants_1', deco_type = 'simple', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -259,7 +259,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_plants_2', deco_type = 'simple', place_on = { 'everness:coral_forest_deep_ocean_sand' }, @@ -282,7 +282,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_deep_ocean_plants_3', deco_type = 'simple', place_on = { 'everness:coral_forest_deep_ocean_sand' }, diff --git a/mapgen_coral_forest_dunes.lua b/mapgen_coral_forest_dunes.lua index 3b8130f..9162971 100644 --- a/mapgen_coral_forest_dunes.lua +++ b/mapgen_coral_forest_dunes.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_coral_forest_dunes.y_min -- Coral Forest Dunes -minetest.register_biome({ - name = 'everness_coral_forest_dunes', +Everness:register_biome({ + name = 'everness:coral_forest_dunes', node_top = 'everness:coral_sand', depth_top = 1, node_filler = 'everness:coral_sand', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Coral sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_sand', wherein = { 'everness:coral_desert_stone' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_dirt', wherein = { 'everness:coral_desert_stone' }, @@ -97,7 +97,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:coral_desert_stone_with_coal', wherein = 'everness:coral_desert_stone', @@ -115,7 +115,7 @@ minetest.register_ore({ -- Coral Forest Dunes -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_dunes_coral_volcano', deco_type = 'schematic', place_on = { 'everness:coral_sand' }, @@ -141,7 +141,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_dunes_coral_bush', deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass', 'everness:coral_sand', 'everness:coral_white_sand' }, @@ -160,7 +160,7 @@ minetest.register_decoration({ decoration = 'everness:coral_bush' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_dunes_coral_shrub', deco_type = 'simple', place_on = { 'everness:dirt_with_coral_grass', 'everness:coral_sand', 'everness:coral_white_sand' }, diff --git a/mapgen_coral_forest_ocean.lua b/mapgen_coral_forest_ocean.lua index 93f1d76..9602044 100644 --- a/mapgen_coral_forest_ocean.lua +++ b/mapgen_coral_forest_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_coral_forest_ocean.y_min -- Coral Forest Ocean -minetest.register_biome({ - name = 'everness_coral_forest_ocean', +Everness:register_biome({ + name = 'everness:coral_forest_ocean', node_top = 'everness:coral_white_sand', depth_top = 1, node_filler = 'everness:coral_white_sand', @@ -47,7 +47,7 @@ minetest.register_biome({ -- Clay -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'default:clay', wherein = { 'everness:coral_white_sand' }, @@ -69,7 +69,7 @@ minetest.register_ore({ -- Coral sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_sand', wherein = { 'everness:coral_desert_stone' }, @@ -91,7 +91,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_dirt', wherein = { 'everness:coral_desert_stone' }, @@ -115,7 +115,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:coral_desert_stone_with_coal', wherein = 'everness:coral_desert_stone', @@ -135,7 +135,7 @@ minetest.register_ore({ -- Coral reef -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_ocean_corals', deco_type = 'simple', place_on = { 'everness:coral_white_sand' }, diff --git a/mapgen_coral_forest_under.lua b/mapgen_coral_forest_under.lua index 2e8e4f8..220744d 100644 --- a/mapgen_coral_forest_under.lua +++ b/mapgen_coral_forest_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_coral_forest_under.y_min -- Coral Forest Under -minetest.register_biome({ - name = 'everness_coral_forest_under', +Everness:register_biome({ + name = 'everness:coral_forest_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:coral_desert_cobble', node_dungeon_alt = 'everness:coral_desert_mossy_cobble', @@ -44,7 +44,7 @@ minetest.register_biome({ -- Coral Desert Stone -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:coral_desert_stone', wherein = { 'default:stone' }, @@ -70,7 +70,7 @@ minetest.register_ore({ -- Coral Forest Under -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_desert_stone_with_moss_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -86,7 +86,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_mold_stone_ceilings', deco_type = 'simple', place_on = { 'default:stone' }, @@ -101,7 +101,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_coral_tree_bioluminescent', deco_type = 'schematic', place_on = { 'everness:coral_desert_stone_with_moss' }, @@ -125,7 +125,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_coral_plant_bioluminescent', deco_type = 'simple', place_on = { 'everness:coral_desert_stone_with_moss' }, @@ -146,7 +146,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_lumecorn', deco_type = 'simple', place_on = { 'everness:coral_desert_stone_with_moss' }, @@ -166,7 +166,7 @@ minetest.register_decoration({ flags = 'all_floors', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_vines', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -187,7 +187,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:coral_forest_under_plants', deco_type = 'simple', place_on = { 'everness:coral_desert_stone_with_moss' }, diff --git a/mapgen_crystal_forest.lua b/mapgen_crystal_forest.lua index 0cb0b53..3421c9c 100644 --- a/mapgen_crystal_forest.lua +++ b/mapgen_crystal_forest.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest.y_min -- Crystal Forest -minetest.register_biome({ - name = 'everness_crystal_forest', +Everness:register_biome({ + name = 'everness:crystal_forest', node_top = 'everness:dirt_with_crystal_grass', depth_top = 1, node_filler = 'everness:crystal_dirt', @@ -50,7 +50,7 @@ minetest.register_biome({ -- Crystal sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_sand', wherein = { 'everness:crystal_stone' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_dirt', wherein = { 'everness:crystal_stone' }, @@ -96,7 +96,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:crystal_stone_with_coal', wherein = 'everness:crystal_stone', @@ -112,7 +112,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_crystal_mushrooms', deco_type = 'simple', place_on = { 'everness:dirt_with_crystal_grass' }, @@ -132,7 +132,7 @@ minetest.register_decoration({ param2 = 40 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_crystal_tree', deco_type = 'schematic', place_on = { 'everness:dirt_with_crystal_grass' }, @@ -154,7 +154,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_crystal_tree_large', deco_type = 'schematic', place_on = { 'everness:dirt_with_crystal_grass' }, @@ -176,7 +176,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_crystal_bush', deco_type = 'schematic', place_on = { 'everness:dirt_with_crystal_grass' }, @@ -198,7 +198,7 @@ minetest.register_decoration({ }) local function register_crystal_grass_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:crystal_forest_crystal_grass_' .. length, deco_type = 'simple', place_on = { 'everness:dirt_with_crystal_grass' }, diff --git a/mapgen_crystal_forest_deep_ocean.lua b/mapgen_crystal_forest_deep_ocean.lua index ad533d3..1a0df1d 100644 --- a/mapgen_crystal_forest_deep_ocean.lua +++ b/mapgen_crystal_forest_deep_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_deep_ocean.y_min -- Coral Forest Ocean -minetest.register_biome({ - name = 'everness_crystal_forest_deep_ocean', +Everness:register_biome({ + name = 'everness:crystal_forest_deep_ocean', node_top = 'everness:crystal_forest_deep_ocean_sand', depth_top = 1, node_filler = 'everness:crystal_forest_deep_ocean_sand', @@ -45,7 +45,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_1', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -60,7 +60,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_2', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -75,7 +75,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_3', deco_type = 'schematic', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -90,7 +90,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_sand_with_crack', deco_type = 'simple', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -106,7 +106,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_plant_1', deco_type = 'simple', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -129,7 +129,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_plant_2', deco_type = 'simple', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, @@ -152,7 +152,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_deep_ocean_coral_plant_3', deco_type = 'simple', place_on = { 'everness:crystal_forest_deep_ocean_sand' }, diff --git a/mapgen_crystal_forest_dunes.lua b/mapgen_crystal_forest_dunes.lua index afb7049..b216f2d 100644 --- a/mapgen_crystal_forest_dunes.lua +++ b/mapgen_crystal_forest_dunes.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_dunes.y_min -- Crystal Forest Dunes -minetest.register_biome({ - name = 'everness_crystal_forest_dunes', +Everness:register_biome({ + name = 'everness:crystal_forest_dunes', node_top = 'everness:crystal_sand', depth_top = 1, node_filler = 'everness:crystal_sand', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Crystal sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_sand', wherein = { 'everness:crystal_stone' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_dirt', wherein = { 'everness:crystal_stone' }, @@ -97,7 +97,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_dunes_ruins_1', deco_type = 'schematic', place_on = { 'everness:crystal_sand' }, @@ -118,7 +118,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_dunes_ruins_2', deco_type = 'schematic', place_on = { 'everness:crystal_sand' }, diff --git a/mapgen_crystal_forest_ocean.lua b/mapgen_crystal_forest_ocean.lua index 21568e1..653f75a 100644 --- a/mapgen_crystal_forest_ocean.lua +++ b/mapgen_crystal_forest_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_ocean.y_min -- Crystal Forest Ocean -minetest.register_biome({ - name = 'everness_crystal_forest_ocean', +Everness:register_biome({ + name = 'everness:crystal_forest_ocean', node_top = 'everness:crystal_sand', depth_top = 1, node_filler = 'everness:crystal_sand', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Clay -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'default:clay', wherein = { 'everness:crystal_sand' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Crystal sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_sand', wherein = { 'everness:crystal_stone' }, @@ -95,7 +95,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_dirt', wherein = { 'everness:crystal_stone' }, @@ -121,7 +121,7 @@ minetest.register_ore({ -- Coral reef -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_ocean_corals', deco_type = 'simple', place_on = { 'everness:crystal_sand' }, diff --git a/mapgen_crystal_forest_shore.lua b/mapgen_crystal_forest_shore.lua index 4bf6c6b..c05df7a 100644 --- a/mapgen_crystal_forest_shore.lua +++ b/mapgen_crystal_forest_shore.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_shore.y_min -- Crystal Forest Shore -minetest.register_biome({ - name = 'everness_crystal_forest_shore', +Everness:register_biome({ + name = 'everness:crystal_forest_shore', node_top = 'everness:crystal_sand', depth_top = 1, node_filler = 'everness:crystal_sand', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Crystal sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_sand', wherein = { 'everness:crystal_stone' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:crystal_dirt', wherein = { 'everness:crystal_stone' }, @@ -97,7 +97,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:crystal_stone_with_coal', wherein = 'everness:crystal_stone', @@ -113,7 +113,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_shore_crystal_waterlily', deco_type = 'simple', place_on = { 'everness:crystal_sand' }, diff --git a/mapgen_crystal_forest_under.lua b/mapgen_crystal_forest_under.lua index e4580be..0eb03f7 100644 --- a/mapgen_crystal_forest_under.lua +++ b/mapgen_crystal_forest_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_crystal_forest_under.y_min -- Crystal Forest Under -minetest.register_biome({ - name = 'everness_crystal_forest_under', +Everness:register_biome({ + name = 'everness:crystal_forest_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:crystal_cobble', node_dungeon_alt = 'everness:crystal_mossy_cobble', @@ -39,7 +39,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -56,7 +56,7 @@ minetest.register_decoration({ flags = 'all_floors, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_ceilings', deco_type = 'simple', place_on = { 'default:stone' }, @@ -71,7 +71,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_vines', deco_type = 'simple', place_on = { 'everness:crystal_moss_block' }, @@ -92,7 +92,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_crystal_purple_cluster', deco_type = 'schematic', place_on = { @@ -122,7 +122,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_crystal_orange_cluster', deco_type = 'schematic', place_on = { @@ -152,7 +152,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_crystal_cyan', deco_type = 'simple', place_on = { @@ -176,7 +176,7 @@ minetest.register_decoration({ param2 = 1 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_twisted_crystal_grass', deco_type = 'simple', place_on = { @@ -200,7 +200,7 @@ minetest.register_decoration({ param2 = 40 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:crystal_forest_under_crystal_cyan_ceiling', deco_type = 'simple', place_on = { 'default:stone' }, diff --git a/mapgen_cursed_lands.lua b/mapgen_cursed_lands.lua index 7ed2451..d93e9ba 100644 --- a/mapgen_cursed_lands.lua +++ b/mapgen_cursed_lands.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands.y_min -- Cursed Lands -minetest.register_biome({ - name = 'everness_cursed_lands', +Everness:register_biome({ + name = 'everness:cursed_lands', node_top = 'everness:dirt_with_cursed_grass', depth_top = 1, node_filler = 'everness:cursed_dirt', @@ -48,7 +48,7 @@ minetest.register_biome({ -- Stratum ores. -- These obviously first. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'stratum', ore = 'everness:cursed_stone', wherein = { 'everness:cursed_stone_carved' }, @@ -66,7 +66,7 @@ minetest.register_ore({ biomes = { 'everness_cursed_lands' }, }) -minetest.register_ore({ +Everness:register_ore({ ore_type = 'stratum', ore = 'everness:cursed_stone', wherein = { 'everness:cursed_stone_carved' }, @@ -89,7 +89,7 @@ minetest.register_ore({ -- Sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_sand', wherein = { 'everness:cursed_stone_carved' }, @@ -111,7 +111,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_dirt', wherein = { 'everness:cursed_stone_carved' }, @@ -133,7 +133,7 @@ minetest.register_ore({ -- Mud -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_mud', wherein = { 'everness:cursed_stone_carved' }, @@ -157,7 +157,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:cursed_stone_carved_with_coal', wherein = 'everness:cursed_stone_carved', @@ -173,7 +173,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_cemetery', deco_type = 'schematic', place_on = { 'everness:dirt_with_cursed_grass' }, @@ -194,7 +194,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_ruins_1', deco_type = 'schematic', place_on = { 'everness:dirt_with_cursed_grass' }, @@ -216,7 +216,7 @@ minetest.register_decoration({ }) local function register_red_castor_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:cursed_lands_red_castor_' .. length, deco_type = 'simple', place_on = { 'everness:dirt_with_cursed_grass' }, @@ -243,7 +243,7 @@ register_red_castor_decoration(-0.015, 0.075, 3) register_red_castor_decoration(0, 0.06, 2) register_red_castor_decoration(0.015, 0.045, 1) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_cursed_mud', deco_type = 'simple', place_on = { 'everness:dirt_with_cursed_grass', 'everness:cursed_dirt', 'everness:cursed_sand' }, @@ -264,7 +264,7 @@ minetest.register_decoration({ decoration = { 'everness:cursed_mud' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_dry_tree', deco_type = 'schematic', place_on = { @@ -291,7 +291,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_cursed_bush', deco_type = 'schematic', place_on = { 'everness:dirt_with_cursed_grass' }, diff --git a/mapgen_cursed_lands_deep_ocean.lua b/mapgen_cursed_lands_deep_ocean.lua index 729cc17..030ee01 100644 --- a/mapgen_cursed_lands_deep_ocean.lua +++ b/mapgen_cursed_lands_deep_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_deep_ocean.y_min -- Cursed Lands Deep Ocean -minetest.register_biome({ - name = 'everness_cursed_lands_deep_ocean', +Everness:register_biome({ + name = 'everness:cursed_lands_deep_ocean', node_top = 'everness:cursed_lands_deep_ocean_sand', depth_top = 1, node_filler = 'everness:cursed_lands_deep_ocean_sand', @@ -45,7 +45,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_alcyonacea', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -60,7 +60,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_ostracod', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -75,7 +75,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_lands_deep_ocean_coral_octocurse', deco_type = 'schematic', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -90,7 +90,7 @@ minetest.register_decoration({ flags = 'place_center_x, place_center_z, force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_deep_ocean_mud', deco_type = 'simple', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -106,7 +106,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_deep_ocean_plants_1', deco_type = 'simple', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -129,7 +129,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_deep_ocean_plants_2', deco_type = 'simple', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, @@ -152,7 +152,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_deep_ocean_plants_3', deco_type = 'simple', place_on = { 'everness:cursed_lands_deep_ocean_sand' }, diff --git a/mapgen_cursed_lands_dunes.lua b/mapgen_cursed_lands_dunes.lua index 0e60c5c..c025c79 100644 --- a/mapgen_cursed_lands_dunes.lua +++ b/mapgen_cursed_lands_dunes.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_dunes.y_min -- Cursed Lands Dunes -minetest.register_biome({ - name = 'everness_cursed_lands_dunes', +Everness:register_biome({ + name = 'everness:cursed_lands_dunes', node_top = 'everness:cursed_sand', depth_top = 1, node_filler = 'everness:cursed_sand', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_sand', wherein = { 'everness:cursed_stone_carved' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_dirt', wherein = { 'everness:cursed_stone_carved' }, @@ -95,7 +95,7 @@ minetest.register_ore({ -- Mud -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_mud', wherein = { 'everness:cursed_stone_carved' }, @@ -119,7 +119,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:cursed_stone_carved_with_coal', wherein = 'everness:cursed_stone_carved', @@ -135,7 +135,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_dunes_dry_tree', deco_type = 'schematic', place_on = { diff --git a/mapgen_cursed_lands_ocean.lua b/mapgen_cursed_lands_ocean.lua index 52ca3d0..9926ca8 100644 --- a/mapgen_cursed_lands_ocean.lua +++ b/mapgen_cursed_lands_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_ocean.y_min -- Cursed Lands Ocean -minetest.register_biome({ - name = 'everness_cursed_lands_ocean', +Everness:register_biome({ + name = 'everness:cursed_lands_ocean', node_top = 'everness:cursed_stone', depth_top = 1, node_filler = 'everness:cursed_stone', @@ -51,7 +51,7 @@ minetest.register_biome({ -- Clay -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'default:clay', wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, @@ -73,7 +73,7 @@ minetest.register_ore({ -- Sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_sand', wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, @@ -95,7 +95,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_dirt', wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, @@ -117,7 +117,7 @@ minetest.register_ore({ -- Mud -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_mud', wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, @@ -141,7 +141,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:cursed_stone_carved_with_coal', wherein = 'everness:cursed_stone_carved', @@ -157,7 +157,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_ocean_dry_tree', deco_type = 'schematic', place_on = { @@ -186,7 +186,7 @@ minetest.register_decoration({ -- Spine Kelp -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:sand_with_spine_kelp', deco_type = 'simple', place_on = { 'everness:cursed_stone' }, diff --git a/mapgen_cursed_lands_swamp.lua b/mapgen_cursed_lands_swamp.lua index ebd6e0c..d987d5e 100644 --- a/mapgen_cursed_lands_swamp.lua +++ b/mapgen_cursed_lands_swamp.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_swamp.y_min -- Cursed Lands Swamp -minetest.register_biome({ - name = 'everness_cursed_lands_swamp', +Everness:register_biome({ + name = 'everness:cursed_lands_swamp', node_top = 'everness:cursed_stone', depth_top = 1, node_filler = 'everness:cursed_stone', @@ -50,7 +50,7 @@ minetest.register_biome({ -- Sand -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_sand', wherein = { 'everness:cursed_stone_carved' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Dirt -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_dirt', wherein = { 'everness:cursed_stone_carved' }, @@ -94,7 +94,7 @@ minetest.register_ore({ -- Mud -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:cursed_mud', wherein = { 'everness:cursed_stone_carved' }, @@ -118,7 +118,7 @@ minetest.register_ore({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:cursed_stone_carved_with_coal', wherein = 'everness:cursed_stone_carved', @@ -134,7 +134,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_swamp_dry_tree', deco_type = 'schematic', place_on = { 'everness:cursed_stone' }, @@ -157,7 +157,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_swamp_marsh_grass', deco_type = 'schematic', place_on = { 'everness:cursed_stone' }, diff --git a/mapgen_cursed_lands_under.lua b/mapgen_cursed_lands_under.lua index 57e958f..22f6b38 100644 --- a/mapgen_cursed_lands_under.lua +++ b/mapgen_cursed_lands_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_cursed_lands_under.y_min -- Cursed Lands Under -minetest.register_biome({ - name = 'everness_cursed_lands_under', +Everness:register_biome({ + name = 'everness:cursed_lands_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:cursed_brick', node_dungeon_alt = 'everness:cursed_brick_with_growth', @@ -39,7 +39,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_soul_sandstone_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -55,7 +55,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_mold_stone_ceilings', deco_type = 'simple', place_on = { 'default:stone' }, @@ -70,7 +70,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_skull_with_candle', deco_type = 'simple', place_on = { 'everness:soul_sandstone_veined' }, @@ -91,7 +91,7 @@ minetest.register_decoration({ param2_max = 3 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_vines', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -112,7 +112,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_pumpkin_lantern', deco_type = 'simple', place_on = { 'everness:soul_sandstone_veined' }, @@ -133,7 +133,7 @@ minetest.register_decoration({ param2_max = 3 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_cursed_dream_tree', deco_type = 'schematic', place_on = { 'everness:soul_sandstone_veined' }, @@ -157,7 +157,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_plants', deco_type = 'simple', place_on = { 'everness:soul_sandstone_veined' }, @@ -181,7 +181,7 @@ minetest.register_decoration({ flags = 'all_floors', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_ivis_moss', deco_type = 'simple', place_on = { 'everness:soul_sandstone_veined' }, @@ -204,7 +204,7 @@ minetest.register_decoration({ param2 = 3 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:cursed_lands_under_cobweb_floors', deco_type = 'simple', place_on = { 'everness:soul_sandstone_veined' }, diff --git a/mapgen_forsaken_desert.lua b/mapgen_forsaken_desert.lua index c4e9d35..7303b5f 100644 --- a/mapgen_forsaken_desert.lua +++ b/mapgen_forsaken_desert.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_desert.y_min -- Forsaken Desert -minetest.register_biome({ - name = 'everness_forsaken_desert', +Everness:register_biome({ + name = 'everness:forsaken_desert', node_top = 'everness:forsaken_desert_sand', depth_top = 1, node_stone = 'everness:forsaken_desert_stone', @@ -48,7 +48,7 @@ minetest.register_biome({ -- Stratum ores. -- These obviously first. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'stratum', ore = 'everness:forsaken_desert_cobble', wherein = { 'everness:forsaken_desert_stone' }, @@ -66,7 +66,7 @@ minetest.register_ore({ biomes = { 'everness_forsaken_desert' }, }) -minetest.register_ore({ +Everness:register_ore({ ore_type = 'stratum', ore = 'everness:forsaken_desert_cobble', wherein = { 'everness:forsaken_desert_stone' }, @@ -88,7 +88,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_sand_plants_1', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, @@ -108,7 +108,7 @@ minetest.register_decoration({ param2 = 11, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_sand_plants_2', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, @@ -131,7 +131,7 @@ minetest.register_decoration({ param2 = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_termite_nest', deco_type = 'schematic', place_on = { 'everness:forsaken_desert_sand' }, @@ -152,7 +152,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_hollow_tree', deco_type = 'schematic', place_on = { 'everness:forsaken_desert_sand' }, @@ -173,7 +173,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_hollow_tree_large', deco_type = 'schematic', place_on = { 'everness:forsaken_desert_sand' }, diff --git a/mapgen_forsaken_desert_ocean.lua b/mapgen_forsaken_desert_ocean.lua index 3c1a674..d19fab3 100644 --- a/mapgen_forsaken_desert_ocean.lua +++ b/mapgen_forsaken_desert_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_desert_ocean.y_min -- Forsaken Desert Ocean -minetest.register_biome({ - name = 'everness_forsaken_desert_ocean', +Everness:register_biome({ + name = 'everness:forsaken_desert_ocean', node_top = 'everness:dry_ocean_dirt', depth_top = 1, node_stone = 'everness:forsaken_desert_stone', diff --git a/mapgen_forsaken_desert_under.lua b/mapgen_forsaken_desert_under.lua index 32310f4..16133d9 100644 --- a/mapgen_forsaken_desert_under.lua +++ b/mapgen_forsaken_desert_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_desert_under.y_min -- Forsaken Desert Under -minetest.register_biome({ - name = 'everness_forsaken_desert_under', +Everness:register_biome({ + name = 'everness:forsaken_desert_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', @@ -39,7 +39,7 @@ minetest.register_biome({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -55,7 +55,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_floors_chiseled', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, @@ -76,7 +76,7 @@ minetest.register_decoration({ flags = 'all_floors, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_ceilings', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, @@ -91,7 +91,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_cactus_blue', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, @@ -113,7 +113,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_cave_barrel_cactus', deco_type = 'simple', place_on = { @@ -135,7 +135,7 @@ minetest.register_decoration({ param2_max = 3 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_cave_illumi_root', deco_type = 'simple', place_on = { @@ -153,7 +153,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_vines', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -172,7 +172,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_desert_under_hollow_tree', deco_type = 'simple', place_on = { 'everness:forsaken_desert_sand' }, diff --git a/mapgen_forsaken_tundra.lua b/mapgen_forsaken_tundra.lua index 6de3985..c762b64 100644 --- a/mapgen_forsaken_tundra.lua +++ b/mapgen_forsaken_tundra.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_tundra.y_min -- Forsaken Tundra -minetest.register_biome({ - name = 'everness_forsaken_tundra', +Everness:register_biome({ + name = 'everness:forsaken_tundra', node_top = 'everness:forsaken_tundra_dirt', depth_top = 1, node_stone = 'everness:forsaken_tundra_stone', @@ -48,7 +48,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_volcanic_sulfur', deco_type = 'simple', place_on = { 'everness:forsaken_tundra_dirt' }, @@ -94,7 +94,7 @@ minetest.register_decoration({ flags = 'force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_sulfur_stone', deco_type = 'simple', place_on = { @@ -118,7 +118,7 @@ minetest.register_decoration({ decoration = { 'everness:sulfur_stone' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_dirt_with_grass', deco_type = 'simple', place_on = { @@ -142,7 +142,7 @@ minetest.register_decoration({ flags = 'force_placement', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_volcanic_sulfur_on_top_of_sulfur_stone', deco_type = 'simple', place_on = { 'everness:sulfur_stone' }, @@ -161,7 +161,7 @@ minetest.register_decoration({ decoration = { 'everness:volcanic_sulfur' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_rocks', deco_type = 'schematic', place_on = { 'everness:forsaken_tundra_dirt', 'everness:forsaken_tundra_dirt_with_grass' }, @@ -182,7 +182,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_sulfur_volcano', deco_type = 'schematic', place_on = { 'everness:forsaken_tundra_dirt', 'everness:volcanic_sulfur' }, @@ -205,7 +205,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_bloodpore_plant', deco_type = 'simple', place_on = { 'everness:forsaken_tundra_dirt_with_grass' }, @@ -225,7 +225,7 @@ minetest.register_decoration({ param2 = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_bloodspore_plant_on_dirt', deco_type = 'simple', place_on = { 'everness:forsaken_tundra_dirt' }, diff --git a/mapgen_forsaken_tundra_beach.lua b/mapgen_forsaken_tundra_beach.lua index c291439..fdff4db 100644 --- a/mapgen_forsaken_tundra_beach.lua +++ b/mapgen_forsaken_tundra_beach.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_tundra_beach.y_min -- Forsaken Tundra Beach -minetest.register_biome({ - name = 'everness_forsaken_tundra_beach', +Everness:register_biome({ + name = 'everness:forsaken_tundra_beach', node_top = 'everness:forsaken_tundra_beach_sand', depth_top = 1, node_filler = 'everness:forsaken_tundra_beach_sand', @@ -48,7 +48,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, @@ -72,7 +72,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_beach_sand_with_shells', deco_type = 'simple', place_on = { 'everness:forsaken_tundra_beach_sand' }, diff --git a/mapgen_forsaken_tundra_ocean.lua b/mapgen_forsaken_tundra_ocean.lua index 52adab2..69eb804 100644 --- a/mapgen_forsaken_tundra_ocean.lua +++ b/mapgen_forsaken_tundra_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_tundra_ocean.y_min -- Forsaken Tundra Ocean -minetest.register_biome({ - name = 'everness_forsaken_tundra_ocean', +Everness:register_biome({ + name = 'everness:forsaken_tundra_ocean', node_top = 'everness:forsaken_tundra_beach_sand', depth_top = 1, node_stone = 'everness:forsaken_tundra_stone', @@ -50,7 +50,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, @@ -74,7 +74,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_beach_sand_with_shells', deco_type = 'simple', place_on = { 'everness:forsaken_tundra_beach_sand' }, diff --git a/mapgen_forsaken_tundra_under.lua b/mapgen_forsaken_tundra_under.lua index af1c856..bbb1d37 100644 --- a/mapgen_forsaken_tundra_under.lua +++ b/mapgen_forsaken_tundra_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_forsaken_tundra_under.y_min -- Forsaken Tundra Under -minetest.register_biome({ - name = 'everness_forsaken_tundra_under', +Everness:register_biome({ + name = 'everness:forsaken_tundra_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:forsaken_tundra_cobble', node_dungeon_alt = 'everness:forsaken_tundra_brick', @@ -42,7 +42,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:sulfur_stone', wherein = { 'default:stone', 'everness:forsaken_tundra_stone' }, @@ -66,7 +66,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_mold_stone_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -82,7 +82,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_mold_stone_ceilings', deco_type = 'simple', place_on = { 'default:stone' }, @@ -97,7 +97,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_obsidian_floors', deco_type = 'simple', place_on = { 'default:stone', 'everness:mold_stone_with_moss' }, @@ -115,7 +115,7 @@ minetest.register_decoration({ flags = 'all_floors, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_obsidian_ceilings', deco_type = 'simple', place_on = { 'default:stone', 'everness:moss_block' }, @@ -133,7 +133,7 @@ minetest.register_decoration({ flags = 'all_ceilings, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_cactus_orange', deco_type = 'simple', place_on = { 'everness:mold_stone_with_moss' }, @@ -155,7 +155,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_bloodspore_plant_small', deco_type = 'simple', place_on = { 'everness:mold_stone_with_moss' }, @@ -176,7 +176,7 @@ minetest.register_decoration({ flags = 'all_floors' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_vines', deco_type = 'simple', place_on = { 'everness:moss_block' }, @@ -197,7 +197,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:forsaken_tundra_under_glowing_pillar', deco_type = 'simple', place_on = { 'everness:mold_stone_with_moss' }, @@ -218,7 +218,7 @@ minetest.register_decoration({ }) local function register_agave_leaf_decoration(offset, scale, length) - minetest.register_decoration({ + Everness:register_decoration({ name = 'everness:forsaken_tundra_under_agave_leaf_' .. length, deco_type = 'simple', place_on = { 'everness:mold_stone_with_moss' }, diff --git a/mapgen_frosted_icesheet.lua b/mapgen_frosted_icesheet.lua index b883062..57c3138 100644 --- a/mapgen_frosted_icesheet.lua +++ b/mapgen_frosted_icesheet.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_frosted_icesheet.y_min -- Frosted Icesheet -minetest.register_biome({ - name = 'everness_frosted_icesheet', +Everness:register_biome({ + name = 'everness:frosted_icesheet', node_dust = 'everness:frosted_snowblock', node_top = 'everness:frosted_snowblock', depth_top = 1, @@ -51,7 +51,7 @@ minetest.register_biome({ -- Frosted Icesheet -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_stalagmite', deco_type = 'schematic', schematic = minetest.get_modpath('everness') .. '/schematics/everness_frosted_lands_stalagmite.mts', @@ -74,7 +74,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_volcanic_rock', deco_type = 'schematic', schematic = minetest.get_modpath('everness') .. '/schematics/everness_frosted_lands_volcanic_rock.mts', @@ -97,7 +97,7 @@ minetest.register_decoration({ num_spawn_by = 8, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_fossils', deco_type = 'schematic', schematic = minetest.get_modpath('everness') .. '/schematics/everness_frosted_lands_fossils.mts', diff --git a/mapgen_frosted_icesheet_ocean.lua b/mapgen_frosted_icesheet_ocean.lua index be28987..37fbd64 100644 --- a/mapgen_frosted_icesheet_ocean.lua +++ b/mapgen_frosted_icesheet_ocean.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_frosted_icesheet_ocean.y_min -- Frosted Icesheet Ocean -minetest.register_biome({ - name = 'everness_frosted_icesheet_ocean', +Everness:register_biome({ + name = 'everness:frosted_icesheet_ocean', node_top = 'default:sand', depth_top = 1, node_filler = 'default:sand', @@ -47,7 +47,7 @@ minetest.register_biome({ -- Frosted Icesheet Ocean -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_ocean_corals', deco_type = 'simple', place_on = { 'default:sand' }, diff --git a/mapgen_frosted_icesheet_under.lua b/mapgen_frosted_icesheet_under.lua index 3b479fe..03c89e2 100644 --- a/mapgen_frosted_icesheet_under.lua +++ b/mapgen_frosted_icesheet_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_frosted_icesheet_under.y_min -- Frosted Icesheet Under -minetest.register_biome({ - name = 'everness_frosted_icesheet_under', +Everness:register_biome({ + name = 'everness:frosted_icesheet_under', node_cave_liquid = { 'mapgen_water_source', 'mapgen_lava_source' }, node_dungeon = 'everness:icecobble', node_dungeon_alt = 'everness:snowcobble', @@ -42,7 +42,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:bone', wherein = { 'default:stone' }, @@ -66,7 +66,7 @@ minetest.register_ore({ -- Register decorations -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_floors', deco_type = 'simple', place_on = { 'default:stone' }, @@ -86,7 +86,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_ceilings', deco_type = 'simple', place_on = { 'default:stone' }, @@ -105,7 +105,7 @@ minetest.register_decoration({ }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_illuminating_floors', deco_type = 'simple', place_on = { @@ -125,7 +125,7 @@ minetest.register_decoration({ flags = 'all_floors, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_illuminating_ceilings', deco_type = 'simple', place_on = { @@ -145,7 +145,7 @@ minetest.register_decoration({ flags = 'all_ceilings, force_placement' }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_amaranita_lantern', deco_type = 'simple', place_on = { @@ -171,7 +171,7 @@ minetest.register_decoration({ flags = 'all_floors', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_vines', deco_type = 'simple', place_on = { @@ -198,7 +198,7 @@ minetest.register_decoration({ num_spawn_by = 8 }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icicle_large_ceiling', deco_type = 'schematic', place_on = { @@ -225,7 +225,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icicle_large_floor', deco_type = 'schematic', place_on = { @@ -252,7 +252,7 @@ minetest.register_decoration({ rotation = 'random', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_plants', deco_type = 'simple', place_on = { @@ -282,7 +282,7 @@ minetest.register_decoration({ flags = 'all_floors', }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:frosted_icesheet_under_plants_2', deco_type = 'simple', place_on = { diff --git a/mapgen_mineral_waters.lua b/mapgen_mineral_waters.lua index a4e82b8..7b0a38c 100644 --- a/mapgen_mineral_waters.lua +++ b/mapgen_mineral_waters.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_mineral_waters.y_min -- Mineral Waters -minetest.register_biome({ - name = 'everness_mineral_waters', +Everness:register_biome({ + name = 'everness:mineral_waters', node_top = 'everness:mineral_sand', depth_top = 1, node_filler = 'everness:mineral_stone', @@ -50,7 +50,7 @@ minetest.register_biome({ -- Coal -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:mineral_stone_with_coal', wherein = 'everness:mineral_stone', @@ -62,7 +62,7 @@ minetest.register_ore({ biomes = { 'everness_mineral_waters' } }) -minetest.register_ore({ +Everness:register_ore({ ore_type = 'scatter', ore = 'everness:mineral_stone_with_ceramic_sherds', wherein = 'everness:mineral_stone', @@ -79,7 +79,7 @@ minetest.register_ore({ -- placeholder node `everness:crystal_stone` will be replaced in VM -- -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:palm_trees', deco_type = 'simple', place_on = { 'everness:mineral_sand' }, @@ -98,7 +98,7 @@ minetest.register_decoration({ decoration = { 'everness:crystal_stone' }, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:pots', deco_type = 'simple', place_on = { 'everness:mineral_sand' }, @@ -123,7 +123,7 @@ minetest.register_decoration({ } }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:water_geyser', deco_type = 'simple', place_on = { 'everness:mineral_sand' }, @@ -145,7 +145,7 @@ minetest.register_decoration({ check_offset = 1, }) -minetest.register_decoration({ +Everness:register_decoration({ name = 'everness:rose_bush', deco_type = 'simple', place_on = { 'everness:mineral_sand' }, diff --git a/mapgen_mineral_waters_under.lua b/mapgen_mineral_waters_under.lua index 1ef1066..f2c7784 100644 --- a/mapgen_mineral_waters_under.lua +++ b/mapgen_mineral_waters_under.lua @@ -23,8 +23,8 @@ local y_min = Everness.settings.biomes.everness_mineral_waters_under.y_min -- Mineral Waters -minetest.register_biome({ - name = 'everness_mineral_waters_under', +Everness:register_biome({ + name = 'everness:mineral_waters_under', node_cave_liquid = 'air', node_dungeon = 'everness:mineral_stone_brick', node_dungeon_alt = 'everness:mineral_stone_brick_with_growth', @@ -43,7 +43,7 @@ minetest.register_biome({ -- Blob ore. -- These before scatter ores to avoid other ores in blobs. -minetest.register_ore({ +Everness:register_ore({ ore_type = 'blob', ore = 'everness:mineral_stone', wherein = { 'mapgen_stone' }, diff --git a/nodes.lua b/nodes.lua index 8094ceb..04e342b 100644 --- a/nodes.lua +++ b/nodes.lua @@ -2625,7 +2625,7 @@ Everness:register_node('everness:flame_permanent_blue', { -- Loot Chest / Icicle Markers Everness:register_node('everness:japanese_shrine_lootchest_marker', { - -- drawtype = 'airlike', + drawtype = 'airlike', description = 'Japanese Shrine Loot Chest Spawn Marker', tiles = { 'everness_lootchest_marker_top.png', 'everness_lootchest_marker_side.png' }, groups = { dig_immediate = 2, not_in_creative_inventory = 1 }, @@ -11127,19 +11127,20 @@ Everness:register_node('everness:tinted_glass_red', { _mcl_hardness = 0.3, }) -minetest.register_lbm({ - label = 'everness:bamboo', +Everness:register_lbm({ + label = 'Grows bamboo', name = 'everness:bamboo', - nodenames = 'group:bamboo', + nodenames = { 'group:bamboo' }, + run_at_every_load = false, action = function(pos, node) Everness:tick_bamboo_again(pos) end, }) -minetest.register_lbm({ - label = 'everness:sulfur_stone', +Everness:register_lbm({ + label = 'Makes cluouds from sulfur stone', name = 'everness:sulfur_stone', - nodenames = 'everness:sulfur_stone', + nodenames = { 'everness:sulfur_stone' }, run_at_every_load = true, action = function(pos, node) Everness:tick_sulfur_stone(pos) @@ -11865,7 +11866,7 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do end }) - minetest.register_craftitem('everness:ceramic_pot_sherd_' .. v, { + Everness:register_craftitem('everness:ceramic_pot_sherd_' .. v, { description = S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) .. ' ' .. S('Sherd'), inventory_image = 'everness_ceramic_pot_' .. v .. '_sherd.png', }) diff --git a/privileges.lua b/privileges.lua new file mode 100644 index 0000000..c31edbb --- /dev/null +++ b/privileges.lua @@ -0,0 +1,85 @@ +--[[ + Everness. Never ending discovery in Everness mapgen. + Copyright (C) 2024 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. + +--]] + +local function update_sfinv(name) + minetest.after(0, function() + local player = minetest.get_player_by_name(name) + + if player then + if sfinv.get_page(player) == 'everness:encyclopedia' then + sfinv.set_page(player, sfinv.get_homepage_name(player)) + else + sfinv.set_player_inventory_formspec(player) + end + end + end) +end + +local function update_ui(name) + minetest.after(0, function() + local player = minetest.get_player_by_name(name) + + if player then + if unified_inventory.current_page[name] == 'everness:encyclopedia' then + unified_inventory.current_page[name] = 'craft' + end + + unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[name]) + end + end) +end + +minetest.register_privilege('everness_encyclopedia', { + -- Privilege description + description = 'Collection of registered items and functions with some information about them. Used for testing not for gameplay. Works only with SFINV!', + + -- Whether to grant the privilege to singleplayer. + give_to_singleplayer = false, + + -- Whether to grant the privilege to the server admin. + -- Uses value of 'give_to_singleplayer' by default. + give_to_admin = false, + + -- Called when given to player 'name' by 'granter_name'. + -- 'granter_name' will be nil if the priv was granted by a mod. + on_grant = function(name, granter_name) + if minetest.get_modpath('sfinv') and sfinv.enabled then + update_sfinv(name) + elseif minetest.get_modpath('unified_inventory') then + update_ui(name) + else + minetest.chat_send_player(name, 'Compatible inventory not found. Everness encyclopedia will not be shown.') + end + end, + + -- Called when taken from player 'name' by 'revoker_name'. + -- 'revoker_name' will be nil if the priv was revoked by a mod. + + -- Note that the above two callbacks will be called twice if a player is + -- responsible, once with the player name, and then with a nil player + -- name. + -- Return true in the above callbacks to stop register_on_priv_grant or + -- revoke being called. + on_revoke = function(name, revoker_name) + if minetest.get_modpath('sfinv') and sfinv.enabled then + update_sfinv(name) + elseif minetest.get_modpath('unified_inventory') then + update_ui(name) + else + minetest.chat_send_player(name, 'Compatible inventory not found. Everness encyclopedia will not be shown.') + end + end, +}) diff --git a/textures/everness_logo.png b/textures/everness_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7a05183245ed77bf6ebe9f3c7a07ea95fe2855 GIT binary patch literal 453 zcmV;$0XqJPP)lkTktr1@y zbHRoaA@$3NzMhqW<6+L(CUF7ORHP~w8O^e?iWh-H86>$@^eH+Kz)`@RfoP;)uNgpN z!6FgEMi!ksK*y_B$Leioa&S2j%RbUX+zEJ+L&a{$X)mpi~G9G(@nf vDi{FO`B;`=x