]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - builtin/item.lua
filterlist api cleanup
[dragonfireclient.git] / builtin / item.lua
index a28798d4d3a21be5f5736dede4d875fd3cd72b81..b8381515ac89ecc0a6ca7cc75364f21e9f1aa5da 100644 (file)
@@ -129,11 +129,18 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
        end
 
        local under = pointed_thing.under
-       local oldnode_under = minetest.env:get_node(under)
+       local oldnode_under = minetest.get_node_or_nil(under)
+       local above = pointed_thing.above
+       local oldnode_above = minetest.get_node_or_nil(above)
+
+       if not oldnode_under or not oldnode_above then
+               minetest.log("info", placer:get_player_name() .. " tried to place"
+                       .. " node in unloaded position " .. minetest.pos_to_string(above))
+               return itemstack
+       end
+
        local olddef_under = ItemStack({name=oldnode_under.name}):get_definition()
        olddef_under = olddef_under or minetest.nodedef_default
-       local above = pointed_thing.above
-       local oldnode_above = minetest.env:get_node(above)
        local olddef_above = ItemStack({name=oldnode_above.name}):get_definition()
        olddef_above = olddef_above or minetest.nodedef_default
 
@@ -141,7 +148,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
                minetest.log("info", placer:get_player_name() .. " tried to place"
                        .. " node in invalid position " .. minetest.pos_to_string(above)
                        .. ", replacing " .. oldnode_above.name)
-               return
+               return itemstack
        end
 
        -- Place above pointed node
@@ -156,7 +163,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
        minetest.log("action", placer:get_player_name() .. " places node "
                .. def.name .. " at " .. minetest.pos_to_string(place_to))
        
-       local oldnode = minetest.env:get_node(place_to)
+       local oldnode = minetest.get_node(place_to)
        local newnode = {name = def.name, param1 = 0, param2 = 0}
 
        -- Calculate direction for wall mounted stuff like torches and signs
@@ -186,11 +193,11 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
                not check_attached_node(place_to, newnode) then
                minetest.log("action", "attached node " .. def.name ..
                        " can not be placed at " .. minetest.pos_to_string(place_to))
-               return
+               return itemstack
        end
 
        -- Add node and update
-       minetest.env:add_node(place_to, newnode)
+       minetest.add_node(place_to, newnode)
 
        local take_item = true
 
@@ -225,7 +232,7 @@ function minetest.item_place_object(itemstack, placer, pointed_thing)
        local pos = minetest.get_pointed_thing_position(pointed_thing, true)
        if pos ~= nil then
                local item = itemstack:take_item()
-               minetest.env:add_item(pos, item)
+               minetest.add_item(pos, item)
        end
        return itemstack
 end
@@ -234,26 +241,24 @@ function minetest.item_place(itemstack, placer, pointed_thing)
        -- Call on_rightclick if the pointed node defines it
        if pointed_thing.type == "node" and placer and
                        not placer:get_player_control().sneak then
-               local n = minetest.env:get_node(pointed_thing.under)
+               local n = minetest.get_node(pointed_thing.under)
                local nn = n.name
                if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
-                       minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer)
-                       return
+                       return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
                end
        end
 
        if itemstack:get_definition().type == "node" then
                return minetest.item_place_node(itemstack, placer, pointed_thing)
-       elseif itemstack:get_definition().type ~= "none" then
-               return minetest.item_place_object(itemstack, placer, pointed_thing)
        end
+       return itemstack
 end
 
 function minetest.item_drop(itemstack, dropper, pos)
        if dropper.get_player_name then
                local v = dropper:get_look_dir()
                local p = {x=pos.x+v.x, y=pos.y+1.5+v.y, z=pos.z+v.z}
-               local obj = minetest.env:add_item(p, itemstack)
+               local obj = minetest.add_item(p, itemstack)
                if obj then
                        v.x = v.x*2
                        v.y = v.y*2 + 1
@@ -261,9 +266,9 @@ function minetest.item_drop(itemstack, dropper, pos)
                        obj:setvelocity(v)
                end
        else
-               minetest.env:add_item(pos, itemstack)
+               minetest.add_item(pos, itemstack)
        end
-       return ""
+       return ItemStack("")
 end
 
 function minetest.item_eat(hp_change, replace_with_item)
@@ -292,18 +297,23 @@ function minetest.handle_node_drops(pos, drops, digger)
        if digger:get_inventory() then
                local _, dropped_item
                for _, dropped_item in ipairs(drops) do
-                       digger:get_inventory():add_item("main", dropped_item)
+                       local left = digger:get_inventory():add_item("main", dropped_item)
+                       if not left:is_empty() then
+                               local p = {
+                                       x = pos.x + math.random()/2-0.25,
+                                       y = pos.y + math.random()/2-0.25,
+                                       z = pos.z + math.random()/2-0.25,
+                               }
+                               minetest.add_item(p, left)
+                       end
                end
        end
 end
 
 function minetest.node_dig(pos, node, digger)
-       minetest.debug("node_dig")
-
        local def = ItemStack({name=node.name}):get_definition()
        -- Check if def ~= 0 because we always want to be able to remove unknown nodes
        if #def ~= 0 and not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then
-               minetest.debug("not diggable")
                minetest.log("info", digger:get_player_name() .. " tried to dig "
                        .. node.name .. " which is not diggable "
                        .. minetest.pos_to_string(pos))
@@ -317,21 +327,23 @@ function minetest.node_dig(pos, node, digger)
        local drops = minetest.get_node_drops(node.name, wielded:get_name())
 
        -- Wear out tool
-       local tp = wielded:get_tool_capabilities()
-       local dp = minetest.get_dig_params(def.groups, tp)
-       wielded:add_wear(dp.wear)
-       digger:set_wielded_item(wielded)
+       if not minetest.setting_getbool("creative_mode") then
+               local tp = wielded:get_tool_capabilities()
+               local dp = minetest.get_dig_params(def.groups, tp)
+               wielded:add_wear(dp.wear)
+               digger:set_wielded_item(wielded)
+       end
        
        -- Handle drops
        minetest.handle_node_drops(pos, drops, digger)
 
        local oldmetadata = nil
        if def.after_dig_node then
-               oldmetadata = minetest.env:get_meta(pos):to_table()
+               oldmetadata = minetest.get_meta(pos):to_table()
        end
 
        -- Remove node and update
-       minetest.env:remove_node(pos)
+       minetest.remove_node(pos)
        
        -- Run callback
        if def.after_dig_node then