Skip to content

Commit 16b4b79

Browse files
UberiUberi
committed
Update code to standards of Minetest 0.4.8.
1 parent b4654ce commit 16b4b79

22 files changed

Lines changed: 148 additions & 155 deletions

File tree

‎mesecons/init.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function mesecon:receptor_off_i(pos, rules)
132132
if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
133133
mesecon:turnoff(np, rulename)
134134
else
135-
mesecon:changesignal(np, minetest.env:get_node(np), rulename, mesecon.state.off)
135+
mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off)
136136
end
137137
end
138138
end

‎mesecons/internal.lua‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ function execute_actions(dtime)
237237
local nactions = mesecon.to_update
238238
mesecon.to_update = {}
239239
for _,i in ipairs(nactions) do
240-
node = minetest.env:get_node(i.pos)
240+
node = minetest.get_node(i.pos)
241241
if node.name=="ignore" then
242242
add_action(i.pos, i.action, i.rname)
243243
else
@@ -395,23 +395,23 @@ end
395395
-- some more general high-level stuff
396396

397397
function mesecon:is_power_on(pos, rulename)
398-
local node = minetest.env:get_node(pos)
398+
local node = minetest.get_node(pos)
399399
if mesecon:is_conductor_on(node.name, rulename) or mesecon:is_receptor_on(node.name) then
400400
return true
401401
end
402402
return false
403403
end
404404

405405
function mesecon:is_power_off(pos, rulename)
406-
local node = minetest.env:get_node(pos)
406+
local node = minetest.get_node(pos)
407407
if mesecon:is_conductor_off(node.name, rulename) or mesecon:is_receptor_off(node.name) then
408408
return true
409409
end
410410
return false
411411
end
412412

413413
function mesecon:turnon(pos, rulename)
414-
local node = minetest.env:get_node(pos)
414+
local node = minetest.get_node(pos)
415415

416416
if mesecon:is_conductor_off(node.name, rulename) then
417417
local rules = mesecon:conductor_get_rules(node)
@@ -425,7 +425,7 @@ function mesecon:turnon(pos, rulename)
425425
return
426426
end
427427

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

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

446446
function mesecon:turnoff(pos, rulename)
447-
local node = minetest.env:get_node(pos)
447+
local node = minetest.get_node(pos)
448448

449449
if mesecon:is_conductor_on(node.name, rulename) then
450450
local rules = mesecon:conductor_get_rules(node)
@@ -458,7 +458,7 @@ function mesecon:turnoff(pos, rulename)
458458
return
459459
end
460460
--]]
461-
minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name, rulename), param2 = node.param2})
461+
minetest.add_node(pos, {name = mesecon:get_conductor_off(node.name, rulename), param2 = node.param2})
462462

463463
for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
464464
local np = mesecon:addPosRule(pos, rule)
@@ -479,7 +479,7 @@ end
479479

480480

481481
function mesecon:connected_to_receptor(pos, rulename)
482-
local node = minetest.env:get_node(pos)
482+
local node = minetest.get_node(pos)
483483

484484
-- Check if conductors around are connected
485485
local rules = mesecon:get_any_inputrules(node)
@@ -507,7 +507,7 @@ function mesecon:find_receptor_on(pos, checked, rulename)
507507

508508
-- add current position to checked
509509
table.insert(checked, {x=pos.x, y=pos.y, z=pos.z})
510-
local node = minetest.env:get_node(pos)
510+
local node = minetest.get_node(pos)
511511

512512
if mesecon:is_receptor_on(node.name) then
513513
return true
@@ -529,8 +529,8 @@ function mesecon:find_receptor_on(pos, checked, rulename)
529529
end
530530

531531
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
532-
local outputnode = minetest.env:get_node(output)
533-
local inputnode = minetest.env:get_node(input)
532+
local outputnode = minetest.get_node(output)
533+
local inputnode = minetest.get_node(input)
534534
local outputrules = dug_outputrules or mesecon:get_any_outputrules (outputnode)
535535
local inputrules = mesecon:get_any_inputrules (inputnode)
536536
if not outputrules or not inputrules then
@@ -556,14 +556,14 @@ function mesecon:rules_link_anydir(pos1, pos2)
556556
end
557557

558558
function mesecon:is_powered(pos, rule)
559-
local node = minetest.env:get_node(pos)
559+
local node = minetest.get_node(pos)
560560
local rules = mesecon:get_any_inputrules(node)
561561
if not rules then return false end
562562

563563
if not rule then
564564
for _, rule in ipairs(mesecon:flattenrules(rules)) do
565565
local np = mesecon:addPosRule(pos, rule)
566-
local nn = minetest.env:get_node(np)
566+
local nn = minetest.get_node(np)
567567

