From 3ea67b778644f1cd6fe279f87d5a35dacfc0a3ad Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Wed, 7 Jun 2017 23:33:43 -0700 Subject: [PATCH] Replace deprecated calls to 'minetest.env' --- deploy_building/init.lua | 10 +++++----- deploy_cylinder_y/init.lua | 10 +++++----- deploy_maze/init.lua | 28 ++++++++++++++-------------- deploy_pyramid/init.lua | 10 +++++----- deploy_sphere/init.lua | 10 +++++----- deploy_spiral/init.lua | 16 ++++++++-------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/deploy_building/init.lua b/deploy_building/init.lua index ac06875..a017256 100644 --- a/deploy_building/init.lua +++ b/deploy_building/init.lua @@ -74,7 +74,7 @@ deploy_building.deploy = function(originpos, placer, size) for z=minpos.z,maxpos.z do if x~=0 or y~=0 or z~=0 then local checkpos = {x=originpos.x+x,y=originpos.y+y,z=originpos.z+z} - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_building] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -86,7 +86,7 @@ deploy_building.deploy = function(originpos, placer, size) end -- remove building node - minetest.env:remove_node(originpos) + minetest.remove_node(originpos) -- create building local pos = {x=0, y=0, z=0} @@ -98,7 +98,7 @@ deploy_building.deploy = function(originpos, placer, size) node.name = name node.param1 = param1 node.param2 = param2 - minetest.env:add_node(pos, node) + minetest.add_node(pos, node) end end @@ -193,9 +193,9 @@ minetest.register_entity("deploy_building:arrow_entity", { on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:getpos() - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if self.timer>0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_building:arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then diff --git a/deploy_cylinder_y/init.lua b/deploy_cylinder_y/init.lua index 5638a18..cd6724d 100644 --- a/deploy_cylinder_y/init.lua +++ b/deploy_cylinder_y/init.lua @@ -33,7 +33,7 @@ deploy_cylinder_y.deploy = function(pos,placer,nodename,radius,height) if x*x+z*z <= radius * radius + radius then if x~=0 or y~=0 or z~=0 then local checkpos={x=pos.x+x,y=pos.y+y,z=pos.z+z} - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_cylinder_y] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -46,7 +46,7 @@ deploy_cylinder_y.deploy = function(pos,placer,nodename,radius,height) end -- remove cylinder node - minetest.env:remove_node(pos) + minetest.remove_node(pos) -- build the cylinder local hollow = 1 @@ -54,7 +54,7 @@ deploy_cylinder_y.deploy = function(pos,placer,nodename,radius,height) for x=-radius,radius do for z=-radius,radius do if x*x+z*z >= (radius-hollow) * (radius-hollow) + (radius-hollow) and x*x+z*z <= radius * radius + radius then - minetest.env:add_node({x=pos.x+x,y=pos.y+y,z=pos.z+z},{type="node",name=nodename}) + minetest.add_node({x=pos.x+x,y=pos.y+y,z=pos.z+z},{type="node",name=nodename}) end end end @@ -155,9 +155,9 @@ deploy_cylinder_y.register = function(label,name,material,texture) on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:getpos() - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if self.timer>0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_cylinder_y:"..name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then diff --git a/deploy_maze/init.lua b/deploy_maze/init.lua index 0d84175..2f46714 100644 --- a/deploy_maze/init.lua +++ b/deploy_maze/init.lua @@ -70,7 +70,7 @@ deploy_maze.deploy = function(originpos, placer, material, size, floors) checkpos.x = cosine * x - sine * (y - math.floor(maze_size_z / 2)) + originpos.x checkpos.z = sine * x + cosine * (y - math.floor(maze_size_z / 2)) + originpos.z checkpos.y = originpos.y + y - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_cylinder_y] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -82,7 +82,7 @@ deploy_maze.deploy = function(originpos, placer, material, size, floors) end -- remove maze node - minetest.env:remove_node(originpos) + minetest.remove_node(originpos) -- tweak the pos originpos.y = originpos.y+1 @@ -330,29 +330,29 @@ deploy_maze.deploy = function(originpos, placer, material, size, floors) elseif ladder_direction == 5 then ladder_direction = 2 end end if not change_level_down then - minetest.env:add_node(pos, {type = "node", name = material}) + minetest.add_node(pos, {type = "node", name = material}) end if maze[l][x][y] then line = "X" .. line pos.y = pos.y + 1 - minetest.env:add_node(pos, {type = "node", name = material}) + minetest.add_node(pos, {type = "node", name = material}) pos.y = pos.y + 1 - minetest.env:add_node(pos, {type = "node", name = material}) + minetest.add_node(pos, {type = "node", name = material}) else line = " " .. line pos.y = pos.y + 1 - minetest.env:add_node(pos, {type = "node", name = "air"}) - if change_level_up then minetest.env:add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) end + minetest.add_node(pos, {type = "node", name = "air"}) + if change_level_up then minetest.add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) end pos.y = pos.y + 1 - minetest.env:add_node(pos, {type = "node", name = "air"}) - if change_level_up then minetest.env:add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) end + minetest.add_node(pos, {type = "node", name = "air"}) + if change_level_up then minetest.add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) end end pos.y = pos.y + 1 if change_level_up then - minetest.env:add_node(pos, {type = "node", name = "air"}) - minetest.env:add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) + minetest.add_node(pos, {type = "node", name = "air"}) + minetest.add_node(pos, {type = "node", name = "default:ladder", param2 = ladder_direction}) else - minetest.env:add_node(pos, {type = "node", name = material}) + minetest.add_node(pos, {type = "node", name = material}) end end if l==exit_l and y==exit_y then line = "<-" .. line else line = " " .. line end @@ -453,9 +453,9 @@ deploy_maze.register = function(label,name,material,texture) on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:getpos() - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if self.timer>0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_maze:"..name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then diff --git a/deploy_pyramid/init.lua b/deploy_pyramid/init.lua index a4f6713..7f093d5 100644 --- a/deploy_pyramid/init.lua +++ b/deploy_pyramid/init.lua @@ -27,7 +27,7 @@ deploy_pyramid.deploy = function(pos,placer,nodename,height) for z=-height*0.5,height*0.5 do if x~=0 or y~=0 or z~=0 then local checkpos = {x=pos.x+x,y=pos.y+y,z=pos.z+z} - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_pyramid] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -39,7 +39,7 @@ deploy_pyramid.deploy = function(pos,placer,nodename,height) end -- remove pyramid node - minetest.env:remove_node(pos) + minetest.remove_node(pos) -- build the pyramid local pos1 = {x=pos.x-height, y=pos.y, z=pos.z-height} @@ -51,7 +51,7 @@ deploy_pyramid.deploy = function(pos,placer,nodename,height) while np.x <= pos2.x do np.z = pos1.z while np.z <= pos2.z do - minetest.env:add_node({x=np.x-height*0.5,y=np.y,z=np.z-height*0.5}, node) + minetest.add_node({x=np.x-height*0.5,y=np.y,z=np.z-height*0.5}, node) np.z = np.z + 1 end np.x = np.x + 1 @@ -156,9 +156,9 @@ deploy_pyramid.register = function(label,name,material,texture) on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:getpos() - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if self.timer>0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_pyramid:"..name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then diff --git a/deploy_sphere/init.lua b/deploy_sphere/init.lua index 26e9398..4d934f5 100644 --- a/deploy_sphere/init.lua +++ b/deploy_sphere/init.lua @@ -33,7 +33,7 @@ deploy_sphere.deploy = function(pos,placer,nodename,radius) if x*x+y*y+z*z <= radius * radius + radius then if x~=0 or y~=radius*-1 or z~=0 then local checkpos = {x=pos.x+x,y=pos.y+y+radius,z=pos.z+z} - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_sphere] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -46,7 +46,7 @@ deploy_sphere.deploy = function(pos,placer,nodename,radius) end -- remove sphere node - minetest.env:remove_node(pos) + minetest.remove_node(pos) -- build the sphere local hollow = 1 @@ -54,7 +54,7 @@ deploy_sphere.deploy = function(pos,placer,nodename,radius) for y=-radius,radius do for z=-radius,radius do if x*x+y*y+z*z >= (radius-hollow) * (radius-hollow) + (radius-hollow) and x*x+y*y+z*z <= radius * radius + radius then - minetest.env:add_node({x=pos.x+x,y=pos.y+y+radius,z=pos.z+z},{name=nodename}) + minetest.add_node({x=pos.x+x,y=pos.y+y+radius,z=pos.z+z},{name=nodename}) end end end @@ -155,9 +155,9 @@ deploy_sphere.register = function(label,name,material,texture) on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:getpos() - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if self.timer>0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_sphere:"..name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then diff --git a/deploy_spiral/init.lua b/deploy_spiral/init.lua index 75e9159..8c4606b 100644 --- a/deploy_spiral/init.lua +++ b/deploy_spiral/init.lua @@ -35,7 +35,7 @@ deploy_spiral.deploy = function(pos,placer,nodename,width,height,spacer) for z=width*spacer*-0.5,width*spacer*0.5 do if x~=0 or y~=0 or z~=0 then local checkpos = {x=pos.x+x,y=pos.y+y,z=pos.z+z} - local checknode = minetest.env:get_node(checkpos).name + local checknode = minetest.get_node(checkpos).name if checknode~="air" then minetest.chat_send_player(placer:get_player_name(), "[deploy_spiral] no room to build because "..checknode.." is in the way at "..dump(checkpos).."") return @@ -47,7 +47,7 @@ deploy_spiral.deploy = function(pos,placer,nodename,width,height,spacer) end -- remove spiral node - minetest.env:remove_node(pos) + minetest.remove_node(pos) -- build the spiral -- spiral matrix - http://rosettacode.org/wiki/Spiral_matrix#Lua @@ -83,22 +83,22 @@ deploy_spiral.deploy = function(pos,placer,nodename,width,height,spacer) if lp.x~=np.x then if lp.x0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then if obj:get_luaentity().name ~= "deploy_spiral:"..name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then