mtcontrib
/
Minetest-WorldEdit
mirror of https://github.com/Uberi/Minetest-WorldEdit.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Replace more deprecated functions

This commit is contained in:
sfan5 2019-07-17 02:06:29 +02:00
parent b50294d10c
commit 0a16f11d93
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit_commands/init.lua
View File

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

4
worldedit_commands/mark.lua
View File

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

8
worldedit_gui/init.lua
View File

@ -70,7 +70,7 @@ local get_formspec = function(name, identifier)
end end
--implement worldedit.show_page(name, page) in different ways depending on the available APIs --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 local old_func = worldedit.register_gui_function
worldedit.register_gui_function = function(identifier, options) worldedit.register_gui_function = function(identifier, options)
old_func(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)) player:set_inventory_formspec(get_formspec(name, page))
end end
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) minetest.register_on_joinplayer(function(player)
local can_worldedit = minetest.check_player_privs(player:get_player_name(), {worldedit=true}) local can_worldedit = minetest.check_player_privs(player:get_player_name(), {worldedit=true})
if can_worldedit then 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)) inventory_plus.set_inventory_formspec(player, get_formspec(name, page))
end end
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 -- redefinition: Update the code element on inventory page to show the we-page
function worldedit.show_page(name, page) function worldedit.show_page(name, page)
local state = smart_inventory.get_page_state("worldedit_gui", name) 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, smartfs_callback = smart_worldedit_gui_callback,
sequence = 99 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) assert(sfinv.enabled)
local orig_get = sfinv.pages["sfinv:crafting"].get local orig_get = sfinv.pages["sfinv:crafting"].get
sfinv.override_page("sfinv:crafting", { sfinv.override_page("sfinv:crafting", {