From fd2a96dd2de28b2e16357cc6448554dcc5491b42 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 25 Oct 2024 13:46:47 +0200 Subject: [PATCH] Rename Minetest to Luanti --- CREDITS.md | 2 +- README.md | 6 +++--- menu/README.md | 2 +- minetest.conf | 2 +- mods/lzr_check_movement_settings/init.lua | 8 ++++---- mods/lzr_check_world_backend/init.lua | 4 ++-- mods/lzr_damage/init.lua | 4 ++-- mods/lzr_getitem/README.md | 2 +- mods/lzr_hook/init.lua | 4 ++-- mods/lzr_laser/elements.lua | 2 +- mods/lzr_mapgen/mapgen.lua | 4 ++-- mods/lzr_node_drops/init.lua | 2 +- mods/lzr_sky/init.lua | 2 +- mods/lzr_stairs/README.txt | 2 +- mods/lzr_stairs/init.lua | 2 +- mods/player_api/README.txt | 2 +- mods/player_api/api.lua | 2 +- mods/player_api/license.txt | 2 +- mods/playerphysics/README.md | 4 ++-- mods/show_wielded_item/README.md | 2 +- mods/show_wielded_item/init.lua | 8 ++++---- 21 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 317b19a9..bb4c6741 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -86,7 +86,7 @@ The music tracks are included under `mods/lzr_ambience/sounds`. The name to the left is the file name as used in Lazarr! The name in brackets is the original file name. If neccessary, music files have been transcoded to Ogg Vorbis -so they work in Minetest. +so they work in Luanti. - `lzr_ambience_leopaz_exploring_the_ocean.ogg` (`01_exploring_the_ocean.wav`), `lzr_ambience_leopaz_seaside_village.ogg` (`02_seaside_village.wav`), diff --git a/README.md b/README.md index 2ee3c73a..aad19b8b 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ operations. Use the book in front of you to select the first level. The spinning information blocks will guide you through the levels. ## Installing -You need Minetest version 5.9.0 (or later) to play this. -Download Minetest from . +You need Luanti version 5.9.0 (or later) to play this. +Download Luanti from . -Refer to Minetest documentation to learn how to install a game in Minetest. +Refer to Luanti documentation to learn how to install a game in Luanti. Once installed, create a world and start. The world contains your game's progress and custom levels. diff --git a/menu/README.md b/menu/README.md index b0d8a545..fca10604 100644 --- a/menu/README.md +++ b/menu/README.md @@ -21,7 +21,7 @@ Maybe this image should be vectorized for higher quality. ## `header_es.png` Spanish version of `header.png`. This is currently unused by the game because -translated menu images are not (yet) supported in Minetest (as of 5.9.0). +translated menu images are not (yet) supported in Luanti (as of 5.9.1). ## `*.xcf` files diff --git a/minetest.conf b/minetest.conf index 5860e678..16f87ffc 100644 --- a/minetest.conf +++ b/minetest.conf @@ -2,7 +2,7 @@ # IMPORTANT: These settings MUST be equal to the values # specified in mods/lzr_check_movement_settings/init.lua. # These values are currently identical to the default -# settings as of Minetest 5.9.1, but they are explicitly +# settings as of Luanti 5.9.1, but they are explicitly # repeated here for reference. The precise values matter # to guarantee the levels still work as originally designed. # These values should NOT be changed lightly! Doing so diff --git a/mods/lzr_check_movement_settings/init.lua b/mods/lzr_check_movement_settings/init.lua index 5e766f5b..4d7074da 100644 --- a/mods/lzr_check_movement_settings/init.lua +++ b/mods/lzr_check_movement_settings/init.lua @@ -1,7 +1,7 @@ --[[ This mod is basically a compromise solution for a long-known bug. -It checks if Minetest is running with the recommended +It checks if Luanti is running with the recommended player movement settings. If the player has set any of the relevant movement settings to a non-default value, that will take preference over the game settings, which will break @@ -17,7 +17,7 @@ to realize otherwise they're playing Lazarr! with the "wrong" physics.) The player is then given a choice to either return to -Minetest and fix the problem or to ignore it and +Luanti and fix the problem or to ignore it and continue playing. Both a dialog message and a chat message will be displayed. @@ -72,13 +72,13 @@ lzr_check_movement_settings.register_on_dismiss_warning = function(callback) end local STR_WARNING_1 = S("WARNING: The player movement settings are not at the recommended values for Lazarr! The physics might not work as intended!") -local STR_WARNING_2 = S("Please exit the game and reset the following Minetest settings to their default value:") +local STR_WARNING_2 = S("Please exit the game and reset the following Luanti settings to their default value:") -- concatenate invalid settings with list separator (comma) local STR_INVALID_SETTINGS = table.concat(invalid_settings, S(", ")) local disconnect = function(player) minetest.log("action", "[lzr_check_movement_settings] "..player:get_player_name().." chose to leave the game") - minetest.disconnect_player(player:get_player_name(), S("You quit. Remember, Lazarr! expects the following Minetest settings to be reset to the default value: @1", STR_INVALID_SETTINGS)) + minetest.disconnect_player(player:get_player_name(), S("You quit. Remember, Lazarr! expects the following Luanti settings to be reset to the default value: @1", STR_INVALID_SETTINGS)) end local show_dialog = function(player_name) diff --git a/mods/lzr_check_world_backend/init.lua b/mods/lzr_check_world_backend/init.lua index e1895f02..4ee5f35b 100644 --- a/mods/lzr_check_world_backend/init.lua +++ b/mods/lzr_check_world_backend/init.lua @@ -11,7 +11,7 @@ -- Lazarr! version 1.4.0 and previously used a persistent map. -- Later versions switched to a transient map via game.conf. --- But Minetest won't automatically transform old maps from +-- But Luanti won't automatically transform old maps from -- persistent to transient on a game update; this is why manual -- intervention is neccessary. @@ -19,7 +19,7 @@ local S = minetest.get_translator("lzr_check_world_backend") local FS = function(...) return minetest.formspec_escape(S(...)) end -- We manually parse the world.mt file because apparently, --- Minetest does not allow us to access this information +-- Luanti does not allow us to access this information -- in another local function get_world_backend() local worldfile = io.open(minetest.get_worldpath().."/world.mt", "r") diff --git a/mods/lzr_damage/init.lua b/mods/lzr_damage/init.lua index 4207649a..0628abde 100644 --- a/mods/lzr_damage/init.lua +++ b/mods/lzr_damage/init.lua @@ -1,6 +1,6 @@ --[[ Damage mod. This mod introduces a custom "damage" mechanic for players. -It is completely separate from Minetest's built-in health system, +It is completely separate from Luanti's built-in health system, which is ignored in this game. Players can have 0 to lzr_damage.MAX_DAMAGE. Damage in this mod is @@ -18,7 +18,7 @@ Damage is mostly useful as an effect to simulate the player being lzr_damage = {} -- Note this game does NOT use regular damage and health, as defined --- by Minetest, it's disabled. The "damage" here applies only to this mod! +-- by Luanti, it's disabled. The "damage" here applies only to this mod! lzr_damage.MAX_DAMAGE = 4 -- Reduce damage when player didn't take damage every HEAL_TIME diff --git a/mods/lzr_getitem/README.md b/mods/lzr_getitem/README.md index 71f10a5f..7d4a3687 100644 --- a/mods/lzr_getitem/README.md +++ b/mods/lzr_getitem/README.md @@ -1,6 +1,6 @@ ## Get Item for Lazarr! -This Minetest mod allows the player to get easy access to +This Luanti mod allows the player to get easy access to items in the game for the level editor or when the player has the 'give' privilege. diff --git a/mods/lzr_hook/init.lua b/mods/lzr_hook/init.lua index f086cd09..1f949cc2 100644 --- a/mods/lzr_hook/init.lua +++ b/mods/lzr_hook/init.lua @@ -1,7 +1,7 @@ local S = minetest.get_translator("lzr_hook") if not minetest.raycast then - minetest.log("error", "lzr_hook requires Minetest version 5.0 or newer") + minetest.log("error", "lzr_hook requires Luanti version 5.0 or newer") return end @@ -79,7 +79,7 @@ local rotate = { local facedir = param2 % 32 for _, cycle in ipairs(facedir_cycles[axis]) do -- Find the current facedir - -- Minetest adds table.indexof, but I refuse to use it because it returns -1 rather than nil + -- Luanti adds table.indexof, but I refuse to use it because it returns -1 rather than nil for i, fd in ipairs(cycle) do if fd == facedir then return param2 - facedir + cycle[1+(i-1 + amount) % 4] -- If only Lua didn't use 1 indexing... diff --git a/mods/lzr_laser/elements.lua b/mods/lzr_laser/elements.lua index 19468c7d..370fc055 100644 --- a/mods/lzr_laser/elements.lua +++ b/mods/lzr_laser/elements.lua @@ -109,7 +109,7 @@ Parameters: * basename: Itemstring identifier of the base node May be preceded by a color to force a node name, as handled by minetest.register_node -* def: Definition table to define the node. All fields of the Minetest node definition can be applied here, +* def: Definition table to define the node. All fields of the Luanti node definition can be applied here, but note that some fields will be overwritten. To use after_dig_node, you must specify it as __after_dig_node. To use after_place_node, you must specify it as __after_place_node. diff --git a/mods/lzr_mapgen/mapgen.lua b/mods/lzr_mapgen/mapgen.lua index 86450e58..5f16802c 100644 --- a/mods/lzr_mapgen/mapgen.lua +++ b/mods/lzr_mapgen/mapgen.lua @@ -1,12 +1,12 @@ -- The main mapgen code. --[[ THIS FILE WILL BE RUN TWICE! -1) In the global Minetest environment, +1) In the global Luanti environment, 2) In the heavily-restricted threaded mapgen environment This means this file is very restricted and only has access to functions that are available in both the -global and the mapgen environment. Refer to Minetest's +global and the mapgen environment. Refer to Luanti's Lua API documentation for details. In the global environment, this file runs to expose the diff --git a/mods/lzr_node_drops/init.lua b/mods/lzr_node_drops/init.lua index 229efb55..46435361 100644 --- a/mods/lzr_node_drops/init.lua +++ b/mods/lzr_node_drops/init.lua @@ -1,4 +1,4 @@ --- Override Minetest's default node dropping handling. +-- Override Luanti's default node dropping handling. -- Node drops are added to digger's inventory, -- but they will NOT spawn item entities if the inventory is full or non-existing. minetest.handle_node_drops = function(pos, drops, digger) diff --git a/mods/lzr_sky/init.lua b/mods/lzr_sky/init.lua index f7af8218..f57b567d 100644 --- a/mods/lzr_sky/init.lua +++ b/mods/lzr_sky/init.lua @@ -190,7 +190,7 @@ end -- but this solution was determined to be the "next best" one -- without too much disruption. -- TODO: Halt the day-night cycle entirely without hacks as soon --- Minetest allows us to do so. +-- Luanti allows us to do so. local timer = TIMEOFDAY_RESET_TIME minetest.register_globalstep(function(dtime) timer = timer + dtime diff --git a/mods/lzr_stairs/README.txt b/mods/lzr_stairs/README.txt index 79fd21c4..5239deab 100644 --- a/mods/lzr_stairs/README.txt +++ b/mods/lzr_stairs/README.txt @@ -16,6 +16,6 @@ Authors of source code ---------------------- Originally by Kahrl (LGPLv2.1+) and celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest developers and contributors (LGPLv2.1+) +Various Luanti developers and contributors (LGPLv2.1+) Modfications by Wuzzy for Lazarr! (LGPLv2.1+) diff --git a/mods/lzr_stairs/init.lua b/mods/lzr_stairs/init.lua index 78ad6ca2..65259def 100644 --- a/mods/lzr_stairs/init.lua +++ b/mods/lzr_stairs/init.lua @@ -87,7 +87,7 @@ function lzr_stairs.register_stair(subname, recipeitem, groups, images, descript groups = new_groups, sounds = sounds, node_box = { - -- This stair nodebox is unusual and differs from most other Minetest games. + -- This stair nodebox is unusual and differs from most other Luanti games. -- The segments have been made slightly different so that a laser will alway -- be completely blocked off from any direction. type = "fixed", diff --git a/mods/player_api/README.txt b/mods/player_api/README.txt index 37afadfa..45dd0792 100644 --- a/mods/player_api/README.txt +++ b/mods/player_api/README.txt @@ -9,7 +9,7 @@ This mod is only for content related to the Player API and the player object. Authors of source code ---------------------- Originally by celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest developers and contributors (LGPLv2.1+) +Various Luanti developers and contributors (LGPLv2.1+) Authors of media (textures, models and sounds) ---------------------------------------------- diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 0aee048e..87b9b497 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -1,4 +1,4 @@ --- Minetest 0.4 mod: player +-- Minetest Game mod: player -- See README.txt for licensing and other information. player_api = {} diff --git a/mods/player_api/license.txt b/mods/player_api/license.txt index bdc43154..0c756d32 100644 --- a/mods/player_api/license.txt +++ b/mods/player_api/license.txt @@ -3,7 +3,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2011 celeron55, Perttu Ahola -Copyright (C) 2011 Various Minetest developers and contributors +Copyright (C) 2011 Various Luanti developers and contributors This program 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; diff --git a/mods/playerphysics/README.md b/mods/playerphysics/README.md index 3b5bc0f2..3ed0abfa 100644 --- a/mods/playerphysics/README.md +++ b/mods/playerphysics/README.md @@ -6,7 +6,7 @@ This mod makes it possible for multiple mods to modify player physics (speed, ju ## Introduction ### For players -Mods and games in Minetest can set physical attributes of players, such as speed and jump strength. For example, player speed could be set to 200%. But the way this works makes it difficult for multiple mods to *modify* physical attributes without leading to conflicts, problems and hilarious bugs, like speed that changes often to nonsense values. +Mods and games in Luanti can set physical attributes of players, such as speed and jump strength. For example, player speed could be set to 200%. But the way this works makes it difficult for multiple mods to *modify* physical attributes without leading to conflicts, problems and hilarious bugs, like speed that changes often to nonsense values. The Player Physics API aims to resolve this conflict by providing a “common ground” for mods to work together in this regard. @@ -19,7 +19,7 @@ Of course, not all mods need the Player Physics API. Mods that don't touch playe The rest of this document is directed at developers. ### For developers -The function `set_physics_override` from the Minetest Lua API allows mod authors to override physical attributes of players, such as speed or jump strength. +The function `set_physics_override` from the Luanti Lua API allows mod authors to override physical attributes of players, such as speed or jump strength. This function works fine as long there is only one mod that sets a particular physical attribute at a time. However, as soon as at least two different mods (that do not know each other) try to change the same player physics attribute using only this function, there will be conflicts as each mod will undo the change of the other mod, as the function sets a raw value. A classic race condition occurs. This is the case because the mods fail to communicate with each other. diff --git a/mods/show_wielded_item/README.md b/mods/show_wielded_item/README.md index 4bff761e..766d7249 100644 --- a/mods/show_wielded_item/README.md +++ b/mods/show_wielded_item/README.md @@ -1,5 +1,5 @@ # Show Wielded Item [`show_wielded_item`] -This Minetest mod displays the name of the wielded item above the hotbar and +This Luanti mod displays the name of the wielded item above the hotbar and statbars. This mod is compatible with the HUD Bars [`hudbars`] mod. diff --git a/mods/show_wielded_item/init.lua b/mods/show_wielded_item/init.lua index 98dfc537..fd8cdffd 100644 --- a/mods/show_wielded_item/init.lua +++ b/mods/show_wielded_item/init.lua @@ -12,10 +12,10 @@ local unified_inventory_mod = minetest.get_modpath("unified_inventory") -- Legacy support: Name of the HUD type field for 'hud_add'. local hud_type_field_name if minetest.features.hud_def_type_field then - -- Minetest 5.9.0 and later + -- Luanti 5.9.0 and later hud_type_field_name = "type" else - -- All Minetest versions before 5.9.0 + -- All Luanti versions before 5.9.0 hud_type_field_name = "hud_elem_type" end @@ -46,7 +46,7 @@ local function set_hud(player) off.y = -76 - vmargin*rows end - -- Dirty trick to avoid collision with Minetest's status text (e.g. “Volume changed to 0%”) + -- Dirty trick to avoid collision with Luanti's status text (e.g. “Volume changed to 0%”) if off.y >= -167 and off.y <= -156 then off.y = -181 end @@ -108,7 +108,7 @@ minetest.register_globalstep(function(dtime) if huds[player_name] then - -- Get description (various fallback checks for old Minetest versions) + -- Get description (various fallback checks for old Luanti versions) local def = minetest.registered_items[wname] local desc if wstack.get_short_description then