568568
if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
569569
and mesecon:rules_link(np, pos) then
@@ -572,7 +572,7 @@ function mesecon:is_powered(pos, rule)
572572
end
573573
else
574574
local np = mesecon:addPosRule(pos, rule)
575-
local nn = minetest.env:get_node(np)
575+
local nn = minetest.get_node(np)
576576

577577
if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
578578
and mesecon:rules_link(np, pos) then

‎mesecons/services.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ minetest.register_abm({
2929
interval = 1.0,
3030
chance = 1,
3131
action = function(pos, node, active_object_count, active_object_count_wider)
32-
local meta = minetest.env:get_meta(pos)
32+
local meta = minetest.get_meta(pos)
3333
meta:set_int("heat",0)
3434
end,
3535
})

‎mesecons/util.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
function mesecon:move_node(pos, newpos)
2-
local node = minetest.env:get_node(pos)
3-
local meta = minetest.env:get_meta(pos):to_table()
4-
minetest.env:remove_node(pos)
5-
minetest.env:add_node(newpos, node)
6-
minetest.env:get_meta(pos):from_table(meta)
2+
local node = minetest.get_node(pos)
3+
local meta = minetest.get_meta(pos):to_table()
4+
minetest.remove_node(pos)
5+
minetest.add_node(newpos, node)
6+
minetest.get_meta(pos):from_table(meta)
77
end
88

