Builtin: replace minetest -> core, fix password saving crash

master
MoNTE48 2020-02-20 14:48:29 +01:00
parent b2d264fdea
commit 8449a0b304
8 changed files with 23 additions and 21 deletions

View File

@ -1115,7 +1115,7 @@ core.register_chatcommand("setspawn", {
if not player then
return false
end
local pos = minetest.pos_to_string(player:get_pos(), 1)
local pos = core.pos_to_string(player:get_pos(), 1)
core.settings:set("static_spawnpoint", pos)
return true, "The spawn point are set to (" .. pos .. ")"
end

View File

@ -154,7 +154,7 @@ core.register_on_joinplayer(function(player)
end
end)
minetest.register_on_leaveplayer(function(player)
core.register_on_leaveplayer(function(player)
local player = player:get_player_name()
for name, _ in pairs(sb_bg) do
sb_bg[player .. "_" .. name] = nil

View File

@ -441,9 +441,9 @@ local function item_throw_step(entity, dtime)
local hit_object
local dir = vnormalize(entity.object:get_velocity())
local pos2 = vadd(pos, vmultiply(dir, 3))
local _, node_pos = minetest.line_of_sight(pos, pos2)
local _, node_pos = core.line_of_sight(pos, pos2)
if node_pos then
local def = minetest.get_node(node_pos)
local def = core.get_node(node_pos)
if def then
pos = vsubtract(node_pos, vmultiply(dir, 1.5))
entity.object:move_to(pos)
@ -451,7 +451,7 @@ local function item_throw_step(entity, dtime)
node_pos = nil
end
end
local objs = minetest.get_objects_inside_radius(pos, 1.5)
local objs = core.get_objects_inside_radius(pos, 1.5)
for _, obj in pairs(objs) do
if obj:is_player() then
local name = obj:get_player_name()
@ -545,13 +545,13 @@ function core.item_drop(itemstack, dropper, pos)
-- environment failed
end
local enable_damage = minetest.settings:get_bool("enable_damage")
local enable_damage = core.settings:get_bool("enable_damage")
function core.item_eat(hp_change, replace_with_item, poison)
return function(itemstack, user, pointed_thing) -- closure
if user then
local pos = user:get_pos()
pos.y = pos.y + 1.3
if not minetest.is_valid_pos(pos) then
if not core.is_valid_pos(pos) then
return
end
local dir = user:get_look_dir()

View File

@ -242,7 +242,7 @@ core.register_entity(":__builtin:item", {
if not self.stuck and def_inside and def_inside.walkable and
not def_inside.liquid and node_inside.name ~= "air" and
def_inside.drawtype == "normal" then
local npos = minetest.find_node_near(pos, 1, "air")
local npos = core.find_node_near(pos, 1, "air")
if npos then
self.object:move_to(npos)
else

View File

@ -105,7 +105,7 @@ end
hud.register("health", health_bar_definition)
core.register_on_joinplayer(function(player)
minetest.after(0, function()
core.after(0, function()
update_builtin_statbars(player)
end)
end)

View File

@ -99,7 +99,7 @@ end
local M = { }
local function warn(msg)
minetest.log("warning", "[intllib] "..msg)
core.log("warning", "[intllib] "..msg)
end
-- hax!

View File

@ -48,7 +48,7 @@ end
local function Getter(modname)
modname = modname or minetest.get_current_modname()
modname = modname or core.get_current_modname()
if not intllib.getters[modname] then
local msgstr = intllib.get_strings(modname)
intllib.getters[modname] = make_getter(msgstr)
@ -60,7 +60,7 @@ end
function intllib.Getter(modname)
local info = debug and debug.getinfo and debug.getinfo(2)
local loc = info and info.short_src..":"..info.currentline
minetest.log("deprecated", "intllib.Getter is deprecated."
core.log("deprecated", "intllib.Getter is deprecated."
.." Please use intllib.make_gettext_pair instead."
..(info and " (called from "..loc..")" or ""))
return Getter(modname)
@ -102,7 +102,7 @@ function intllib.get_detected_languages()
local v
v = minetest.settings:get("language")
v = core.settings:get("language")
if v and v~="" then
addlang(v)
end
@ -154,11 +154,11 @@ end
local gettext_getters = { }
function intllib.make_gettext_pair(modname)
modname = modname or minetest.get_current_modname()
modname = modname or core.get_current_modname()
if gettext_getters[modname] then
return unpack(gettext_getters[modname])
end
local localedir = minetest.get_modpath(modname).."/locale"
local localedir = core.get_modpath(modname).."/locale"
local catalogs = gettext.load_catalogs(localedir)
local getter = Getter(modname)
local function gettext_func(msgid, ...)
@ -188,10 +188,10 @@ end
function intllib.get_strings(modname, langcode)
langcode = langcode or LANG
modname = modname or minetest.get_current_modname()
modname = modname or core.get_current_modname()
local msgstr = intllib.strings[modname]
if not msgstr then
local modpath = minetest.get_modpath(modname)
local modpath = core.get_modpath(modname)
msgstr = { }
for _, l in ipairs(get_locales(langcode)) do
local t = intllib.load_strings(modpath.."/locale/"..l..".txt") or { }

View File

@ -156,10 +156,12 @@ local function main_button_handler(_, fields, _, tabdata)
core.settings:set("name", fields.te_name)
end
if fields.te_pwd and password_save then
core.settings:set("password", fields.te_pwd)
else
password_tmp = fields.te_pwd
if fields.te_pwd then
if password_save then
core.settings:set("password", fields.te_pwd)
else
password_tmp = fields.te_pwd
end
end
if fields.favourites then