Skip to content

Commit

Permalink
Update code to standards of Minetest 0.4.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Uberi
Uberi committed Dec 1, 2013
1 parent b4654ce commit 16b4b79
Show file tree
Hide file tree
Showing 22 changed files with 148 additions and 155 deletions.
2 changes: 1 addition & 1 deletion mesecons/init.lua
View file
Expand Up @@ -132,7 +132,7 @@ function mesecon:receptor_off_i(pos, rules)
if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
mesecon:turnoff(np, rulename)
else
mesecon:changesignal(np, minetest.env:get_node(np), rulename, mesecon.state.off)
mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off)
end
end
end
Expand Down
28 changes: 14 additions & 14 deletions mesecons/internal.lua
View file
Expand Up @@ -237,7 +237,7 @@ function execute_actions(dtime)
local nactions = mesecon.to_update
mesecon.to_update = {}
for _,i in ipairs(nactions) do
node = minetest.env:get_node(i.pos)
node = minetest.get_node(i.pos)
if node.name=="ignore" then
add_action(i.pos, i.action, i.rname)
else
Expand Down Expand Up @@ -395,23 +395,23 @@ end
-- some more general high-level stuff

function mesecon:is_power_on(pos, rulename)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if mesecon:is_conductor_on(node.name, rulename) or mesecon:is_receptor_on(node.name) then
return true
end
return false
end

function mesecon:is_power_off(pos, rulename)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if mesecon:is_conductor_off(node.name, rulename) or mesecon:is_receptor_off(node.name) then
return true
end
return false
end

function mesecon:turnon(pos, rulename)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)

if mesecon:is_conductor_off(node.name, rulename) then
local rules = mesecon:conductor_get_rules(node)
Expand All @@ -425,7 +425,7 @@ function mesecon:turnon(pos, rulename)
return
end

minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name, rulename), param2 = node.param2})
minetest.add_node(pos, {name = mesecon:get_conductor_on(node.name, rulename), param2 = node.param2})

for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
Expand All @@ -444,7 +444,7 @@ function mesecon:turnon(pos, rulename)
end

function mesecon:turnoff(pos, rulename)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)

if mesecon:is_conductor_on(node.name, rulename) then
local rules = mesecon:conductor_get_rules(node)
Expand All @@ -458,7 +458,7 @@ function mesecon:turnoff(pos, rulename)
return
end
--]]
minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name, rulename), param2 = node.param2})
minetest.add_node(pos, {name = mesecon:get_conductor_off(node.name, rulename), param2 = node.param2})
for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
Expand All @@ -479,7 +479,7 @@ end
function mesecon:connected_to_receptor(pos, rulename)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
-- Check if conductors around are connected
local rules = mesecon:get_any_inputrules(node)
Expand Down Expand Up @@ -507,7 +507,7 @@ function mesecon:find_receptor_on(pos, checked, rulename)
-- add current position to checked
table.insert(checked, {x=pos.x, y=pos.y, z=pos.z})
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if mesecon:is_receptor_on(node.name) then
return true
Expand All @@ -529,8 +529,8 @@ function mesecon:find_receptor_on(pos, checked, rulename)
end
function mesecon:rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
local outputnode = minetest.env:get_node(output)
local inputnode = minetest.env:get_node(input)
local outputnode = minetest.get_node(output)
local inputnode = minetest.get_node(input)
local outputrules = dug_outputrules or mesecon:get_any_outputrules (outputnode)
local inputrules = mesecon:get_any_inputrules (inputnode)
if not outputrules or not inputrules then
Expand All @@ -556,14 +556,14 @@ function mesecon:rules_link_anydir(pos1, pos2)
end
function mesecon:is_powered(pos, rule)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
local rules = mesecon:get_any_inputrules(node)
if not rules then return false end
if not rule then
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
local nn = minetest.env:get_node(np)
local nn = minetest.get_node(np)
if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
and mesecon:rules_link(np, pos) then
Expand All @@ -572,7 +572,7 @@ function mesecon:is_powered(pos, rule)
end
else
local np = mesecon:addPosRule(pos, rule)
local nn = minetest.env:get_node(np)
local nn = minetest.get_node(np)
if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
and mesecon:rules_link(np, pos) then
Expand Down
2 changes: 1 addition & 1 deletion mesecons/services.lua
View file
Expand Up @@ -29,7 +29,7 @@ minetest.register_abm({
interval = 1.0,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_int("heat",0)
end,
})
Expand Down
10 changes: 5 additions & 5 deletions mesecons/util.lua
View file
@@ -1,9 +1,9 @@
function mesecon:move_node(pos, newpos)
local node = minetest.env:get_node(pos)
local meta = minetest.env:get_meta(pos):to_table()
minetest.env:remove_node(pos)
minetest.env:add_node(newpos, node)
minetest.env:get_meta(pos):from_table(meta)
local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos):to_table()
minetest.remove_node(pos)
minetest.add_node(newpos, node)
minetest.get_meta(pos):from_table(meta)
end