99
--[[ new functions:

‎mesecons/wires.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ function mesecon:update_autoconnect(pos, secondcall, replace_old)
207207
mesecon:update_autoconnect(zmympos, true)
208208
end
209209

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

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

236236

237237
if string.find(nodename, "_off") ~= nil then
238-
minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
238+
minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
239239
else
240-
minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
240+
minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
241241
end
242242
end
243243

‎mesecons_blinkyplant/init.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ minetest.register_abm(
8181
interval = BLINKY_PLANT_INTERVAL,
8282
chance = 1,
8383
action = function(pos, node, active_object_count, active_object_count_wider)
84-
--minetest.env:remove_node(pos)
85-
minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
84+
--minetest.remove_node(pos)
85+
minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
8686
nodeupdate(pos)
8787
mesecon:receptor_on(pos)
8888
end,
@@ -93,8 +93,8 @@ minetest.register_abm({
9393
interval = BLINKY_PLANT_INTERVAL,
9494
chance = 1,
9595
action = function(pos, node, active_object_count, active_object_count_wider)
96-
--minetest.env:remove_node(pos)
97-
minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
96+
--minetest.remove_node(pos)
97+
minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
9898
nodeupdate(pos)
9999
mesecon:receptor_off(pos)
100100
end,

‎mesecons_button/init.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-- and then turns off again
44

55
mesecon.button_turnoff = function (pos)
6-
local node = minetest.env:get_node(pos)
6+
local node = minetest.get_node(pos)
77
if node.name=="mesecons_button:button_on" then --has not been dug
88
minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
99
minetest.sound_play("mesecons_button_pop", {pos=pos})

‎mesecons_commandblock/init.lua‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ minetest.register_chatcommand("tell", {
1616
minetest.chat_send_player(name, "Invalid usage: " .. param)
1717
return
1818
end
19-
if not minetest.env:get_player_by_name(target) then
19+
if not minetest.get_player_by_name(target) then
2020
minetest.chat_send_player(name, "Invalid target: " .. target)
2121
end
2222
minetest.chat_send_player(target, name .. " whispers: " .. message, false)
@@ -41,7 +41,7 @@ minetest.register_chatcommand("hp", {
4141
minetest.chat_send_player(name, "Invalid usage: " .. param)
4242
return
4343
end
44-
local player = minetest.env:get_player_by_name(target)
44+
local player = minetest.get_player_by_name(target)
4545
if player then
4646
player:set_hp(value)
4747
else
@@ -72,7 +72,7 @@ local initialize_data = function(meta, player, command, param)
7272
end
7373

7474
local construct = function(pos)
75-
local meta = minetest.env:get_meta(pos)
75+
local meta = minetest.get_meta(pos)
7676

7777
meta:set_string("player", "@nearest")
7878
meta:set_string("command", "time")
@@ -85,14 +85,14 @@ end
8585

8686
local after_place = function(pos, placer)
8787
if placer then
88-
local meta = minetest.env:get_meta(pos)
88+
local meta = minetest.get_meta(pos)
8989
meta:set_string("owner", placer:get_player_name())
9090
initialize_data(meta, "@nearest", "time", "7000")
9191
end
9292
end
9393

9494
local receive_fields = function(pos, formname, fields, sender)
95-
local meta = minetest.env:get_meta(pos)
95+
local meta = minetest.get_meta(pos)
9696
if fields.nearest then
9797
initialize_data(meta, "@nearest", fields.command, fields.param)
9898
elseif fields.farthest then
@@ -146,7 +146,7 @@ local commandblock_action_on = function(pos, node)
146146

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

149-
local meta = minetest.env:get_meta(pos)
149+
local meta = minetest.get_meta(pos)
150150
local command = minetest.chatcommands[meta:get_string("command")]
151151
if command == nil then
152152
return
@@ -179,7 +179,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
179179
after_place_node = after_place,
180180
on_receive_fields = receive_fields,
181181
can_dig = function(pos,player)
182-
local owner = minetest.env:get_meta(pos):get_string("owner")
182+
local owner = minetest.get_meta(pos):get_string("owner")
183183
return owner == "" or owner == player:get_player_name()
184184
end,
185185
sounds = default.node_sound_stone_defaults(),
@@ -197,7 +197,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
197197
after_place_node = after_place,
198198
on_receive_fields = receive_fields,
199199
can_dig = function(pos,player)
200-
local owner = minetest.env:get_meta(pos):get_string("owner")
200+
local owner = minetest.get_meta(pos):get_string("owner")
201201
return owner == "" or owner == player:get_player_name()
202202
end,
203203
sounds = default.node_sound_stone_defaults(),

‎mesecons_compatibility/init.lua‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@ function doors:register_door(name, def)
3838
local tb = def.tiles_bottom
3939

4040
local function after_dig_node(pos, name)
41-
if minetest.env:get_node(pos).name == name then
42-
minetest.env:remove_node(pos)
41+
if minetest.get_node(pos).name == name then
42+
minetest.remove_node(pos)
4343
end
4444
end
4545

4646
local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
4747
pos.y = pos.y+dir
48-
if not minetest.env:get_node(pos).name == check_name then
48+
if not minetest.get_node(pos).name == check_name then
4949
return
5050
end
51-
local p2 = minetest.env:get_node(pos).param2
51+
local p2 = minetest.get_node(pos).param2
5252
p2 = params[p2+1]
5353

54-
local meta = minetest.env:get_meta(pos):to_table()
55-
minetest.env:set_node(pos, {name=replace_dir, param2=p2})
56-
minetest.env:get_meta(pos):from_table(meta)
54+
local meta = minetest.get_meta(pos):to_table()
55+
minetest.set_node(pos, {name=replace_dir, param2=p2})
56+
minetest.get_meta(pos):from_table(meta)
5757

5858
pos.y = pos.y-dir
59-
meta = minetest.env:get_meta(pos):to_table()
60-
minetest.env:set_node(pos, {name=replace, param2=p2})
61-
minetest.env:get_meta(pos):from_table(meta)
59+
meta = minetest.get_meta(pos):to_table()
60+
minetest.set_node(pos, {name=replace, param2=p2})
61+
minetest.get_meta(pos):from_table(meta)
6262
end
6363

6464
local function on_mesecons_signal_open (pos, node)
@@ -73,7 +73,7 @@ function doors:register_door(name, def)
7373
if not def.only_placer_can_open then
7474
return true
7575
end
76-
local meta = minetest.env:get_meta(pos)
76+
local meta = minetest.get_meta(pos)
7777
local pn = player:get_player_name()
7878
return meta:get_string("doors_owner") == pn
7979
end

‎mesecons_detector/init.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
-- The radius can be specified in mesecons/settings.lua
44

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

1212
local object_detector_on_receive_fields = function (pos, formname, fields)
13-
local meta = minetest.env:get_meta(pos)
13+
local meta = minetest.get_meta(pos)
1414
meta:set_string("scanname", fields.scanname)
1515
meta:set_string("digiline_channel", fields.digiline_channel)
1616
object_detector_make_formspec(pos)
1717
end
1818

1919
-- returns true if player was found, false if not
2020
local object_detector_scan = function (pos)
21-
local objs = minetest.env:get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
21+
local objs = minetest.get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
2222
for k, obj in pairs(objs) do
2323
local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
24-
local scanname = minetest.env:get_meta(pos):get_string("scanname")
24+
local scanname = minetest.get_meta(pos):get_string("scanname")
2525
if (isname == scanname and isname ~= "") or (isname ~= "" and scanname == "") then -- player with scanname found or not scanname specified
2626
return true
2727
end
@@ -33,7 +33,7 @@ end
3333
object_detector_digiline = {
3434
effector = {
3535
action = function (pos, node, channel, msg)
36-
local meta = minetest.env:get_meta(pos)
36+
local meta = minetest.get_meta(pos)
3737
local active_channel = meta:get_string("digiline_channel")
3838
if channel == active_channel then
3939
meta:set_string("scanname", msg)

0 commit comments

Comments
 (0)