From 4a40eaf2b2d160216aab8b22c561ee93be5ea675 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Thu, 30 Jan 2020 17:33:14 -0700 Subject: [PATCH] update deprecated functions --- df_caverns/config.lua | 6 +++--- df_farming/config.lua | 6 +++--- df_mapitems/config.lua | 6 +++--- df_mapitems/snareweed.lua | 2 +- df_trees/config.lua | 6 +++--- df_underworld_items/config.lua | 6 +++--- subterrane | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/df_caverns/config.lua b/df_caverns/config.lua index 642f2b0..0794480 100644 --- a/df_caverns/config.lua +++ b/df_caverns/config.lua @@ -7,11 +7,11 @@ local print_settingtypes = false local function setting(stype, name, default, description) local value if stype == "bool" then - value = minetest.setting_getbool(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get_bool(CONFIG_FILE_PREFIX..name, default) elseif stype == "string" then - value = minetest.setting_get(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get(CONFIG_FILE_PREFIX..name) elseif stype == "int" or stype == "float" then - value = tonumber(minetest.setting_get(CONFIG_FILE_PREFIX..name)) + value = tonumber(minetest.settings:get(CONFIG_FILE_PREFIX..name)) end if value == nil then value = default diff --git a/df_farming/config.lua b/df_farming/config.lua index afdcb49..b0223cc 100644 --- a/df_farming/config.lua +++ b/df_farming/config.lua @@ -7,11 +7,11 @@ local print_settingtypes = false local function setting(stype, name, default, description) local value if stype == "bool" then - value = minetest.setting_getbool(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get_bool(CONFIG_FILE_PREFIX..name, default) elseif stype == "string" then - value = minetest.setting_get(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get(CONFIG_FILE_PREFIX..name) elseif stype == "int" or stype == "float" then - value = tonumber(minetest.setting_get(CONFIG_FILE_PREFIX..name)) + value = tonumber(minetest.settings:get(CONFIG_FILE_PREFIX..name)) end if value == nil then value = default diff --git a/df_mapitems/config.lua b/df_mapitems/config.lua index e93a6d6..5ebf388 100644 --- a/df_mapitems/config.lua +++ b/df_mapitems/config.lua @@ -7,11 +7,11 @@ local print_settingtypes = false local function setting(stype, name, default, description) local value if stype == "bool" then - value = minetest.setting_getbool(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get_bool(CONFIG_FILE_PREFIX..name, default) elseif stype == "string" then - value = minetest.setting_get(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get(CONFIG_FILE_PREFIX..name) elseif stype == "int" or stype == "float" then - value = tonumber(minetest.setting_get(CONFIG_FILE_PREFIX..name)) + value = tonumber(minetest.settings:get(CONFIG_FILE_PREFIX..name)) end if value == nil then value = default diff --git a/df_mapitems/snareweed.lua b/df_mapitems/snareweed.lua index 2ae2bd6..0efeb8a 100644 --- a/df_mapitems/snareweed.lua +++ b/df_mapitems/snareweed.lua @@ -25,7 +25,7 @@ if df_mapitems.config.snareweed_damage then if timer >= 1 then timer = timer - 1 for _, player in pairs(minetest.get_connected_players()) do - local player_pos = player:getpos() -- node player's feet are in this location. + local player_pos = player:get_pos() -- node player's feet are in this location. local rounded_pos = vector.round(player_pos) local nearby_nodes = minetest.find_nodes_in_area(vector.add(rounded_pos, {x=0, y= -8, z=0}), rounded_pos, {"df_mapitems:snareweed"}) for _, node_pos in ipairs(nearby_nodes) do diff --git a/df_trees/config.lua b/df_trees/config.lua index a97cd5e..60f4d0f 100644 --- a/df_trees/config.lua +++ b/df_trees/config.lua @@ -7,11 +7,11 @@ local print_settingtypes = false local function setting(stype, name, default, description) local value if stype == "bool" then - value = minetest.setting_getbool(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get_bool(CONFIG_FILE_PREFIX..name, default) elseif stype == "string" then - value = minetest.setting_get(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get(CONFIG_FILE_PREFIX..name) elseif stype == "int" or stype == "float" then - value = tonumber(minetest.setting_get(CONFIG_FILE_PREFIX..name)) + value = tonumber(minetest.settings:get(CONFIG_FILE_PREFIX..name)) end if value == nil then value = default diff --git a/df_underworld_items/config.lua b/df_underworld_items/config.lua index 84c9fd0..c291630 100644 --- a/df_underworld_items/config.lua +++ b/df_underworld_items/config.lua @@ -7,11 +7,11 @@ local print_settingtypes = false local function setting(stype, name, default, description) local value if stype == "bool" then - value = minetest.setting_getbool(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get_bool(CONFIG_FILE_PREFIX..name, default) elseif stype == "string" then - value = minetest.setting_get(CONFIG_FILE_PREFIX..name) + value = minetest.settings:get(CONFIG_FILE_PREFIX..name) elseif stype == "int" or stype == "float" then - value = tonumber(minetest.setting_get(CONFIG_FILE_PREFIX..name)) + value = tonumber(minetest.setting:get(CONFIG_FILE_PREFIX..name)) end if value == nil then value = default diff --git a/subterrane b/subterrane index 6662133..6940ae1 160000 --- a/subterrane +++ b/subterrane @@ -1 +1 @@ -Subproject commit 6662133650cb1215c385f7b00d835613b1ea5d4f +Subproject commit 6940ae15859f671afbeb2231f90ce58914bb774f