diff --git a/nodes_anvil.lua b/nodes_anvil.lua index 12a57ef..7ebdfed 100644 --- a/nodes_anvil.lua +++ b/nodes_anvil.lua @@ -62,7 +62,7 @@ minetest.register_node("cottages:anvil", { }, on_construct = function(pos) - local meta = minetest.env:get_meta(pos); + local meta = minetest.get_meta(pos); meta:set_string("infotext", S("Anvil")); local inv = meta:get_inventory(); inv:set_size("input", 1); @@ -99,7 +99,7 @@ minetest.register_node("cottages:anvil", { can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = minetest.get_meta(pos); local inv = meta:get_inventory(); local owner = meta:get_string('owner'); @@ -163,8 +163,8 @@ minetest.register_node("cottages:anvil", { end local name = puncher:get_player_name(); - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory(); + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory(); local input = inv:get_stack('input',1); diff --git a/nodes_doorlike.lua b/nodes_doorlike.lua index 78f27e4..38e2ef8 100644 --- a/nodes_doorlike.lua +++ b/nodes_doorlike.lua @@ -31,12 +31,12 @@ cottages_window_sutter_operate = function( pos, old_node_state_name, new_node_st for i,v in ipairs(offsets) do - local node = minetest.env:get_node_or_nil( {x=pos.x, y=(pos.y+v), z=pos.z } ); + local node = minetest.get_node_or_nil( {x=pos.x, y=(pos.y+v), z=pos.z } ); if( node and node.name and node.name==old_node_state_name and ( (v > 0 and stop_up == 0 ) or (v < 0 and stop_down == 0 ))) then - minetest.env:add_node({x=pos.x, y=(pos.y+v), z=pos.z }, {name = new_node_state_name, param2 = node.param2}) + minetest.swap_node({x=pos.x, y=(pos.y+v), z=pos.z }, {name = new_node_state_name, param2 = node.param2}) -- found a diffrent node - no need to search further up elseif( v > 0 and stop_up == 0 ) then @@ -72,7 +72,7 @@ minetest.register_node("cottages:window_shutter_open", { }, }, on_rightclick = function(pos, node, puncher) - minetest.env:add_node(pos, {name = "cottages:window_shutter_closed", param2 = node.param2}) + minetest.swap_node(pos, {name = "cottages:window_shutter_closed", param2 = node.param2}) cottages_window_sutter_operate( pos, "cottages:window_shutter_open", "cottages:window_shutter_closed" ); end, is_ground_content = false, @@ -100,7 +100,7 @@ minetest.register_node("cottages:window_shutter_closed", { }, }, on_rightclick = function(pos, node, puncher) - minetest.env:add_node(pos, {name = "cottages:window_shutter_open", param2 = node.param2}) + minetest.swap_node(pos, {name = "cottages:window_shutter_open", param2 = node.param2}) cottages_window_sutter_operate( pos, "cottages:window_shutter_closed", "cottages:window_shutter_open" ); end, is_ground_content = false, @@ -116,9 +116,9 @@ minetest.register_abm({ action = function(pos) -- at this time, sleeping in a bed is not possible - if( not(minetest.env:get_timeofday() < 0.2 or minetest.env:get_timeofday() > 0.805)) then - local old_node = minetest.env:get_node( pos ); - minetest.env:add_node(pos, {name = "cottages:window_shutter_open", param2 = old_node.param2}) + if( not(minetest.get_timeofday() < 0.2 or minetest.get_timeofday() > 0.805)) then + local old_node = minetest.get_node( pos ); + minetest.swap_node(pos, {name = "cottages:window_shutter_open", param2 = old_node.param2}) cottages_window_sutter_operate( pos, "cottages:window_shutter_closed", "cottages:window_shutter_open" ); end end @@ -133,9 +133,9 @@ minetest.register_abm({ action = function(pos) -- same time at which sleeping is allowed in beds - if( minetest.env:get_timeofday() < 0.2 or minetest.env:get_timeofday() > 0.805) then - local old_node = minetest.env:get_node( pos ); - minetest.env:add_node(pos, {name = "cottages:window_shutter_closed", param2 = old_node.param2}) + if( minetest.get_timeofday() < 0.2 or minetest.get_timeofday() > 0.805) then + local old_node = minetest.get_node( pos ); + minetest.swap_node(pos, {name = "cottages:window_shutter_closed", param2 = old_node.param2}) cottages_window_sutter_operate( pos, "cottages:window_shutter_open", "cottages:window_shutter_closed" ); end end @@ -166,7 +166,7 @@ minetest.register_node("cottages:half_door", { }, }, on_rightclick = function(pos, node, puncher) - local node2 = minetest.env:get_node( {x=pos.x,y=(pos.y+1),z=pos.z}); + local node2 = minetest.get_node( {x=pos.x,y=(pos.y+1),z=pos.z}); local param2 = node.param2; if( param2%4 == 1) then param2 = param2+1; --2; @@ -174,11 +174,11 @@ minetest.register_node("cottages:half_door", { elseif( param2%4 == 3) then param2 = param2-3; --0; elseif( param2%4 == 0) then param2 = param2+3; --3; end; - minetest.env:add_node(pos, {name = "cottages:half_door", param2 = param2}) + minetest.swap_node(pos, {name = "cottages:half_door", param2 = param2}) -- if the node above consists of a door of the same type, open it as well -- Note: doors beneath this one are not opened! It is a special feature of these doors that they can be opend partly if( node2 ~= nil and node2.name == node.name and node2.param2==node.param2) then - minetest.env:add_node( {x=pos.x,y=(pos.y+1),z=pos.z}, {name = "cottages:half_door", param2 = param2}) + minetest.swap_node( {x=pos.x,y=(pos.y+1),z=pos.z}, {name = "cottages:half_door", param2 = param2}) end end, is_ground_content = false, @@ -207,7 +207,7 @@ minetest.register_node("cottages:half_door_inverted", { }, }, on_rightclick = function(pos, node, puncher) - local node2 = minetest.env:get_node( {x=pos.x,y=(pos.y+1),z=pos.z}); + local node2 = minetest.get_node( {x=pos.x,y=(pos.y+1),z=pos.z}); local param2 = node.param2; if( param2%4 == 1) then param2 = param2-1; --0; @@ -215,10 +215,10 @@ minetest.register_node("cottages:half_door_inverted", { elseif( param2%4 == 2) then param2 = param2+1; --3; elseif( param2%4 == 3) then param2 = param2-1; --2; end; - minetest.env:add_node(pos, {name = "cottages:half_door_inverted", param2 = param2}) + minetest.swap_node(pos, {name = "cottages:half_door_inverted", param2 = param2}) -- open upper parts of this door (if there are any) if( node2 ~= nil and node2.name == node.name and node2.param2==node.param2) then - minetest.env:add_node( {x=pos.x,y=(pos.y+1),z=pos.z}, {name = "cottages:half_door_inverted", param2 = param2}) + minetest.swap_node( {x=pos.x,y=(pos.y+1),z=pos.z}, {name = "cottages:half_door_inverted", param2 = param2}) end end, is_ground_content = false, @@ -256,7 +256,7 @@ minetest.register_node("cottages:gate_closed", { }, }, on_rightclick = function(pos, node, puncher) - minetest.env:add_node(pos, {name = "cottages:gate_open", param2 = node.param2}) + minetest.swap_node(pos, {name = "cottages:gate_open", param2 = node.param2}) end, is_ground_content = false, }) @@ -290,7 +290,7 @@ minetest.register_node("cottages:gate_open", { }, }, on_rightclick = function(pos, node, puncher) - minetest.env:add_node(pos, {name = "cottages:gate_closed", param2 = node.param2}) + minetest.swap_node(pos, {name = "cottages:gate_closed", param2 = node.param2}) end, is_ground_content = false, drop = "cottages:gate_closed", @@ -345,7 +345,7 @@ cottages.register_hatch = function( nodename, description, texture, receipe_item }, on_rightclick = function(pos, node, puncher) - minetest.env:add_node(pos, {name = node.name, param2 = new_facedirs[ node.param2+1 ]}) + minetest.swap_node(pos, {name = node.name, param2 = new_facedirs[ node.param2+1 ]}) end, is_ground_content = false, on_place = minetest.rotate_node, diff --git a/nodes_furniture.lua b/nodes_furniture.lua index 5d11675..0137103 100644 --- a/nodes_furniture.lua +++ b/nodes_furniture.lua @@ -206,7 +206,7 @@ minetest.register_node("cottages:shelf", { on_construct = function(pos) - local meta = minetest.env:get_meta(pos); + local meta = minetest.get_meta(pos); meta:set_string("formspec", "size[8,8]".. @@ -218,17 +218,17 @@ minetest.register_node("cottages:shelf", { end, can_dig = function( pos,player ) - local meta = minetest.env:get_meta( pos ); + local meta = minetest.get_meta( pos ); local inv = meta:get_inventory(); return inv:is_empty("main"); end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta( pos ); + local meta = minetest.get_meta( pos ); meta:set_string('infotext', S('open storage shelf (in use)')); end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta( pos ); + local meta = minetest.get_meta( pos ); local inv = meta:get_inventory(); if( inv:is_empty("main")) then meta:set_string('infotext', S('open storage shelf (empty)')); @@ -293,7 +293,7 @@ minetest.register_node("cottages:washing", { }, on_rightclick = function(pos, node, player) -- works only with water beneath - local node_under = minetest.env:get_node( {x=pos.x, y=(pos.y-1), z=pos.z} ); + local node_under = minetest.get_node( {x=pos.x, y=(pos.y-1), z=pos.z} ); if( not( node_under ) or node_under.name == "ignore" or (node_under.name ~= 'default:water_source' and node_under.name ~= 'default:water_flowing')) then minetest.chat_send_player( player:get_player_name(), S("Sorry. This washing place is out of water. Please place it above water!")); else