Remove NextItem

[dragonfireclient.git] / builtin / client / util.lua

diff --git a/builtin/client/util.lua b/builtin/client/util.lua
index 4a6a72d72e6ee4de96abd934161b298fea0cdda5..42e383c5c66e588123bdfd084c80405f59494a18 100644 (file)
--- a/builtin/client/util.lua
+++ b/builtin/client/util.lua
@@ -21,20 +21,36 @@ function core.parse_relative_pos(param)
        return success, pos
 end 
 
-function core.switch_to_item(item)
+function core.find_item(item, mini, maxi)
        for index, stack in ipairs(core.get_inventory("current_player").main) do
-               if stack:get_name() == item then
-                       core.localplayer:set_wield_index(index - 1)
-                       return true
+               if (not mini or index >= mini) and (not maxi or index <= maxi) and stack:get_name() == item then
+                       return index
                end
        end
-       return false
+end
+
+function core.switch_to_item(item)
+       local i = core.find_item(item)
+       if i then
+               core.localplayer:set_wield_index(i)
+               return true
+       else
+               return false
+       end
 end
 
 function core.get_pointed_thing()
        local pos = core.camera:get_pos()
        local pos2 = vector.add(pos, vector.multiply(core.camera:get_look_dir(), 5))
-       local ray = core.raycast(pos, pos2, true, true)
-       
-       return ray:next()
-end    
+       local player = core.localplayer
+       if not player then return end
+       local item = player:get_wielded_item()
+       if not item then return end
+       local def = core.get_item_def(item:get_name())
+       local ray = core.raycast(pos, pos2, true, core.settings:get_bool("point_liquids") or def and def.liquids_pointable)
+       return ray and ray:next()
+end
+
+function core.close_formspec(formname)
+       return core.show_formspec(formname, "")
+end