Replace more deprecated functions

diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 37903d76f7414e751dd73117a4e41b3cc75f9475..7db138ba6c31406b8b38871f630c2490440c9eb7 100644 (file)
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -93,14 +93,6 @@ function worldedit.player_axis(name)
        return "z", dir.z > 0 and 1 or -1\r
 end\r
 \r
-local function mkdir(path)\r
-       if minetest.mkdir then\r
-               minetest.mkdir(path)\r
-       else\r
-               os.execute('mkdir "' .. path .. '"')\r
-       end\r
-end\r
-\r
 local function check_filename(name)\r
        return name:find("^[%w%s%^&'@{}%[%],%$=!%-#%(%)%%%.%+~_]+$") ~= nil\r
 end\r
@@ -1115,7 +1107,7 @@ minetest.register_chatcommand("/save", {
 \r
                local path = minetest.get_worldpath() .. "/schems"\r
                -- Create directory if it does not already exist\r
-               mkdir(path)\r
+               minetest.mkdir(path)\r
 \r
                local filename = path .. "/" .. param .. ".we"\r
                local file, err = io.open(filename, "wb")\r
@@ -1282,7 +1274,7 @@ minetest.register_chatcommand("/mtschemcreate", {
 \r
                local path = minetest.get_worldpath() .. "/schems"\r
                -- Create directory if it does not already exist\r
-               mkdir(path)\r
+               minetest.mkdir(path)\r
 \r
                local filename = path .. "/" .. param .. ".mts"\r
                local ret = minetest.create_schematic(worldedit.pos1[name],\r

diff --git a/worldedit_commands/mark.lua b/worldedit_commands/mark.lua
index 9d41bda34b216a1f07ce55caa3b361e82509dab5..fa588d6a42e829a0461de580bccfb475c4033df8 100644 (file)
--- a/worldedit_commands/mark.lua
+++ b/worldedit_commands/mark.lua
@@ -64,7 +64,7 @@ worldedit.mark_region = function(name)
 \r
                local vec = vector.subtract(pos2, pos1)\r
                local maxside = math.max(vec.x, math.max(vec.y, vec.z))\r
-               local limit = tonumber(minetest.setting_get("active_object_send_range_blocks")) * 16\r
+               local limit = tonumber(minetest.settings:get("active_object_send_range_blocks")) * 16\r
                if maxside > limit * 1.5 then\r
                        -- The client likely won't be able to see the plane markers as intended anyway,\r
                        -- thus don't place them and also don't load the area into memory\r
@@ -101,7 +101,7 @@ worldedit.mark_region = function(name)
                                        visual_size={x=sizez * 2, y=sizey * 2},\r
                                        collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},\r
                                })\r
-                               marker:setyaw(math.pi / 2)\r
+                               marker:set_yaw(math.pi / 2)\r
                                marker:get_luaentity().player_name = name\r
                                table.insert(markers, marker)\r
                        end\r

diff --git a/worldedit_gui/init.lua b/worldedit_gui/init.lua
index 181adf684471131b2d2352697ffbc4859038c04d..424d61f064f887d3955cf7c5d66743b2de52e5b7 100644 (file)
--- a/worldedit_gui/init.lua
+++ b/worldedit_gui/init.lua
@@ -70,7 +70,7 @@ local get_formspec = function(name, identifier)
 end
 
 --implement worldedit.show_page(name, page) in different ways depending on the available APIs
-if rawget(_G, "unified_inventory") then --unified inventory installed
+if minetest.global_exists("unified_inventory") then -- unified inventory installed
        local old_func = worldedit.register_gui_function
        worldedit.register_gui_function = function(identifier, options)
                old_func(identifier, options)
@@ -103,7 +103,7 @@ if rawget(_G, "unified_inventory") then --unified inventory installed
                        player:set_inventory_formspec(get_formspec(name, page))
                end
        end
-elseif rawget(_G, "inventory_plus") then --inventory++ installed
+elseif minetest.global_exists("inventory_plus") then -- inventory++ installed
        minetest.register_on_joinplayer(function(player)
                local can_worldedit = minetest.check_player_privs(player:get_player_name(), {worldedit=true})
                if can_worldedit then
@@ -134,7 +134,7 @@ elseif rawget(_G, "inventory_plus") then --inventory++ installed
                        inventory_plus.set_inventory_formspec(player, get_formspec(name, page))
                end
        end
-elseif rawget(_G, "smart_inventory") then -- smart_inventory installed
+elseif minetest.global_exists("smart_inventory") then -- smart_inventory installed
        -- redefinition: Update the code element on inventory page to show the we-page
        function worldedit.show_page(name, page)
                local state = smart_inventory.get_page_state("worldedit_gui", name)
@@ -183,7 +183,7 @@ elseif rawget(_G, "smart_inventory") then -- smart_inventory installed
                smartfs_callback = smart_worldedit_gui_callback,
                sequence = 99
        })
-elseif rawget(_G, "sfinv") then --sfinv installed (part of minetest_game since 0.4.15)
+elseif minetest.global_exists("sfinv") then -- sfinv installed
        assert(sfinv.enabled)
        local orig_get = sfinv.pages["sfinv:crafting"].get
        sfinv.override_page("sfinv:crafting", {