--[[ new functions:
Expand Down
6 changes: 3 additions & 3 deletions mesecons/wires.lua
View file
Expand Up @@ -207,7 +207,7 @@ function mesecon:update_autoconnect(pos, secondcall, replace_old)
mesecon:update_autoconnect(zmympos, true)
end

nodename = minetest.env:get_node(pos).name
nodename = minetest.get_node(pos).name
if string.find(nodename, "mesecons:wire_") == nil and not replace_old then return nil end

if mesecon:rules_link_anydir(pos, xppos) then xp = 1 else xp = 0 end
Expand Down Expand Up @@ -235,9 +235,9 @@ function mesecon:update_autoconnect(pos, secondcall, replace_old)


if string.find(nodename, "_off") ~= nil then
minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
else
minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
end
end

Expand Down
8 changes: 4 additions & 4 deletions mesecons_blinkyplant/init.lua
View file
Expand Up @@ -81,8 +81,8 @@ minetest.register_abm(
interval = BLINKY_PLANT_INTERVAL,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
--minetest.env:remove_node(pos)
minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
--minetest.remove_node(pos)
minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
nodeupdate(pos)
mesecon:receptor_on(pos)
end,
Expand All @@ -93,8 +93,8 @@ minetest.register_abm({
interval = BLINKY_PLANT_INTERVAL,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
--minetest.env:remove_node(pos)
minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
--minetest.remove_node(pos)
minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
nodeupdate(pos)
mesecon:receptor_off(pos)
end,
Expand Down
2 changes: 1 addition & 1 deletion mesecons_button/init.lua
View file
Expand Up @@ -3,7 +3,7 @@
-- and then turns off again

mesecon.button_turnoff = function (pos)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if node.name=="mesecons_button:button_on" then --has not been dug
minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
minetest.sound_play("mesecons_button_pop", {pos=pos})
Expand Down
16 changes: 8 additions & 8 deletions mesecons_commandblock/init.lua
View file
Expand Up @@ -16,7 +16,7 @@ minetest.register_chatcommand("tell", {
minetest.chat_send_player(name, "Invalid usage: " .. param)
return
end
if not minetest.env:get_player_by_name(target) then
if not minetest.get_player_by_name(target) then
minetest.chat_send_player(name, "Invalid target: " .. target)
end
minetest.chat_send_player(target, name .. " whispers: " .. message, false)
Expand All @@ -41,7 +41,7 @@ minetest.register_chatcommand("hp", {
minetest.chat_send_player(name, "Invalid usage: " .. param)
return
end
local player = minetest.env:get_player_by_name(target)
local player = minetest.get_player_by_name(target)
if player then
player:set_hp(value)
else
Expand Down Expand Up @@ -72,7 +72,7 @@ local initialize_data = function(meta, player, command, param)
end

local construct = function(pos)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)

meta:set_string("player", "@nearest")
meta:set_string("command", "time")
Expand All @@ -85,14 +85,14 @@ end

local after_place = function(pos, placer)
if placer then
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_string("owner", placer:get_player_name())
initialize_data(meta, "@nearest", "time", "7000")
end
end

local receive_fields = function(pos, formname, fields, sender)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
if fields.nearest then
initialize_data(meta, "@nearest", fields.command, fields.param)
elseif fields.farthest then
Expand Down Expand Up @@ -146,7 +146,7 @@ local commandblock_action_on = function(pos, node)

minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})

local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local command = minetest.chatcommands[meta:get_string("command")]
if command == nil then
return
Expand Down Expand Up @@ -179,7 +179,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
after_place_node = after_place,
on_receive_fields = receive_fields,
can_dig = function(pos,player)
local owner = minetest.env:get_meta(pos):get_string("owner")
local owner = minetest.get_meta(pos):get_string("owner")
return owner == "" or owner == player:get_player_name()
end,
sounds = default.node_sound_stone_defaults(),
Expand All @@ -197,7 +197,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
after_place_node = after_place,
on_receive_fields = receive_fields,
can_dig = function(pos,player)
local owner = minetest.env:get_meta(pos):get_string("owner")
local owner = minetest.get_meta(pos):get_string("owner")
return owner == "" or owner == player:get_player_name()
end,
sounds = default.node_sound_stone_defaults(),
Expand Down
22 changes: 11 additions & 11 deletions mesecons_compatibility/init.lua
View file
Expand Up @@ -38,27 +38,27 @@ function doors:register_door(name, def)
local tb = def.tiles_bottom

local function after_dig_node(pos, name)
if minetest.env:get_node(pos).name == name then
minetest.env:remove_node(pos)
if minetest.get_node(pos).name == name then
minetest.remove_node(pos)
end
end

local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
pos.y = pos.y+dir
if not minetest.env:get_node(pos).name == check_name then
if not minetest.get_node(pos).name == check_name then
return
end
local p2 = minetest.env:get_node(pos).param2
local p2 = minetest.get_node(pos).param2
p2 = params[p2+1]

local meta = minetest.env:get_meta(pos):to_table()
minetest.env:set_node(pos, {name=replace_dir, param2=p2})
minetest.env:get_meta(pos):from_table(meta)
local meta = minetest.get_meta(pos):to_table()
minetest.set_node(pos, {name=replace_dir, param2=p2})
minetest.get_meta(pos):from_table(meta)

pos.y = pos.y-dir
meta = minetest.env:get_meta(pos):to_table()
minetest.env:set_node(pos, {name=replace, param2=p2})
minetest.env:get_meta(pos):from_table(meta)
meta = minetest.get_meta(pos):to_table()
minetest.set_node(pos, {name=replace, param2=p2})
minetest.get_meta(pos):from_table(meta)
end

local function on_mesecons_signal_open (pos, node)
Expand All @@ -73,7 +73,7 @@ function doors:register_door(name, def)
if not def.only_placer_can_open then
return true
end
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local pn = player:get_player_name()
return meta:get_string("doors_owner") == pn
end
Expand Down
10 changes: 5 additions & 5 deletions mesecons_detector/init.lua
View file
Expand Up @@ -3,25 +3,25 @@
-- The radius can be specified in mesecons/settings.lua

local object_detector_make_formspec = function (pos)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_string("formspec", "size[9,2.5]" ..
"field[0.3, 0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]")
end

local object_detector_on_receive_fields = function (pos, formname, fields)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_string("scanname", fields.scanname)
meta:set_string("digiline_channel", fields.digiline_channel)
object_detector_make_formspec(pos)
end

-- returns true if player was found, false if not
local object_detector_scan = function (pos)
local objs = minetest.env:get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
local objs = minetest.get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
for k, obj in pairs(objs) do
local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
local scanname = minetest.env:get_meta(pos):get_string("scanname")
local scanname = minetest.get_meta(pos):get_string("scanname")
if (isname == scanname and isname ~= "") or (isname ~= "" and scanname == "") then -- player with scanname found or not scanname specified
return true
end
Expand All @@ -33,7 +33,7 @@ end
object_detector_digiline = {
effector = {
action = function (pos, node, channel, msg)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local active_channel = meta:get_string("digiline_channel")
if channel == active_channel then
meta:set_string("scanname", msg)
Expand Down

0 comments on commit 16b4b79

Please sign in to comment.