Merge pull request #243 from xyzz/liquid_renewable

[dragonfireclient.git] / builtin / misc.lua

diff --git a/builtin/misc.lua b/builtin/misc.lua
index 23baca1c8cd2d0bc1e4e33ba5f829cbbbf9fef40..e018aff85ce2517194fc6d028737771efbf7fb09 100644 (file)
--- a/builtin/misc.lua
+++ b/builtin/misc.lua
@@ -44,7 +44,7 @@ function minetest.get_connected_players()
        -- This could be optimized a bit, but leave that for later
        local list = {}
        for _, obj in pairs(minetest.env:get_objects_inside_radius({x=0,y=0,z=0}, 1000000)) do
-               if obj:get_player_name() then
+               if obj:is_player() then
                        table.insert(list, obj)
                end
        end
@@ -55,11 +55,47 @@ function minetest.hash_node_position(pos)
        return (pos.z+32768)*65536*65536 + (pos.y+32768)*65536 + pos.x+32768
 end
 
-function minetest.get_node_group(name, group)
-       if not minetest.registered_nodes[name] or not
-                       minetest.registered_nodes[name].groups[group] then
+function minetest.get_item_group(name, group)
+       if not minetest.registered_items[name] or not
+                       minetest.registered_items[name].groups[group] then
                return 0
        end
-       return minetest.registered_nodes[name].groups[group]
+       return minetest.registered_items[name].groups[group]
+end
+
+function minetest.get_node_group(name, group)
+       return minetest.get_item_group(name, group)
+end
+
+function minetest.string_to_pos(value)
+       local p = {}
+       p.x, p.y, p.z = string.match(value, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
+       if p.x and p.y and p.z then
+               p.x = tonumber(p.x)
+               p.y = tonumber(p.y)
+               p.z = tonumber(p.z)
+               return p
+       end
+       local p = {}
+       p.x, p.y, p.z = string.match(value, "^%( *([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+) *%)$")
+       if p.x and p.y and p.z then
+               p.x = tonumber(p.x)
+               p.y = tonumber(p.y)
+               p.z = tonumber(p.z)
+               return p
+       end
+       return nil
+end
+
+assert(minetest.string_to_pos("10.0, 5, -2").x == 10)
+assert(minetest.string_to_pos("( 10.0, 5, -2)").z == -2)
+assert(minetest.string_to_pos("asd, 5, -2)") == nil)
+
+function minetest.setting_get_pos(name)
+       local value = minetest.setting_get(name)
+       if not value then
+               return nil
+       end
+       return minetest.string_to_pos(value)
 end