Skip to content

Commit 4db7fb4

Browse files
rubenwardyrubenwardy
committedFeb 11, 2021
Replace 'minetest.' with 'core.' in builtin
1 parent 9736b9c commit 4db7fb4

7 files changed

+18
-18
lines changed
 

‎builtin/common/information_formspecs.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ core.register_on_player_receive_fields(function(player, formname, fields)
115115
return
116116
end
117117

118-
local event = minetest.explode_table_event(fields.list)
118+
local event = core.explode_table_event(fields.list)
119119
if event.type ~= "INV" then
120120
local name = player:get_player_name()
121121
core.show_formspec(name, "__builtin:help_cmds",

‎builtin/game/item.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ end
678678
-- Item definition defaults
679679
--
680680

681-
local default_stack_max = tonumber(minetest.settings:get("default_stack_max")) or 99
681+
local default_stack_max = tonumber(core.settings:get("default_stack_max")) or 99
682682

683683
core.nodedef_default = {
684684
-- Item properties

‎builtin/game/statbars.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ local function update_builtin_statbars(player)
8484
end
8585

8686
if hud.id_breathbar and (not show_breathbar or breath == breath_max) then
87-
minetest.after(1, function(player_name, breath_bar)
88-
local player = minetest.get_player_by_name(player_name)
87+
core.after(1, function(player_name, breath_bar)
88+
local player = core.get_player_by_name(player_name)
8989
if player then
9090
player:hud_remove(breath_bar)
9191
end

‎builtin/mainmenu/dlg_config_world.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ local function get_formspec(data)
7474
"label[1.75,0;" .. data.worldspec.name .. "]"
7575

7676
if mod.is_modpack or mod.type == "game" then
77-
local info = minetest.formspec_escape(
77+
local info = core.formspec_escape(
7878
core.get_content_info(mod.path).description)
7979
if info == "" then
8080
if mod.is_modpack then

‎builtin/mainmenu/dlg_contentstore.lua

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
--with this program; if not, write to the Free Software Foundation, Inc.,
1616
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717

18-
if not minetest.get_http_api then
18+
if not core.get_http_api then
1919
function create_store_dlg()
2020
return messagebox("store",
2121
fgettext("ContentDB is not available when Minetest was compiled without cURL"))
@@ -27,7 +27,7 @@ end
2727
-- before the package list is ordered based on installed state.
2828
local store = { packages = {}, packages_full = {}, packages_full_unordered = {} }
2929

30-
local http = minetest.get_http_api()
30+
local http = core.get_http_api()
3131

3232
-- Screenshot
3333
local screenshot_dir = core.get_cache_path() .. DIR_DELIM .. "cdb"
@@ -152,7 +152,7 @@ local function start_install(package)
152152
end
153153

154154
local function queue_download(package)
155-
local max_concurrent_downloads = tonumber(minetest.settings:get("contentdb_max_concurrent_downloads"))
155+
local max_concurrent_downloads = tonumber(core.settings:get("contentdb_max_concurrent_downloads"))
156156
if number_downloading < max_concurrent_downloads then
157157
start_install(package)
158158
else
@@ -320,7 +320,7 @@ function install_dialog.get_formspec()
320320
selected_game_idx = i
321321
end
322322

323-
games[i] = minetest.formspec_escape(games[i].name)
323+
games[i] = core.formspec_escape(games[i].name)
324324
end
325325

326326
local selected_game = pkgmgr.games[selected_game_idx]
@@ -331,7 +331,7 @@ function install_dialog.get_formspec()
331331
local formatted_deps = {}
332332
for _, dep in pairs(install_dialog.dependencies) do
333333
formatted_deps[#formatted_deps + 1] = "#fff"
334-
formatted_deps[#formatted_deps + 1] = minetest.formspec_escape(dep.name)
334+
formatted_deps[#formatted_deps + 1] = core.formspec_escape(dep.name)
335335
if dep.installed then
336336
formatted_deps[#formatted_deps + 1] = "#ccf"
337337
formatted_deps[#formatted_deps + 1] = fgettext("Already installed")
@@ -402,7 +402,7 @@ function install_dialog.handle_submit(this, fields)
402402
end
403403

404404
if fields.will_install_deps ~= nil then
405-
install_dialog.will_install_deps = minetest.is_yes(fields.will_install_deps)
405+
install_dialog.will_install_deps = core.is_yes(fields.will_install_deps)
406406
return true
407407
end
408408

@@ -553,7 +553,7 @@ function store.load()
553553
end
554554
end
555555

556-
local timeout = tonumber(minetest.settings:get("curl_file_download_timeout"))
556+
local timeout = tonumber(core.settings:get("curl_file_download_timeout"))
557557
local response = http.fetch_sync({ url = url, timeout = timeout })
558558
if not response.succeeded then
559559
return
@@ -793,8 +793,8 @@ function store.get_formspec(dlgdata)
793793
-- title
794794
formspec[#formspec + 1] = "label[1.875,0.1;"
795795
formspec[#formspec + 1] = core.formspec_escape(
796-
minetest.colorize(mt_color_green, package.title) ..
797-
minetest.colorize("#BFBFBF", " by " .. package.author))
796+
core.colorize(mt_color_green, package.title) ..
797+
core.colorize("#BFBFBF", " by " .. package.author))
798798
formspec[#formspec + 1] = "]"
799799

800800
-- buttons

‎builtin/mainmenu/dlg_create_world.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ local function create_world_buttonhandler(this, fields)
443443
end
444444

445445
if fields["mgv6_biomes"] then
446-
local entry = minetest.formspec_escape(fields["mgv6_biomes"])
446+
local entry = core.formspec_escape(fields["mgv6_biomes"])
447447
for b=1, #mgv6_biomes do
448448
if entry == mgv6_biomes[b][1] then
449449
local ftable = core.settings:get_flags("mgv6_spflags")

‎builtin/mainmenu/pkgmgr.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ function pkgmgr.enable_mod(this, toset)
459459
if not toset then
460460
-- Mod(s) were disabled, so no dependencies need to be enabled
461461
table.sort(toggled_mods)
462-
minetest.log("info", "Following mods were disabled: " ..
462+
core.log("info", "Following mods were disabled: " ..
463463
table.concat(toggled_mods, ", "))
464464
return
465465
end
@@ -496,7 +496,7 @@ function pkgmgr.enable_mod(this, toset)
496496
enabled_mods[name] = true
497497
local mod_to_enable = list[mod_ids[name]]
498498
if not mod_to_enable then
499-
minetest.log("warning", "Mod dependency \"" .. name ..
499+
core.log("warning", "Mod dependency \"" .. name ..
500500
"\" not found!")
501501
else
502502
if mod_to_enable.enabled == false then
@@ -517,7 +517,7 @@ function pkgmgr.enable_mod(this, toset)
517517

518518
-- Log the list of enabled mods
519519
table.sort(toggled_mods)
520-
minetest.log("info", "Following mods were enabled: " ..
520+
core.log("info", "Following mods were enabled: " ..
521521
table.concat(toggled_mods, ", "))
522522
end
523523

0 commit comments

Comments
 (0)