From 38c905ad96105084eab673b5c0c2d4a8b7095bf8 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 24 Oct 2024 14:46:01 +0200 Subject: [PATCH] Luanti rename: builtin --- builtin/client/chatcommands.lua | 2 +- builtin/client/init.lua | 2 +- builtin/common/after.lua | 2 +- builtin/common/chatcommands.lua | 2 +- builtin/common/filterlist.lua | 2 +- builtin/common/item_s.lua | 2 +- builtin/common/metatable.lua | 4 ++-- builtin/common/misc_helpers.lua | 2 +- builtin/common/serialize.lua | 6 +++--- builtin/fstk/buttonbar.lua | 2 +- builtin/fstk/dialog.lua | 2 +- builtin/fstk/tabview.lua | 2 +- builtin/fstk/ui.lua | 2 +- builtin/game/async.lua | 2 +- builtin/game/auth.lua | 8 ++++---- builtin/game/chat.lua | 2 +- builtin/game/constants.lua | 2 +- builtin/game/deprecated.lua | 6 +++--- builtin/game/detached_inventory.lua | 2 +- builtin/game/falling.lua | 2 +- builtin/game/features.lua | 2 +- builtin/game/item.lua | 2 +- builtin/game/item_entity.lua | 2 +- builtin/game/misc.lua | 2 +- builtin/game/misc_s.lua | 2 +- builtin/game/privileges.lua | 2 +- builtin/game/register.lua | 2 +- builtin/game/static_spawn.lua | 2 +- builtin/game/tests/test_moveaction.lua | 4 ++-- builtin/init.lua | 2 +- builtin/mainmenu/common.lua | 2 +- builtin/mainmenu/content/contentdb.lua | 2 +- builtin/mainmenu/content/dlg_contentdb.lua | 6 +++--- builtin/mainmenu/content/dlg_install.lua | 2 +- builtin/mainmenu/content/dlg_overwrite.lua | 2 +- builtin/mainmenu/content/dlg_package.lua | 2 +- builtin/mainmenu/content/init.lua | 2 +- builtin/mainmenu/content/pkgmgr.lua | 4 ++-- builtin/mainmenu/content/screenshots.lua | 4 ++-- .../mainmenu/content/tests/pkgmgr_spec.lua | 2 +- builtin/mainmenu/content/update_detector.lua | 2 +- builtin/mainmenu/credits.json | 2 +- builtin/mainmenu/dlg_config_world.lua | 2 +- builtin/mainmenu/dlg_create_world.lua | 2 +- builtin/mainmenu/dlg_delete_content.lua | 2 +- builtin/mainmenu/dlg_delete_world.lua | 2 +- builtin/mainmenu/dlg_register.lua | 2 +- builtin/mainmenu/dlg_reinstall_mtg.lua | 10 +++++----- builtin/mainmenu/dlg_rename_modpack.lua | 2 +- builtin/mainmenu/dlg_version_info.lua | 2 +- builtin/mainmenu/game_theme.lua | 2 +- builtin/mainmenu/init.lua | 2 +- builtin/mainmenu/serverlistmgr.lua | 2 +- builtin/mainmenu/settings/components.lua | 2 +- .../settings/dlg_change_mapgen_flags.lua | 2 +- builtin/mainmenu/settings/dlg_settings.lua | 4 ++-- builtin/mainmenu/settings/init.lua | 2 +- builtin/mainmenu/settings/settingtypes.lua | 2 +- .../settings/shader_warning_component.lua | 2 +- .../mainmenu/settings/shadows_component.lua | 2 +- builtin/mainmenu/tab_about.lua | 4 ++-- builtin/mainmenu/tab_content.lua | 2 +- builtin/mainmenu/tab_local.lua | 6 +++--- builtin/mainmenu/tab_online.lua | 2 +- builtin/profiler/init.lua | 2 +- builtin/profiler/instrumentation.lua | 2 +- builtin/profiler/reporter.lua | 2 +- builtin/profiler/sampling.lua | 2 +- builtin/settingtypes.txt | 20 +++++++++---------- 69 files changed, 99 insertions(+), 99 deletions(-) diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua index a563a66276f74..6f69e034075b3 100644 --- a/builtin/client/chatcommands.lua +++ b/builtin/client/chatcommands.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/client/chatcommands.lua +-- Luanti: builtin/client/chatcommands.lua core.register_on_sending_chat_message(function(message) if message:sub(1,2) == ".." then diff --git a/builtin/client/init.lua b/builtin/client/init.lua index 8d01c99a4cc02..ae0394fbb3806 100644 --- a/builtin/client/init.lua +++ b/builtin/client/init.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/client/init.lua +-- Luanti: builtin/client/init.lua local scriptpath = core.get_builtin_path() local clientpath = scriptpath.."client"..DIR_DELIM local commonpath = scriptpath.."common"..DIR_DELIM diff --git a/builtin/common/after.lua b/builtin/common/after.lua index 321e5ac9d5def..c116f12007fe8 100644 --- a/builtin/common/after.lua +++ b/builtin/common/after.lua @@ -155,7 +155,7 @@ end function core.after(after, func, ...) assert(tonumber(after) and not core.is_nan(after) and type(func) == "function", - "Invalid minetest.after invocation") + "Invalid core.after invocation") local new_job = { mod_origin = core.get_last_run_mod(), diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua index 7a8a49558f466..238f37a64dccb 100644 --- a/builtin/common/chatcommands.lua +++ b/builtin/common/chatcommands.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/common/chatcommands.lua +-- Luanti: builtin/common/chatcommands.lua -- For server-side translations (if INIT == "game") -- Otherwise, use core.gettext diff --git a/builtin/common/filterlist.lua b/builtin/common/filterlist.lua index 092d19fbc7f32..c323a0d55c123 100644 --- a/builtin/common/filterlist.lua +++ b/builtin/common/filterlist.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/common/item_s.lua b/builtin/common/item_s.lua index 673c83877616b..1dc98837fd29b 100644 --- a/builtin/common/item_s.lua +++ b/builtin/common/item_s.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/item_s.lua +-- Luanti: builtin/item_s.lua -- The distinction of what goes here is a bit tricky, basically it's everything -- that does not (directly or indirectly) need access to ServerEnvironment, -- Server or writable access to IGameDef on the engine side. diff --git a/builtin/common/metatable.lua b/builtin/common/metatable.lua index 40003d2937383..debc4d3c5796a 100644 --- a/builtin/common/metatable.lua +++ b/builtin/common/metatable.lua @@ -11,8 +11,8 @@ end core.known_metatables = known_metatables function core.register_async_metatable(...) - core.log("deprecated", "minetest.register_async_metatable is deprecated. " .. - "Use minetest.register_portable_metatable instead.") + core.log("deprecated", "core.register_async_metatable is deprecated. " .. + "Use core.register_portable_metatable instead.") return core.register_portable_metatable(...) end diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index d0942b2d21a6b..f2e4bf085a92a 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/misc_helpers.lua +-- Luanti: builtin/misc_helpers.lua -------------------------------------------------------------------------------- -- Localize functions to avoid table lookups (better performance). diff --git a/builtin/common/serialize.lua b/builtin/common/serialize.lua index 2ee2e5f02fb5a..002ed0386c5c4 100644 --- a/builtin/common/serialize.lua +++ b/builtin/common/serialize.lua @@ -204,18 +204,18 @@ local function dummy_func() end function core.deserialize(str, safe) -- Backwards compatibility if str == nil then - core.log("deprecated", "minetest.deserialize called with nil (expected string).") + core.log("deprecated", "core.deserialize called with nil (expected string).") return nil, "Invalid type: Expected a string, got nil" end local t = type(str) if t ~= "string" then - error(("minetest.deserialize called with %s (expected string)."):format(t)) + error(("core.deserialize called with %s (expected string)."):format(t)) end local func, err = loadstring(str) if not func then return nil, err end - -- math.huge was serialized to inf and NaNs to nan by Lua in Minetest 5.6, so we have to support this here + -- math.huge was serialized to inf and NaNs to nan by Lua in version 5.6, so we have to support this here local env = {inf = math_huge, nan = 0/0} if safe then env.loadstring = dummy_func diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua index e53814751a57e..ed478af82d4c4 100644 --- a/builtin/fstk/buttonbar.lua +++ b/builtin/fstk/buttonbar.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier --Copyright (C) 2023 Gregor Parzefall -- diff --git a/builtin/fstk/dialog.lua b/builtin/fstk/dialog.lua index 991ec20aba6ef..7043646a4a9ce 100644 --- a/builtin/fstk/dialog.lua +++ b/builtin/fstk/dialog.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index 42fc9ac186173..c88c4917abf7f 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua index a3a8fed77fa89..b5b95d0e4889a 100644 --- a/builtin/fstk/ui.lua +++ b/builtin/fstk/ui.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/game/async.lua b/builtin/game/async.lua index 469f179d73eaf..fc286ef254f8f 100644 --- a/builtin/game/async.lua +++ b/builtin/game/async.lua @@ -10,7 +10,7 @@ end function core.handle_async(func, callback, ...) assert(type(func) == "function" and type(callback) == "function", - "Invalid minetest.handle_async invocation") + "Invalid core.handle_async invocation") local args = {n = select("#", ...), ...} local mod_origin = core.get_last_run_mod() diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua index e45520e276612..373d1e2299175 100644 --- a/builtin/game/auth.lua +++ b/builtin/game/auth.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/auth.lua +-- Luanti: builtin/auth.lua -- -- Builtin authentication handler @@ -95,11 +95,11 @@ core.builtin_auth_handler = { for priv, value in pairs(privileges) do -- Warnings for improper API usage if value == false then - core.log('deprecated', "`false` value given to `minetest.set_player_privs`, ".. + core.log('deprecated', "`false` value given to `core.set_player_privs`, ".. "this is almost certainly a bug, ".. "granting a privilege rather than revoking it") elseif value ~= true then - core.log('deprecated', "non-`true` value given to `minetest.set_player_privs`") + core.log('deprecated', "non-`true` value given to `core.set_player_privs`") end -- Run grant callbacks if prev_privs[priv] == nil then @@ -196,7 +196,7 @@ function core.change_player_privs(name, changes) elseif change == false then privs[priv] = nil else - error("non-bool value given to `minetest.change_player_privs`") + error("non-bool value given to `core.change_player_privs`") end end core.set_player_privs(name, privs) diff --git a/builtin/game/chat.lua b/builtin/game/chat.lua index b7e2aea501426..894a5a3ad0422 100644 --- a/builtin/game/chat.lua +++ b/builtin/game/chat.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/game/chat.lua +-- Luanti: builtin/game/chat.lua local S = core.get_translator("__builtin") diff --git a/builtin/game/constants.lua b/builtin/game/constants.lua index 54eeea50f8711..245eefb4c8ade 100644 --- a/builtin/game/constants.lua +++ b/builtin/game/constants.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/constants.lua +-- Luanti: builtin/constants.lua -- -- Constants values for use with the Lua API diff --git a/builtin/game/deprecated.lua b/builtin/game/deprecated.lua index c5c7848f5edd5..d32f8f344e8b1 100644 --- a/builtin/game/deprecated.lua +++ b/builtin/game/deprecated.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/deprecated.lua +-- Luanti: builtin/deprecated.lua -- -- EnvRef @@ -35,9 +35,9 @@ local settings = core.settings local function setting_proxy(name) return function(...) - core.log("deprecated", "WARNING: minetest.setting_* ".. + core.log("deprecated", "WARNING: core.setting_* ".. "functions are deprecated. ".. - "Use methods on the minetest.settings object.") + "Use methods on the core.settings object.") return settings[name](settings, ...) end end diff --git a/builtin/game/detached_inventory.lua b/builtin/game/detached_inventory.lua index 8eed003916d1e..c4b7e790ae668 100644 --- a/builtin/game/detached_inventory.lua +++ b/builtin/game/detached_inventory.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/detached_inventory.lua +-- Luanti: builtin/detached_inventory.lua core.detached_inventories = {} diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index 33473091d7f1a..1062eabdd67cf 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/item.lua +-- Luanti: builtin/item.lua local builtin_shared = ... local SCALE = 0.667 diff --git a/builtin/game/features.lua b/builtin/game/features.lua index 10884497c2381..3e3da9720cf83 100644 --- a/builtin/game/features.lua +++ b/builtin/game/features.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/features.lua +-- Luanti: builtin/features.lua core.features = { glasslike_framed = true, diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 8b79d2d7139f6..6d574c7c4d863 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/item.lua +-- Luanti: builtin/item.lua local builtin_shared = ... diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua index b7b291c435d1c..2adba0d59d0dd 100644 --- a/builtin/game/item_entity.lua +++ b/builtin/game/item_entity.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/item_entity.lua +-- Luanti: builtin/item_entity.lua function core.spawn_item(pos, item) -- Take item in any format diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index 25e19ddb000fe..f33907109d63c 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/misc.lua +-- Luanti: builtin/misc.lua local S = core.get_translator("__builtin") diff --git a/builtin/game/misc_s.lua b/builtin/game/misc_s.lua index 440e52d81492b..980717f78cb4d 100644 --- a/builtin/game/misc_s.lua +++ b/builtin/game/misc_s.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/misc_s.lua +-- Luanti: builtin/misc_s.lua -- The distinction of what goes here is a bit tricky, basically it's everything -- that does not (directly or indirectly) need access to ServerEnvironment, -- Server or writable access to IGameDef on the engine side. diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua index 2ff4c093cdcc0..e7d6aee50ea31 100644 --- a/builtin/game/privileges.lua +++ b/builtin/game/privileges.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/privileges.lua +-- Luanti: builtin/privileges.lua local S = core.get_translator("__builtin") diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 3d99a69257768..2612b3a95fcf7 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/register.lua +-- Luanti: builtin/register.lua local builtin_shared = ... local S = core.get_translator("__builtin") diff --git a/builtin/game/static_spawn.lua b/builtin/game/static_spawn.lua index fae23eab0726a..28e677690d76c 100644 --- a/builtin/game/static_spawn.lua +++ b/builtin/game/static_spawn.lua @@ -1,4 +1,4 @@ --- Minetest: builtin/static_spawn.lua +-- Luanti: builtin/static_spawn.lua local static_spawnpoint_string = core.settings:get("static_spawnpoint") if static_spawnpoint_string and diff --git a/builtin/game/tests/test_moveaction.lua b/builtin/game/tests/test_moveaction.lua index 4765793489917..a3cbc021f2d72 100644 --- a/builtin/game/tests/test_moveaction.lua +++ b/builtin/game/tests/test_moveaction.lua @@ -35,7 +35,7 @@ end local log = function(...) end --local log = print -minetest.register_allow_player_inventory_action(function(_, action, inv, info) +core.register_allow_player_inventory_action(function(_, action, inv, info) log("\tallow " .. action, info.count or info.stack:to_string()) if action == "move" then @@ -69,7 +69,7 @@ minetest.register_allow_player_inventory_action(function(_, action, inv, info) return -- Unlimited end) -minetest.register_on_player_inventory_action(function(_, action, inv, info) +core.register_on_player_inventory_action(function(_, action, inv, info) log("\ton " .. action, info.count or info.stack:to_string()) if action == "take" or action == "put" then diff --git a/builtin/init.lua b/builtin/init.lua index 415087a54c17b..83e8a1df0855a 100644 --- a/builtin/init.lua +++ b/builtin/init.lua @@ -1,5 +1,5 @@ -- --- This file contains built-in stuff in Minetest implemented in Lua. +-- This file contains built-in stuff in Luanti implemented in Lua. -- -- It is always loaded and executed after registration of the C API, -- before loading and running any mods. diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 16c5c9d957c5e..d9edd745b1d3b 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/contentdb.lua b/builtin/mainmenu/content/contentdb.lua index 5d6d6c48285c5..1c09ac9c4b3a8 100644 --- a/builtin/mainmenu/content/contentdb.lua +++ b/builtin/mainmenu/content/contentdb.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2018-24 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/dlg_contentdb.lua b/builtin/mainmenu/content/dlg_contentdb.lua index 8f232e4908d54..c05bb804a957a 100644 --- a/builtin/mainmenu/content/dlg_contentdb.lua +++ b/builtin/mainmenu/content/dlg_contentdb.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2018-20 rubenwardy -- --This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ if not core.get_http_api then function create_contentdb_dlg() return messagebox("contentdb", - fgettext("ContentDB is not available when Minetest was compiled without cURL")) + fgettext("ContentDB is not available when Luanti was compiled without cURL")) end return end @@ -487,7 +487,7 @@ end local function handle_events(event) if event == "DialogShow" then - -- Don't show the "MINETEST" header behind the dialog. + -- Don't show the header image behind the dialog. mm_game_theme.set_engine(true) -- If ContentDB is already loaded, auto-install packages here. diff --git a/builtin/mainmenu/content/dlg_install.lua b/builtin/mainmenu/content/dlg_install.lua index 3f43bd23cbb7f..ef201f56a1c7b 100644 --- a/builtin/mainmenu/content/dlg_install.lua +++ b/builtin/mainmenu/content/dlg_install.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2018-24 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/dlg_overwrite.lua b/builtin/mainmenu/content/dlg_overwrite.lua index 7967cb48ce1b2..5baaa5cd2e25f 100644 --- a/builtin/mainmenu/content/dlg_overwrite.lua +++ b/builtin/mainmenu/content/dlg_overwrite.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2018-24 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/dlg_package.lua b/builtin/mainmenu/content/dlg_package.lua index 404e950c4a8d7..4eb46523636d2 100644 --- a/builtin/mainmenu/content/dlg_package.lua +++ b/builtin/mainmenu/content/dlg_package.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2018-24 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/init.lua b/builtin/mainmenu/content/init.lua index 00eac681b2646..dbf4cc888ad3f 100644 --- a/builtin/mainmenu/content/init.lua +++ b/builtin/mainmenu/content/init.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2023 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/pkgmgr.lua b/builtin/mainmenu/content/pkgmgr.lua index 5a4aa6c174511..986d80398acf9 100644 --- a/builtin/mainmenu/content/pkgmgr.lua +++ b/builtin/mainmenu/content/pkgmgr.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify @@ -840,7 +840,7 @@ function pkgmgr.get_contentdb_id(content) return content.author:lower() .. "/" .. content.name end - -- Until Minetest 5.8.0, Minetest Game was bundled with Minetest. + -- Until version 5.8.0, Minetest Game was bundled with the engine. -- Unfortunately, the bundled MTG was not versioned (missing "release" -- field in game.conf). -- Therefore, we consider any installation of MTG that is not versioned, diff --git a/builtin/mainmenu/content/screenshots.lua b/builtin/mainmenu/content/screenshots.lua index 161f33104f550..7186660852bf9 100644 --- a/builtin/mainmenu/content/screenshots.lua +++ b/builtin/mainmenu/content/screenshots.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2023-24 rubenwardy -- --This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ function get_screenshot(package, screenshot_url, level) return defaulttexturedir .. "no_screenshot.png" end - -- Minetest only supports png and jpg + -- Luanti only supports png and jpg local ext = get_file_extension(screenshot_url) if ext ~= "png" and ext ~= "jpg" then screenshot_url = screenshot_url:sub(0, -#ext - 1) .. "png" diff --git a/builtin/mainmenu/content/tests/pkgmgr_spec.lua b/builtin/mainmenu/content/tests/pkgmgr_spec.lua index ccadde38c1efa..8870bb68f5296 100644 --- a/builtin/mainmenu/content/tests/pkgmgr_spec.lua +++ b/builtin/mainmenu/content/tests/pkgmgr_spec.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2022 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/content/update_detector.lua b/builtin/mainmenu/content/update_detector.lua index 1f8672bbac323..4d0c1196b6f53 100644 --- a/builtin/mainmenu/content/update_detector.lua +++ b/builtin/mainmenu/content/update_detector.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2023 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/credits.json b/builtin/mainmenu/credits.json index 261cf5407981e..18fd7b8ca0680 100644 --- a/builtin/mainmenu/credits.json +++ b/builtin/mainmenu/credits.json @@ -64,7 +64,7 @@ "superfloh247" ], "previous_contributors": [ - "Nils Dagsson Moskopp (erlehmann) [Minetest logo]", + "Nils Dagsson Moskopp (erlehmann) [Luanti logo]", "red-001 ", "Giuseppe Bilotta", "HybridDog", diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua index a8c5221dea512..cb5cdd635cd83 100644 --- a/builtin/mainmenu/dlg_config_world.lua +++ b/builtin/mainmenu/dlg_config_world.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 772025a254f3e..4844c85fe647f 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_delete_content.lua b/builtin/mainmenu/dlg_delete_content.lua index 98e15bf01e1c3..a36bcb2d715d1 100644 --- a/builtin/mainmenu/dlg_delete_content.lua +++ b/builtin/mainmenu/dlg_delete_content.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua index 67c0612bdac65..531b4927d555e 100644 --- a/builtin/mainmenu/dlg_delete_world.lua +++ b/builtin/mainmenu/dlg_delete_world.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_register.lua b/builtin/mainmenu/dlg_register.lua index a7658249c7860..88a449ae3dc90 100644 --- a/builtin/mainmenu/dlg_register.lua +++ b/builtin/mainmenu/dlg_register.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2022 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_reinstall_mtg.lua b/builtin/mainmenu/dlg_reinstall_mtg.lua index 6858470240243..85bdedf7b74ef 100644 --- a/builtin/mainmenu/dlg_reinstall_mtg.lua +++ b/builtin/mainmenu/dlg_reinstall_mtg.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2023 Gregor Parzefall -- --This program is free software; you can redistribute it and/or modify @@ -68,15 +68,15 @@ end local function get_formspec(dialogdata) local markup = table.concat({ "", fgettext("Minetest Game is no longer installed by default"), "\n", - fgettext("For a long time, the Minetest engine shipped with a default game called \"Minetest Game\". " .. - "Since Minetest 5.8.0, Minetest ships without a default game."), "\n", + fgettext("For a long time, Luanti shipped with a default game called \"Minetest Game\". " .. + "Since version 5.8.0, Luanti ships without a default game."), "\n", fgettext("If you want to continue playing in your Minetest Game worlds, you need to reinstall Minetest Game."), }) return table.concat({ "formspec_version[6]", "size[12.8,7]", - "hypertext[0.375,0.375;12.05,5.2;text;", minetest.formspec_escape(markup), "]", + "hypertext[0.375,0.375;12.05,5.2;text;", core.formspec_escape(markup), "]", "container[0.375,5.825]", "style[dismiss;bgcolor=red]", "button[0,0;4,0.8;dismiss;", fgettext("Dismiss"), "]", @@ -114,7 +114,7 @@ local function eventhandler(event) return true elseif event == "MenuQuit" then -- Don't allow closing the dialog with ESC, but still allow exiting - -- Minetest. + -- Luanti core.close() return true end diff --git a/builtin/mainmenu/dlg_rename_modpack.lua b/builtin/mainmenu/dlg_rename_modpack.lua index 884140eb3da29..09df92d2578fa 100644 --- a/builtin/mainmenu/dlg_rename_modpack.lua +++ b/builtin/mainmenu/dlg_rename_modpack.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/dlg_version_info.lua b/builtin/mainmenu/dlg_version_info.lua index 483cd30bd100b..b3b7481e3cde8 100644 --- a/builtin/mainmenu/dlg_version_info.lua +++ b/builtin/mainmenu/dlg_version_info.lua @@ -1,5 +1,5 @@ --[[ -Minetest +Luanti Copyright (C) 2018-2020 SmallJoker, 2022 rubenwardy This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/game_theme.lua b/builtin/mainmenu/game_theme.lua index 993a48c1e6234..7c64081577a87 100644 --- a/builtin/mainmenu/game_theme.lua +++ b/builtin/mainmenu/game_theme.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index dd35334c2d1af..fc237e1584f27 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua index 601b42110039d..1b69d7a5551fb 100644 --- a/builtin/mainmenu/serverlistmgr.lua +++ b/builtin/mainmenu/serverlistmgr.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2020 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/settings/components.lua b/builtin/mainmenu/settings/components.lua index 79253558b2b00..64cd27c3cbe6b 100644 --- a/builtin/mainmenu/settings/components.lua +++ b/builtin/mainmenu/settings/components.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2022 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua b/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua index 570d184da63d2..31dd40bd8e81c 100644 --- a/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua +++ b/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2015 PilzAdam -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/settings/dlg_settings.lua b/builtin/mainmenu/settings/dlg_settings.lua index 602d6894fc37e..57e5a1300e432 100644 --- a/builtin/mainmenu/settings/dlg_settings.lua +++ b/builtin/mainmenu/settings/dlg_settings.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2022 rubenwardy -- --This program is free software; you can redistribute it and/or modify @@ -743,7 +743,7 @@ end local function eventhandler(event) if event == "DialogShow" then - -- Don't show the "MINETEST" header behind the dialog. + -- Don't show the header image behind the dialog. mm_game_theme.set_engine(true) return true end diff --git a/builtin/mainmenu/settings/init.lua b/builtin/mainmenu/settings/init.lua index 4541468c1d9cc..c8615ba344409 100644 --- a/builtin/mainmenu/settings/init.lua +++ b/builtin/mainmenu/settings/init.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2022 rubenwardy -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/settings/settingtypes.lua b/builtin/mainmenu/settings/settingtypes.lua index eacd96d093865..e763535a903cf 100644 --- a/builtin/mainmenu/settings/settingtypes.lua +++ b/builtin/mainmenu/settings/settingtypes.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2015 PilzAdam -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/mainmenu/settings/shader_warning_component.lua b/builtin/mainmenu/settings/shader_warning_component.lua index d1de0cd4a9d9c..b227bcee34a73 100644 --- a/builtin/mainmenu/settings/shader_warning_component.lua +++ b/builtin/mainmenu/settings/shader_warning_component.lua @@ -1,4 +1,4 @@ --- Minetest +-- Luanti -- SPDX-License-Identifier: LGPL-2.1-or-later return { diff --git a/builtin/mainmenu/settings/shadows_component.lua b/builtin/mainmenu/settings/shadows_component.lua index 93c071bf78e5a..2ca03b71b63fa 100644 --- a/builtin/mainmenu/settings/shadows_component.lua +++ b/builtin/mainmenu/settings/shadows_component.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2021-2 x2048 --Copyright (C) 2022-3 rubenwardy -- diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua index ab3edbddceb02..f10680731a633 100644 --- a/builtin/mainmenu/tab_about.lua +++ b/builtin/mainmenu/tab_about.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify @@ -79,7 +79,7 @@ return { "button[0.1,3.4;5.3,0.5;label_button;" .. core.formspec_escape(version.project .. " " .. version.string) .. "]" .. "button_url[1.5,4.1;2.5,0.8;homepage;minetest.net;https://www.minetest.net/]" .. - "hypertext[5.5,0.25;9.75,6.6;credits;" .. minetest.formspec_escape(hypertext) .. "]" + "hypertext[5.5,0.25;9.75,6.6;credits;" .. core.formspec_escape(hypertext) .. "]" -- Render information local active_renderer_info = fgettext("Active renderer:") .. " " .. diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua index 9cfb96d54ec40..cd384c9055c6a 100644 --- a/builtin/mainmenu/tab_content.lua +++ b/builtin/mainmenu/tab_content.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier --Copyright (C) 2018 rubenwardy -- diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 8d807cc79b550..083f9a50a11ca 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify @@ -166,8 +166,8 @@ local function get_formspec(tabview, name, tabdata) local H = tabview.height local hypertext = "" .. - fgettext_ne("Minetest is a game-creation platform that allows you to play many different games.") .. "\n" .. - fgettext_ne("Minetest doesn't come with a game by default.") .. " " .. + fgettext_ne("Luanti is a game-creation platform that allows you to play many different games.") .. "\n" .. + fgettext_ne("Luanti doesn't come with a game by default.") .. " " .. fgettext_ne("You need to install a game before you can create a world.") local button_y = H * 2/3 - 0.6 diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index d93f45dcff3bd..8674d908a3642 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2014 sapier -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/profiler/init.lua b/builtin/profiler/init.lua index 7f63dfaead350..f5b4b7c7ecc6a 100644 --- a/builtin/profiler/init.lua +++ b/builtin/profiler/init.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2016 T4im -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/profiler/instrumentation.lua b/builtin/profiler/instrumentation.lua index c4feda7b4f0a5..e012f07a0ea0c 100644 --- a/builtin/profiler/instrumentation.lua +++ b/builtin/profiler/instrumentation.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2016 T4im -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/profiler/reporter.lua b/builtin/profiler/reporter.lua index 2e24a1fe0927e..7bc1b235ddc05 100644 --- a/builtin/profiler/reporter.lua +++ b/builtin/profiler/reporter.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2016 T4im -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/profiler/sampling.lua b/builtin/profiler/sampling.lua index 4b53399a5da1f..16d6c201255b6 100644 --- a/builtin/profiler/sampling.lua +++ b/builtin/profiler/sampling.lua @@ -1,4 +1,4 @@ ---Minetest +--Luanti --Copyright (C) 2016 T4im -- --This program is free software; you can redistribute it and/or modify diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 99bfe9ca90453..12b9b711eca38 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -199,7 +199,7 @@ virtual_joystick_triggers_aux1 (Virtual joystick triggers Aux1 button) bool fals # Easy to use and well-known from other games that shall not be named. # # * long_tap -# Known from the classic Minetest mobile controls. +# Known from the classic Luanti mobile controls. # Combat is more or less impossible. # # Requires: touchscreen @@ -764,7 +764,7 @@ chat_font_size (Chat font size) int 0 0 72 # The URL for the content repository contentdb_url (ContentDB URL) string https://content.minetest.net -# If enabled and you have ContentDB packages installed, Minetest may contact ContentDB to +# If enabled and you have ContentDB packages installed, Luanti may contact ContentDB to # check for package updates when opening the mainmenu. contentdb_enable_updates_indicator (Enable updates available indicator on content tab) bool true @@ -772,7 +772,7 @@ contentdb_enable_updates_indicator (Enable updates available indicator on conten # "nonfree" can be used to hide packages which do not qualify as 'free software', # as defined by the Free Software Foundation. # You can also specify content ratings. -# These flags are independent from Minetest versions, +# These flags are independent from Luanti versions, # so see a full list at https://content.minetest.net/help/content_flags/ contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default @@ -795,7 +795,7 @@ serverlist_url (Serverlist URL) string servers.minetest.net # If disabled, new accounts will be registered automatically when logging in. enable_split_login_register (Enable split login/register) bool true -# URL to JSON file which provides information about the newest Minetest release. +# URL to JSON file which provides information about the newest Luanti release. # If this is empty the engine will never check for updates. update_information_url (Update information URL) string https://www.minetest.net/release_info.json @@ -809,7 +809,7 @@ name (Admin name) string [**Serverlist and MOTD] # Name of the server, to be displayed when players join and in the serverlist. -server_name (Server name) string Minetest server +server_name (Server name) string Luanti server # Description of server, to be displayed when players join and in the serverlist. server_description (Server description) string mine here @@ -856,7 +856,7 @@ strict_protocol_version_checking (Strict protocol checking) bool false # Older clients are compatible in the sense that they will not crash when connecting # to new servers, but they may not support all new features that you are expecting. # This allows for more fine-grained control than strict_protocol_version_checking. -# Minetest still enforces its own internal minimum, and enabling +# Luanti still enforces its own internal minimum, and enabling # strict_protocol_version_checking will effectively override this. protocol_version_min (Protocol version minimum) int 1 1 65535 @@ -1805,7 +1805,7 @@ instrument.lbm (Loading Block Modifiers) bool true instrument.chatcommand (Chat commands) bool true # Instrument global callback functions on registration. -# (anything you pass to a minetest.register_*() function) +# (anything you pass to a core.register_*() function) instrument.global_callback (Global callbacks) bool true # Instrument builtin. @@ -1873,7 +1873,7 @@ enable_mesh_cache (Mesh cache) bool false mesh_generation_interval (Mapblock mesh generation delay) int 0 0 50 # Number of threads to use for mesh generation. -# Value of 0 (default) will let Minetest autodetect the number of available threads. +# Value of 0 (default) will let Luanti autodetect the number of available threads. mesh_generation_threads (Mapblock mesh generation threads) int 0 0 8 # True = 256 @@ -2007,7 +2007,7 @@ lighting_boost_spread (Light curve boost spread) float 0.2 0.0 0.4 [**Networking] # Prometheus listener address. -# If Minetest is compiled with ENABLE_PROMETHEUS option enabled, +# If Luanti is compiled with ENABLE_PROMETHEUS option enabled, # enable metrics listener for Prometheus on that address. # Metrics can be fetched on http://127.0.0.1:30000/metrics prometheus_listener_address (Prometheus listener address) string 127.0.0.1:30000 @@ -2212,7 +2212,7 @@ curl_file_download_timeout (cURL file download timeout) int 300000 5000 21474836 # Adjust the detected display density, used for scaling UI elements. display_density_factor (Display Density Scaling Factor) float 1 0.5 5.0 -# Windows systems only: Start Minetest with the command line window in the background. +# Windows systems only: Start Luanti with the command line window in the background. # Contains the same information as the file debug.txt (default name). enable_console (Enable console window) bool false